From: Greg Kroah-Hartman Date: Fri, 9 Oct 2020 07:45:49 +0000 (+0200) Subject: 4.19-stable patches X-Git-Tag: v4.4.239~65 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f0c9cd8a5a24a84e56a8824fe806444999aee952;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: platform-x86-intel-vbtn-fix-sw_tablet_mode-always-reporting-1-on-the-hp-pavilion-11-x360.patch platform-x86-intel-vbtn-switch-to-an-allow-list-for-sw_tablet_mode-reporting.patch platform-x86-thinkpad_acpi-initialize-tp_nvram_state-variable.patch platform-x86-thinkpad_acpi-re-initialize-acpi-buffer-size-when-reuse.patch --- diff --git a/queue-4.19/platform-x86-intel-vbtn-fix-sw_tablet_mode-always-reporting-1-on-the-hp-pavilion-11-x360.patch b/queue-4.19/platform-x86-intel-vbtn-fix-sw_tablet_mode-always-reporting-1-on-the-hp-pavilion-11-x360.patch new file mode 100644 index 00000000000..faa6a9f5fc4 --- /dev/null +++ b/queue-4.19/platform-x86-intel-vbtn-fix-sw_tablet_mode-always-reporting-1-on-the-hp-pavilion-11-x360.patch @@ -0,0 +1,70 @@ +From d823346876a970522ff9e4d2b323c9b734dcc4de Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Sat, 12 Sep 2020 11:35:32 +0200 +Subject: platform/x86: intel-vbtn: Fix SW_TABLET_MODE always reporting 1 on the HP Pavilion 11 x360 + +From: Hans de Goede + +commit d823346876a970522ff9e4d2b323c9b734dcc4de upstream. + +Commit cfae58ed681c ("platform/x86: intel-vbtn: Only blacklist +SW_TABLET_MODE on the 9 / "Laptop" chasis-type") restored SW_TABLET_MODE +reporting on the HP stream x360 11 series on which it was previously broken +by commit de9647efeaa9 ("platform/x86: intel-vbtn: Only activate tablet +mode switch on 2-in-1's"). + +It turns out that enabling SW_TABLET_MODE reporting on devices with a +chassis-type of 10 ("Notebook") causes SW_TABLET_MODE to always report 1 +at boot on the HP Pavilion 11 x360, which causes libinput to disable the +kbd and touchpad. + +The HP Pavilion 11 x360's ACPI VGBS method sets bit 4 instead of bit 6 when +NOT in tablet mode at boot. Inspecting all the DSDTs in my DSDT collection +shows only one other model, the Medion E1239T ever setting bit 4 and it +always sets this together with bit 6. + +So lets treat bit 4 as a second bit which when set indicates the device not +being in tablet-mode, as we already do for bit 6. + +While at it also prefix all VGBS constant defines with "VGBS_". + +Fixes: cfae58ed681c ("platform/x86: intel-vbtn: Only blacklist SW_TABLET_MODE on the 9 / "Laptop" chasis-type") +Signed-off-by: Hans de Goede +Acked-by: Mark Gross +Signed-off-by: Andy Shevchenko +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/platform/x86/intel-vbtn.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +--- a/drivers/platform/x86/intel-vbtn.c ++++ b/drivers/platform/x86/intel-vbtn.c +@@ -15,9 +15,13 @@ + #include + #include + ++/* Returned when NOT in tablet mode on some HP Stream x360 11 models */ ++#define VGBS_TABLET_MODE_FLAG_ALT 0x10 + /* When NOT in tablet mode, VGBS returns with the flag 0x40 */ +-#define TABLET_MODE_FLAG 0x40 +-#define DOCK_MODE_FLAG 0x80 ++#define VGBS_TABLET_MODE_FLAG 0x40 ++#define VGBS_DOCK_MODE_FLAG 0x80 ++ ++#define VGBS_TABLET_MODE_FLAGS (VGBS_TABLET_MODE_FLAG | VGBS_TABLET_MODE_FLAG_ALT) + + MODULE_LICENSE("GPL"); + MODULE_AUTHOR("AceLan Kao"); +@@ -148,9 +152,9 @@ static void detect_tablet_mode(struct pl + if (ACPI_FAILURE(status)) + return; + +- m = !(vgbs & TABLET_MODE_FLAG); ++ m = !(vgbs & VGBS_TABLET_MODE_FLAGS); + input_report_switch(priv->input_dev, SW_TABLET_MODE, m); +- m = (vgbs & DOCK_MODE_FLAG) ? 1 : 0; ++ m = (vgbs & VGBS_DOCK_MODE_FLAG) ? 1 : 0; + input_report_switch(priv->input_dev, SW_DOCK, m); + } + diff --git a/queue-4.19/platform-x86-intel-vbtn-switch-to-an-allow-list-for-sw_tablet_mode-reporting.patch b/queue-4.19/platform-x86-intel-vbtn-switch-to-an-allow-list-for-sw_tablet_mode-reporting.patch new file mode 100644 index 00000000000..97fc9f80acd --- /dev/null +++ b/queue-4.19/platform-x86-intel-vbtn-switch-to-an-allow-list-for-sw_tablet_mode-reporting.patch @@ -0,0 +1,130 @@ +From 8169bd3e6e193497cab781acddcff8fde5d0c416 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Wed, 30 Sep 2020 15:19:05 +0200 +Subject: platform/x86: intel-vbtn: Switch to an allow-list for SW_TABLET_MODE reporting +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Hans de Goede + +commit 8169bd3e6e193497cab781acddcff8fde5d0c416 upstream. + +2 recent commits: +cfae58ed681c ("platform/x86: intel-vbtn: Only blacklist SW_TABLET_MODE +on the 9 / "Laptop" chasis-type") +1fac39fd0316 ("platform/x86: intel-vbtn: Also handle tablet-mode switch on +"Detachable" and "Portable" chassis-types") + +Enabled reporting of SW_TABLET_MODE on more devices since the vbtn ACPI +interface is used by the firmware on some of those devices to report this. + +Testing has shown that unconditionally enabling SW_TABLET_MODE reporting +on all devices with a chassis type of 8 ("Portable") or 10 ("Notebook") +which support the VGBS method is a very bad idea. + +Many of these devices are normal laptops (non 2-in-1) models with a VGBS +which always returns 0, which we translate to SW_TABLET_MODE=1. This in +turn causes userspace (libinput) to suppress events from the builtin +keyboard and touchpad, making the laptop essentially unusable. + +Since the problem of wrongly reporting SW_TABLET_MODE=1 in combination +with libinput, leads to a non-usable system. Where as OTOH many people will +not even notice when SW_TABLET_MODE is not being reported, this commit +changes intel_vbtn_has_switches() to use a DMI based allow-list. + +The new DMI based allow-list matches on the 31 ("Convertible") and +32 ("Detachable") chassis-types, as these clearly are 2-in-1s and +so far if they support the intel-vbtn ACPI interface they all have +properly working SW_TABLET_MODE reporting. + +Besides these 2 generic matches, it also contains model specific matches +for 2-in-1 models which use a different chassis-type and which are known +to have properly working SW_TABLET_MODE reporting. + +This has been tested on the following 2-in-1 devices: + +Dell Venue 11 Pro 7130 vPro +HP Pavilion X2 10-p002nd +HP Stream x360 Convertible PC 11 +Medion E1239T + +Fixes: cfae58ed681c ("platform/x86: intel-vbtn: Only blacklist SW_TABLET_MODE on the 9 / "Laptop" chasis-type") +BugLink: https://forum.manjaro.org/t/keyboard-and-touchpad-only-work-on-kernel-5-6/22668 +BugLink: https://bugzilla.opensuse.org/show_bug.cgi?id=1175599 +Cc: Barnabás Pőcze +Cc: Takashi Iwai +Signed-off-by: Hans de Goede +Signed-off-by: Andy Shevchenko +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/platform/x86/intel-vbtn.c | 52 +++++++++++++++++++++++++++++++------- + 1 file changed, 43 insertions(+), 9 deletions(-) + +--- a/drivers/platform/x86/intel-vbtn.c ++++ b/drivers/platform/x86/intel-vbtn.c +@@ -158,20 +158,54 @@ static void detect_tablet_mode(struct pl + input_report_switch(priv->input_dev, SW_DOCK, m); + } + ++/* ++ * There are several laptops (non 2-in-1) models out there which support VGBS, ++ * but simply always return 0, which we translate to SW_TABLET_MODE=1. This in ++ * turn causes userspace (libinput) to suppress events from the builtin ++ * keyboard and touchpad, making the laptop essentially unusable. ++ * ++ * Since the problem of wrongly reporting SW_TABLET_MODE=1 in combination ++ * with libinput, leads to a non-usable system. Where as OTOH many people will ++ * not even notice when SW_TABLET_MODE is not being reported, a DMI based allow ++ * list is used here. This list mainly matches on the chassis-type of 2-in-1s. ++ * ++ * There are also some 2-in-1s which use the intel-vbtn ACPI interface to report ++ * SW_TABLET_MODE with a chassis-type of 8 ("Portable") or 10 ("Notebook"), ++ * these are matched on a per model basis, since many normal laptops with a ++ * possible broken VGBS ACPI-method also use these chassis-types. ++ */ ++static const struct dmi_system_id dmi_switches_allow_list[] = { ++ { ++ .matches = { ++ DMI_EXACT_MATCH(DMI_CHASSIS_TYPE, "31" /* Convertible */), ++ }, ++ }, ++ { ++ .matches = { ++ DMI_EXACT_MATCH(DMI_CHASSIS_TYPE, "32" /* Detachable */), ++ }, ++ }, ++ { ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), ++ DMI_MATCH(DMI_PRODUCT_NAME, "Venue 11 Pro 7130"), ++ }, ++ }, ++ { ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "HP Stream x360 Convertible PC 11"), ++ }, ++ }, ++ {} /* Array terminator */ ++}; ++ + static bool intel_vbtn_has_switches(acpi_handle handle) + { +- const char *chassis_type = dmi_get_system_info(DMI_CHASSIS_TYPE); + unsigned long long vgbs; + acpi_status status; + +- /* +- * Some normal laptops have a VGBS method despite being non-convertible +- * and their VGBS method always returns 0, causing detect_tablet_mode() +- * to report SW_TABLET_MODE=1 to userspace, which causes issues. +- * These laptops have a DMI chassis_type of 9 ("Laptop"), do not report +- * switches on any devices with a DMI chassis_type of 9. +- */ +- if (chassis_type && strcmp(chassis_type, "9") == 0) ++ if (!dmi_check_system(dmi_switches_allow_list)) + return false; + + status = acpi_evaluate_integer(handle, "VGBS", NULL, &vgbs); diff --git a/queue-4.19/platform-x86-thinkpad_acpi-initialize-tp_nvram_state-variable.patch b/queue-4.19/platform-x86-thinkpad_acpi-initialize-tp_nvram_state-variable.patch new file mode 100644 index 00000000000..cda39bc43ce --- /dev/null +++ b/queue-4.19/platform-x86-thinkpad_acpi-initialize-tp_nvram_state-variable.patch @@ -0,0 +1,41 @@ +From 5f38b06db8af3ed6c2fc1b427504ca56fae2eacc Mon Sep 17 00:00:00 2001 +From: Tom Rix +Date: Sun, 13 Sep 2020 12:02:03 -0700 +Subject: platform/x86: thinkpad_acpi: initialize tp_nvram_state variable + +From: Tom Rix + +commit 5f38b06db8af3ed6c2fc1b427504ca56fae2eacc upstream. + +clang static analysis flags this represenative problem +thinkpad_acpi.c:2523:7: warning: Branch condition evaluates + to a garbage value + if (!oldn->mute || + ^~~~~~~~~~~ + +In hotkey_kthread() mute is conditionally set by hotkey_read_nvram() +but unconditionally checked by hotkey_compare_and_issue_event(). +So the tp_nvram_state variable s[2] needs to be initialized. + +Fixes: 01e88f25985d ("ACPI: thinkpad-acpi: add CMOS NVRAM polling for hot keys (v9)") +Signed-off-by: Tom Rix +Reviewed-by: Hans de Goede +Acked-by: mark gross +Signed-off-by: Andy Shevchenko +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/platform/x86/thinkpad_acpi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/platform/x86/thinkpad_acpi.c ++++ b/drivers/platform/x86/thinkpad_acpi.c +@@ -2597,7 +2597,7 @@ static void hotkey_compare_and_issue_eve + */ + static int hotkey_kthread(void *data) + { +- struct tp_nvram_state s[2]; ++ struct tp_nvram_state s[2] = { 0 }; + u32 poll_mask, event_mask; + unsigned int si, so; + unsigned long t; diff --git a/queue-4.19/platform-x86-thinkpad_acpi-re-initialize-acpi-buffer-size-when-reuse.patch b/queue-4.19/platform-x86-thinkpad_acpi-re-initialize-acpi-buffer-size-when-reuse.patch new file mode 100644 index 00000000000..9c9e05cf9c8 --- /dev/null +++ b/queue-4.19/platform-x86-thinkpad_acpi-re-initialize-acpi-buffer-size-when-reuse.patch @@ -0,0 +1,37 @@ +From 720ef73d1a239e33c3ad8fac356b9b1348e68aaf Mon Sep 17 00:00:00 2001 +From: Aaron Ma +Date: Sat, 3 Oct 2020 01:09:16 +0800 +Subject: platform/x86: thinkpad_acpi: re-initialize ACPI buffer size when reuse + +From: Aaron Ma + +commit 720ef73d1a239e33c3ad8fac356b9b1348e68aaf upstream. + +Evaluating ACPI _BCL could fail, then ACPI buffer size will be set to 0. +When reuse this ACPI buffer, AE_BUFFER_OVERFLOW will be triggered. + +Re-initialize buffer size will make ACPI evaluate successfully. + +Fixes: 46445b6b896fd ("thinkpad-acpi: fix handle locate for video and query of _BCL") +Signed-off-by: Aaron Ma +Signed-off-by: Andy Shevchenko +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/platform/x86/thinkpad_acpi.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/drivers/platform/x86/thinkpad_acpi.c ++++ b/drivers/platform/x86/thinkpad_acpi.c +@@ -6879,8 +6879,10 @@ static int __init tpacpi_query_bcl_level + list_for_each_entry(child, &device->children, node) { + acpi_status status = acpi_evaluate_object(child->handle, "_BCL", + NULL, &buffer); +- if (ACPI_FAILURE(status)) ++ if (ACPI_FAILURE(status)) { ++ buffer.length = ACPI_ALLOCATE_BUFFER; + continue; ++ } + + obj = (union acpi_object *)buffer.pointer; + if (!obj || (obj->type != ACPI_TYPE_PACKAGE)) { diff --git a/queue-4.19/series b/queue-4.19/series index 0d4da66e9c4..d57e161e3ac 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -5,3 +5,7 @@ revert-ravb-fixed-to-be-able-to-unload-modules.patch net-wireless-nl80211-fix-out-of-bounds-access-in-nl80211_del_key.patch drm-nouveau-mem-guard-against-null-pointer-access-in-mem_del.patch usermodehelper-reset-umask-to-default-before-executing-user-process.patch +platform-x86-intel-vbtn-fix-sw_tablet_mode-always-reporting-1-on-the-hp-pavilion-11-x360.patch +platform-x86-thinkpad_acpi-initialize-tp_nvram_state-variable.patch +platform-x86-intel-vbtn-switch-to-an-allow-list-for-sw_tablet_mode-reporting.patch +platform-x86-thinkpad_acpi-re-initialize-acpi-buffer-size-when-reuse.patch