From: Sasha Levin Date: Thu, 30 Dec 2021 02:22:48 +0000 (-0500) Subject: Fixes for 5.4 X-Git-Tag: v4.4.298~33 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=86519c384b7e7d411105e168881601382c1b0962;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 5.4 Signed-off-by: Sasha Levin --- diff --git a/queue-5.4/input-i8042-add-deferred-probe-support.patch b/queue-5.4/input-i8042-add-deferred-probe-support.patch new file mode 100644 index 00000000000..88a78e218bf --- /dev/null +++ b/queue-5.4/input-i8042-add-deferred-probe-support.patch @@ -0,0 +1,276 @@ +From b47d99e23db1a9935612bfc34265454eac767cee Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 28 Nov 2021 23:21:41 -0800 +Subject: Input: i8042 - add deferred probe support +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Takashi Iwai + +[ Upstream commit 9222ba68c3f4065f6364b99cc641b6b019ef2d42 ] + +We've got a bug report about the non-working keyboard on ASUS ZenBook +UX425UA. It seems that the PS/2 device isn't ready immediately at +boot but takes some seconds to get ready. Until now, the only +workaround is to defer the probe, but it's available only when the +driver is a module. However, many distros, including openSUSE as in +the original report, build the PS/2 input drivers into kernel, hence +it won't work easily. + +This patch adds the support for the deferred probe for i8042 stuff as +a workaround of the problem above. When the deferred probe mode is +enabled and the device couldn't be probed, it'll be repeated with the +standard deferred probe mechanism. + +The deferred probe mode is enabled either via the new option +i8042.probe_defer or via the quirk table entry. As of this patch, the +quirk table contains only ASUS ZenBook UX425UA. + +The deferred probe part is based on Fabio's initial work. + +BugLink: https://bugzilla.suse.com/show_bug.cgi?id=1190256 +Signed-off-by: Takashi Iwai +Tested-by: Samuel Čavoj +Link: https://lore.kernel.org/r/20211117063757.11380-1-tiwai@suse.de + +Signed-off-by: Dmitry Torokhov +Signed-off-by: Sasha Levin +--- + .../admin-guide/kernel-parameters.txt | 2 + + drivers/input/serio/i8042-x86ia64io.h | 14 +++++ + drivers/input/serio/i8042.c | 54 ++++++++++++------- + 3 files changed, 51 insertions(+), 19 deletions(-) + +diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt +index e7f71df9daf1c..165abcb656c5b 100644 +--- a/Documentation/admin-guide/kernel-parameters.txt ++++ b/Documentation/admin-guide/kernel-parameters.txt +@@ -1487,6 +1487,8 @@ + architectures force reset to be always executed + i8042.unlock [HW] Unlock (ignore) the keylock + i8042.kbdreset [HW] Reset device connected to KBD port ++ i8042.probe_defer ++ [HW] Allow deferred probing upon i8042 probe errors + + i810= [HW,DRM] + +diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h +index 202e43a6ffae2..2bd33a28b97cc 100644 +--- a/drivers/input/serio/i8042-x86ia64io.h ++++ b/drivers/input/serio/i8042-x86ia64io.h +@@ -995,6 +995,17 @@ static const struct dmi_system_id __initconst i8042_dmi_kbdreset_table[] = { + { } + }; + ++static const struct dmi_system_id i8042_dmi_probe_defer_table[] __initconst = { ++ { ++ /* ASUS ZenBook UX425UA */ ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), ++ DMI_MATCH(DMI_PRODUCT_NAME, "ZenBook UX425UA"), ++ }, ++ }, ++ { } ++}; ++ + #endif /* CONFIG_X86 */ + + #ifdef CONFIG_PNP +@@ -1314,6 +1325,9 @@ static int __init i8042_platform_init(void) + if (dmi_check_system(i8042_dmi_kbdreset_table)) + i8042_kbdreset = true; + ++ if (dmi_check_system(i8042_dmi_probe_defer_table)) ++ i8042_probe_defer = true; ++ + /* + * A20 was already enabled during early kernel init. But some buggy + * BIOSes (in MSI Laptops) require A20 to be enabled using 8042 to +diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c +index 6ff6b5710dd4e..bb76ff2f6b1d8 100644 +--- a/drivers/input/serio/i8042.c ++++ b/drivers/input/serio/i8042.c +@@ -44,6 +44,10 @@ static bool i8042_unlock; + module_param_named(unlock, i8042_unlock, bool, 0); + MODULE_PARM_DESC(unlock, "Ignore keyboard lock."); + ++static bool i8042_probe_defer; ++module_param_named(probe_defer, i8042_probe_defer, bool, 0); ++MODULE_PARM_DESC(probe_defer, "Allow deferred probing."); ++ + enum i8042_controller_reset_mode { + I8042_RESET_NEVER, + I8042_RESET_ALWAYS, +@@ -709,7 +713,7 @@ static int i8042_set_mux_mode(bool multiplex, unsigned char *mux_version) + * LCS/Telegraphics. + */ + +-static int __init i8042_check_mux(void) ++static int i8042_check_mux(void) + { + unsigned char mux_version; + +@@ -738,10 +742,10 @@ static int __init i8042_check_mux(void) + /* + * The following is used to test AUX IRQ delivery. + */ +-static struct completion i8042_aux_irq_delivered __initdata; +-static bool i8042_irq_being_tested __initdata; ++static struct completion i8042_aux_irq_delivered; ++static bool i8042_irq_being_tested; + +-static irqreturn_t __init i8042_aux_test_irq(int irq, void *dev_id) ++static irqreturn_t i8042_aux_test_irq(int irq, void *dev_id) + { + unsigned long flags; + unsigned char str, data; +@@ -768,7 +772,7 @@ static irqreturn_t __init i8042_aux_test_irq(int irq, void *dev_id) + * verifies success by readinng CTR. Used when testing for presence of AUX + * port. + */ +-static int __init i8042_toggle_aux(bool on) ++static int i8042_toggle_aux(bool on) + { + unsigned char param; + int i; +@@ -796,7 +800,7 @@ static int __init i8042_toggle_aux(bool on) + * the presence of an AUX interface. + */ + +-static int __init i8042_check_aux(void) ++static int i8042_check_aux(void) + { + int retval = -1; + bool irq_registered = false; +@@ -1003,7 +1007,7 @@ static int i8042_controller_init(void) + + if (i8042_command(&ctr[n++ % 2], I8042_CMD_CTL_RCTR)) { + pr_err("Can't read CTR while initializing i8042\n"); +- return -EIO; ++ return i8042_probe_defer ? -EPROBE_DEFER : -EIO; + } + + } while (n < 2 || ctr[0] != ctr[1]); +@@ -1318,7 +1322,7 @@ static void i8042_shutdown(struct platform_device *dev) + i8042_controller_reset(false); + } + +-static int __init i8042_create_kbd_port(void) ++static int i8042_create_kbd_port(void) + { + struct serio *serio; + struct i8042_port *port = &i8042_ports[I8042_KBD_PORT_NO]; +@@ -1346,7 +1350,7 @@ static int __init i8042_create_kbd_port(void) + return 0; + } + +-static int __init i8042_create_aux_port(int idx) ++static int i8042_create_aux_port(int idx) + { + struct serio *serio; + int port_no = idx < 0 ? I8042_AUX_PORT_NO : I8042_MUX_PORT_NO + idx; +@@ -1383,13 +1387,13 @@ static int __init i8042_create_aux_port(int idx) + return 0; + } + +-static void __init i8042_free_kbd_port(void) ++static void i8042_free_kbd_port(void) + { + kfree(i8042_ports[I8042_KBD_PORT_NO].serio); + i8042_ports[I8042_KBD_PORT_NO].serio = NULL; + } + +-static void __init i8042_free_aux_ports(void) ++static void i8042_free_aux_ports(void) + { + int i; + +@@ -1399,7 +1403,7 @@ static void __init i8042_free_aux_ports(void) + } + } + +-static void __init i8042_register_ports(void) ++static void i8042_register_ports(void) + { + int i; + +@@ -1440,7 +1444,7 @@ static void i8042_free_irqs(void) + i8042_aux_irq_registered = i8042_kbd_irq_registered = false; + } + +-static int __init i8042_setup_aux(void) ++static int i8042_setup_aux(void) + { + int (*aux_enable)(void); + int error; +@@ -1482,7 +1486,7 @@ static int __init i8042_setup_aux(void) + return error; + } + +-static int __init i8042_setup_kbd(void) ++static int i8042_setup_kbd(void) + { + int error; + +@@ -1532,7 +1536,7 @@ static int i8042_kbd_bind_notifier(struct notifier_block *nb, + return 0; + } + +-static int __init i8042_probe(struct platform_device *dev) ++static int i8042_probe(struct platform_device *dev) + { + int error; + +@@ -1597,6 +1601,7 @@ static struct platform_driver i8042_driver = { + .pm = &i8042_pm_ops, + #endif + }, ++ .probe = i8042_probe, + .remove = i8042_remove, + .shutdown = i8042_shutdown, + }; +@@ -1607,7 +1612,6 @@ static struct notifier_block i8042_kbd_bind_notifier_block = { + + static int __init i8042_init(void) + { +- struct platform_device *pdev; + int err; + + dbg_init(); +@@ -1623,17 +1627,29 @@ static int __init i8042_init(void) + /* Set this before creating the dev to allow i8042_command to work right away */ + i8042_present = true; + +- pdev = platform_create_bundle(&i8042_driver, i8042_probe, NULL, 0, NULL, 0); +- if (IS_ERR(pdev)) { +- err = PTR_ERR(pdev); ++ err = platform_driver_register(&i8042_driver); ++ if (err) + goto err_platform_exit; ++ ++ i8042_platform_device = platform_device_alloc("i8042", -1); ++ if (!i8042_platform_device) { ++ err = -ENOMEM; ++ goto err_unregister_driver; + } + ++ err = platform_device_add(i8042_platform_device); ++ if (err) ++ goto err_free_device; ++ + bus_register_notifier(&serio_bus, &i8042_kbd_bind_notifier_block); + panic_blink = i8042_panic_blink; + + return 0; + ++err_free_device: ++ platform_device_put(i8042_platform_device); ++err_unregister_driver: ++ platform_driver_unregister(&i8042_driver); + err_platform_exit: + i8042_platform_exit(); + return err; +-- +2.34.1 + diff --git a/queue-5.4/input-i8042-enable-deferred-probe-quirk-for-asus-um3.patch b/queue-5.4/input-i8042-enable-deferred-probe-quirk-for-asus-um3.patch new file mode 100644 index 00000000000..f613770c138 --- /dev/null +++ b/queue-5.4/input-i8042-enable-deferred-probe-quirk-for-asus-um3.patch @@ -0,0 +1,48 @@ +From d5cdc4e2529da86398d49ccda13e47dcf6ea100e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 4 Dec 2021 13:17:36 -0800 +Subject: Input: i8042 - enable deferred probe quirk for ASUS UM325UA +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Samuel Čavoj + +[ Upstream commit 44ee250aeeabb28b52a10397ac17ffb8bfe94839 ] + +The ASUS UM325UA suffers from the same issue as the ASUS UX425UA, which +is a very similar laptop. The i8042 device is not usable immediately +after boot and fails to initialize, requiring a deferred retry. + +Enable the deferred probe quirk for the UM325UA. + +BugLink: https://bugzilla.suse.com/show_bug.cgi?id=1190256 +Signed-off-by: Samuel Čavoj +Link: https://lore.kernel.org/r/20211204015615.232948-1-samuel@cavoj.net +Signed-off-by: Dmitry Torokhov +Signed-off-by: Sasha Levin +--- + drivers/input/serio/i8042-x86ia64io.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h +index 2bd33a28b97cc..0282c4c55e9da 100644 +--- a/drivers/input/serio/i8042-x86ia64io.h ++++ b/drivers/input/serio/i8042-x86ia64io.h +@@ -1003,6 +1003,13 @@ static const struct dmi_system_id i8042_dmi_probe_defer_table[] __initconst = { + DMI_MATCH(DMI_PRODUCT_NAME, "ZenBook UX425UA"), + }, + }, ++ { ++ /* ASUS ZenBook UM325UA */ ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), ++ DMI_MATCH(DMI_PRODUCT_NAME, "ZenBook UX325UA_UM325UA"), ++ }, ++ }, + { } + }; + +-- +2.34.1 + diff --git a/queue-5.4/memblock-fix-memblock_phys_alloc-section-mismatch-er.patch b/queue-5.4/memblock-fix-memblock_phys_alloc-section-mismatch-er.patch new file mode 100644 index 00000000000..3ab057d8d0b --- /dev/null +++ b/queue-5.4/memblock-fix-memblock_phys_alloc-section-mismatch-er.patch @@ -0,0 +1,55 @@ +From 14f3dc406a5d15ec88008fb8c9f760690ce4ffa7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 17 Dec 2021 10:07:54 +0800 +Subject: memblock: fix memblock_phys_alloc() section mismatch error + +From: Jackie Liu + +[ Upstream commit d7f55471db2719629f773c2d6b5742a69595bfd3 ] + +Fix modpost Section mismatch error in memblock_phys_alloc() + +[...] +WARNING: modpost: vmlinux.o(.text.unlikely+0x1dcc): Section mismatch in reference +from the function memblock_phys_alloc() to the function .init.text:memblock_phys_alloc_range() +The function memblock_phys_alloc() references +the function __init memblock_phys_alloc_range(). +This is often because memblock_phys_alloc lacks a __init +annotation or the annotation of memblock_phys_alloc_range is wrong. + +ERROR: modpost: Section mismatches detected. +Set CONFIG_SECTION_MISMATCH_WARN_ONLY=y to allow them. +[...] + +memblock_phys_alloc() is a one-line wrapper, make it __always_inline to +avoid these section mismatches. + +Reported-by: k2ci +Suggested-by: Mike Rapoport +Signed-off-by: Jackie Liu +[rppt: slightly massaged changelog ] +Signed-off-by: Mike Rapoport +Link: https://lore.kernel.org/r/20211217020754.2874872-1-liu.yun@linux.dev +Signed-off-by: Sasha Levin +--- + include/linux/memblock.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/linux/memblock.h b/include/linux/memblock.h +index f491690d54c6c..64b971b2542d6 100644 +--- a/include/linux/memblock.h ++++ b/include/linux/memblock.h +@@ -351,8 +351,8 @@ phys_addr_t memblock_phys_alloc_range(phys_addr_t size, phys_addr_t align, + phys_addr_t start, phys_addr_t end); + phys_addr_t memblock_phys_alloc_try_nid(phys_addr_t size, phys_addr_t align, int nid); + +-static inline phys_addr_t memblock_phys_alloc(phys_addr_t size, +- phys_addr_t align) ++static __always_inline phys_addr_t memblock_phys_alloc(phys_addr_t size, ++ phys_addr_t align) + { + return memblock_phys_alloc_range(size, align, 0, + MEMBLOCK_ALLOC_ACCESSIBLE); +-- +2.34.1 + diff --git a/queue-5.4/platform-x86-apple-gmux-use-resource_size-with-res.patch b/queue-5.4/platform-x86-apple-gmux-use-resource_size-with-res.patch new file mode 100644 index 00000000000..877334c4cfc --- /dev/null +++ b/queue-5.4/platform-x86-apple-gmux-use-resource_size-with-res.patch @@ -0,0 +1,37 @@ +From 99ffbf79748558f0e973f8405d18f5c31d57eec7 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 14 Dec 2021 04:18:36 -0800 +Subject: platform/x86: apple-gmux: use resource_size() with res + +From: Wang Qing + +[ Upstream commit eb66fb03a727cde0ab9b1a3858de55c26f3007da ] + +This should be (res->end - res->start + 1) here actually, +use resource_size() derectly. + +Signed-off-by: Wang Qing +Link: https://lore.kernel.org/r/1639484316-75873-1-git-send-email-wangqing@vivo.com +Reviewed-by: Hans de Goede +Signed-off-by: Hans de Goede +Signed-off-by: Sasha Levin +--- + drivers/platform/x86/apple-gmux.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/platform/x86/apple-gmux.c b/drivers/platform/x86/apple-gmux.c +index 7e3083deb1c5d..1b86005c0f5f4 100644 +--- a/drivers/platform/x86/apple-gmux.c ++++ b/drivers/platform/x86/apple-gmux.c +@@ -625,7 +625,7 @@ static int gmux_probe(struct pnp_dev *pnp, const struct pnp_device_id *id) + } + + gmux_data->iostart = res->start; +- gmux_data->iolen = res->end - res->start; ++ gmux_data->iolen = resource_size(res); + + if (gmux_data->iolen < GMUX_MIN_IO_LEN) { + pr_err("gmux I/O region too small (%lu < %u)\n", +-- +2.34.1 + diff --git a/queue-5.4/series b/queue-5.4/series index 55c416b2c83..c4ec2ed53bf 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -1,2 +1,7 @@ hid-asus-add-depends-on-usb_hid-to-hid_asus-kconfig-option.patch tee-handle-lookup-of-shm-with-reference-count-0.patch +input-i8042-add-deferred-probe-support.patch +input-i8042-enable-deferred-probe-quirk-for-asus-um3.patch +tomoyo-check-exceeded-quota-early-in-tomoyo_domain_q.patch +platform-x86-apple-gmux-use-resource_size-with-res.patch +memblock-fix-memblock_phys_alloc-section-mismatch-er.patch diff --git a/queue-5.4/tomoyo-check-exceeded-quota-early-in-tomoyo_domain_q.patch b/queue-5.4/tomoyo-check-exceeded-quota-early-in-tomoyo_domain_q.patch new file mode 100644 index 00000000000..ce1ea919274 --- /dev/null +++ b/queue-5.4/tomoyo-check-exceeded-quota-early-in-tomoyo_domain_q.patch @@ -0,0 +1,69 @@ +From e7b5f4499f4262e74dfaaf95bd5507cfb6111ff8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 14 Dec 2021 10:45:26 +0100 +Subject: tomoyo: Check exceeded quota early in tomoyo_domain_quota_is_ok(). + +From: Dmitry Vyukov + +[ Upstream commit 04e57a2d952bbd34bc45744e72be3eecdc344294 ] + +If tomoyo is used in a testing/fuzzing environment in learning mode, +for lots of domains the quota will be exceeded and stay exceeded +for prolonged periods of time. In such cases it's pointless (and slow) +to walk the whole acl list again and again just to rediscover that +the quota is exceeded. We already have the TOMOYO_DIF_QUOTA_WARNED flag +that notes the overflow condition. Check it early to avoid the slowdown. + +[penguin-kernel] +This patch causes a user visible change that the learning mode will not be +automatically resumed after the quota is increased. To resume the learning +mode, administrator will need to explicitly clear TOMOYO_DIF_QUOTA_WARNED +flag after increasing the quota. But I think that this change is generally +preferable, for administrator likely wants to optimize the acl list for +that domain before increasing the quota, or that domain likely hits the +quota again. Therefore, don't try to care to clear TOMOYO_DIF_QUOTA_WARNED +flag automatically when the quota for that domain changed. + +Signed-off-by: Dmitry Vyukov +Signed-off-by: Tetsuo Handa +Signed-off-by: Sasha Levin +--- + security/tomoyo/util.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/security/tomoyo/util.c b/security/tomoyo/util.c +index eba0b3395851e..861fc6f4ebfb7 100644 +--- a/security/tomoyo/util.c ++++ b/security/tomoyo/util.c +@@ -1029,6 +1029,8 @@ bool tomoyo_domain_quota_is_ok(struct tomoyo_request_info *r) + return false; + if (!domain) + return true; ++ if (READ_ONCE(domain->flags[TOMOYO_DIF_QUOTA_WARNED])) ++ return false; + list_for_each_entry_rcu(ptr, &domain->acl_info_list, list, + srcu_read_lock_held(&tomoyo_ss)) { + u16 perm; +@@ -1074,14 +1076,12 @@ bool tomoyo_domain_quota_is_ok(struct tomoyo_request_info *r) + if (count < tomoyo_profile(domain->ns, domain->profile)-> + pref[TOMOYO_PREF_MAX_LEARNING_ENTRY]) + return true; +- if (!domain->flags[TOMOYO_DIF_QUOTA_WARNED]) { +- domain->flags[TOMOYO_DIF_QUOTA_WARNED] = true; +- /* r->granted = false; */ +- tomoyo_write_log(r, "%s", tomoyo_dif[TOMOYO_DIF_QUOTA_WARNED]); ++ WRITE_ONCE(domain->flags[TOMOYO_DIF_QUOTA_WARNED], true); ++ /* r->granted = false; */ ++ tomoyo_write_log(r, "%s", tomoyo_dif[TOMOYO_DIF_QUOTA_WARNED]); + #ifndef CONFIG_SECURITY_TOMOYO_INSECURE_BUILTIN_SETTING +- pr_warn("WARNING: Domain '%s' has too many ACLs to hold. Stopped learning mode.\n", +- domain->domainname->name); ++ pr_warn("WARNING: Domain '%s' has too many ACLs to hold. Stopped learning mode.\n", ++ domain->domainname->name); + #endif +- } + return false; + } +-- +2.34.1 +