From: Sasha Levin Date: Sat, 20 May 2023 18:13:02 +0000 (-0400) Subject: Fixes for 5.15 X-Git-Tag: v6.3.4~42 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4195282879a97c3f1eabf351b805ecd86f11b3fb;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 5.15 Signed-off-by: Sasha Levin --- diff --git a/queue-5.15/platform-x86-hp-wmi-add-micmute-to-hp_wmi_keymap-str.patch b/queue-5.15/platform-x86-hp-wmi-add-micmute-to-hp_wmi_keymap-str.patch new file mode 100644 index 00000000000..92fd0b1d687 --- /dev/null +++ b/queue-5.15/platform-x86-hp-wmi-add-micmute-to-hp_wmi_keymap-str.patch @@ -0,0 +1,36 @@ +From de016c148e4bdd3a23a2f7fbc5769390a7931845 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 25 Apr 2023 01:36:44 -0500 +Subject: platform/x86: hp-wmi: add micmute to hp_wmi_keymap struct + +From: Fae + +[ Upstream commit decab2825c3ef9b154c6f76bce40872ffb41c36f ] + +Fixes micmute key of HP Envy X360 ey0xxx. + +Signed-off-by: Fae +Link: https://lore.kernel.org/r/20230425063644.11828-1-faenkhauser@gmail.com +Cc: stable@vger.kernel.org +Reviewed-by: Hans de Goede +Signed-off-by: Hans de Goede +Signed-off-by: Sasha Levin +--- + drivers/platform/x86/hp/hp-wmi.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/platform/x86/hp/hp-wmi.c b/drivers/platform/x86/hp/hp-wmi.c +index 2f06e94ef37f7..8c845d263429f 100644 +--- a/drivers/platform/x86/hp/hp-wmi.c ++++ b/drivers/platform/x86/hp/hp-wmi.c +@@ -156,6 +156,7 @@ struct bios_rfkill2_state { + static const struct key_entry hp_wmi_keymap[] = { + { KE_KEY, 0x02, { KEY_BRIGHTNESSUP } }, + { KE_KEY, 0x03, { KEY_BRIGHTNESSDOWN } }, ++ { KE_KEY, 0x270, { KEY_MICMUTE } }, + { KE_KEY, 0x20e6, { KEY_PROG1 } }, + { KE_KEY, 0x20e8, { KEY_MEDIA } }, + { KE_KEY, 0x2142, { KEY_MEDIA } }, +-- +2.39.2 + diff --git a/queue-5.15/platform-x86-hp-wmi-support-touchpad-on-off.patch b/queue-5.15/platform-x86-hp-wmi-support-touchpad-on-off.patch new file mode 100644 index 00000000000..a7273e0a86e --- /dev/null +++ b/queue-5.15/platform-x86-hp-wmi-support-touchpad-on-off.patch @@ -0,0 +1,57 @@ +From 1b6adf19ab6f49876d7ab6c5e56d75ea810270ca Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 22 Sep 2022 12:54:59 +0100 +Subject: platform/x86: hp-wmi: Support touchpad on/off + +From: Daniel Houldsworth + +[ Upstream commit 401199ffa9b69baf3fd1f9ad082aa65c10910585 ] + +Add scancodes reported by the touchpad on/off button. The actual disabling +and enabling is done in hardware, and this just reports that change to +userspace. + +Signed-off-by: Daniel Houldsworth +Link: https://lore.kernel.org/r/20220922115459.6511-1-dhould3@gmail.com +Reviewed-by: Hans de Goede +Signed-off-by: Hans de Goede +Stable-dep-of: decab2825c3e ("platform/x86: hp-wmi: add micmute to hp_wmi_keymap struct") +Signed-off-by: Sasha Levin +--- + drivers/platform/x86/hp-wmi.c | 20 +++++++++++--------- + 1 file changed, 11 insertions(+), 9 deletions(-) + +diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c +index 1e390dcee561b..2f06e94ef37f7 100644 +--- a/drivers/platform/x86/hp-wmi.c ++++ b/drivers/platform/x86/hp-wmi.c +@@ -154,15 +154,17 @@ struct bios_rfkill2_state { + }; + + static const struct key_entry hp_wmi_keymap[] = { +- { KE_KEY, 0x02, { KEY_BRIGHTNESSUP } }, +- { KE_KEY, 0x03, { KEY_BRIGHTNESSDOWN } }, +- { KE_KEY, 0x20e6, { KEY_PROG1 } }, +- { KE_KEY, 0x20e8, { KEY_MEDIA } }, +- { KE_KEY, 0x2142, { KEY_MEDIA } }, +- { KE_KEY, 0x213b, { KEY_INFO } }, +- { KE_KEY, 0x2169, { KEY_ROTATE_DISPLAY } }, +- { KE_KEY, 0x216a, { KEY_SETUP } }, +- { KE_KEY, 0x231b, { KEY_HELP } }, ++ { KE_KEY, 0x02, { KEY_BRIGHTNESSUP } }, ++ { KE_KEY, 0x03, { KEY_BRIGHTNESSDOWN } }, ++ { KE_KEY, 0x20e6, { KEY_PROG1 } }, ++ { KE_KEY, 0x20e8, { KEY_MEDIA } }, ++ { KE_KEY, 0x2142, { KEY_MEDIA } }, ++ { KE_KEY, 0x213b, { KEY_INFO } }, ++ { KE_KEY, 0x2169, { KEY_ROTATE_DISPLAY } }, ++ { KE_KEY, 0x216a, { KEY_SETUP } }, ++ { KE_KEY, 0x21a9, { KEY_TOUCHPAD_OFF } }, ++ { KE_KEY, 0x121a9, { KEY_TOUCHPAD_ON } }, ++ { KE_KEY, 0x231b, { KEY_HELP } }, + { KE_END, 0 } + }; + +-- +2.39.2 + diff --git a/queue-5.15/platform-x86-move-existing-hp-drivers-to-a-new-hp-su.patch b/queue-5.15/platform-x86-move-existing-hp-drivers-to-a-new-hp-su.patch new file mode 100644 index 00000000000..8fa47d0cd49 --- /dev/null +++ b/queue-5.15/platform-x86-move-existing-hp-drivers-to-a-new-hp-su.patch @@ -0,0 +1,249 @@ +From d1744c18224599f0d93e207480fb450f6c0b0c57 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 20 Oct 2022 15:10:28 -0500 +Subject: platform/x86: Move existing HP drivers to a new hp subdir + +From: Jorge Lopez + +[ Upstream commit 6e9b8992b122cb12688bd259fc99e67d1be234eb ] + +The purpose of this patch is to provide a central location where all +HP related drivers are found. HP drivers will recide under +drivers/platform/x86/hp directory. + +Introduce changes to Kconfig file to list all HP driver under "HP X86 +Platform Specific Device Drivers" menu option. Additional changes +include update MAINTAINERS file to indicate hp related drivers new +path. + +Signed-off-by: Jorge Lopez +Link: https://lore.kernel.org/r/20221020201033.12790-2-jorge.lopez2@hp.com +Reviewed-by: Hans de Goede +Signed-off-by: Hans de Goede +Stable-dep-of: decab2825c3e ("platform/x86: hp-wmi: add micmute to hp_wmi_keymap struct") +Signed-off-by: Sasha Levin +--- + MAINTAINERS | 4 +- + drivers/platform/x86/Kconfig | 42 +-------------- + drivers/platform/x86/Makefile | 4 +- + drivers/platform/x86/hp/Kconfig | 63 ++++++++++++++++++++++ + drivers/platform/x86/hp/Makefile | 10 ++++ + drivers/platform/x86/{ => hp}/hp-wmi.c | 0 + drivers/platform/x86/{ => hp}/hp_accel.c | 2 +- + drivers/platform/x86/{ => hp}/tc1100-wmi.c | 0 + 8 files changed, 78 insertions(+), 47 deletions(-) + create mode 100644 drivers/platform/x86/hp/Kconfig + create mode 100644 drivers/platform/x86/hp/Makefile + rename drivers/platform/x86/{ => hp}/hp-wmi.c (100%) + rename drivers/platform/x86/{ => hp}/hp_accel.c (99%) + rename drivers/platform/x86/{ => hp}/tc1100-wmi.c (100%) + +diff --git a/MAINTAINERS b/MAINTAINERS +index 2d3d2155c744d..95374d582574f 100644 +--- a/MAINTAINERS ++++ b/MAINTAINERS +@@ -8568,7 +8568,7 @@ F: drivers/net/wireless/intersil/hostap/ + HP COMPAQ TC1100 TABLET WMI EXTRAS DRIVER + L: platform-driver-x86@vger.kernel.org + S: Orphan +-F: drivers/platform/x86/tc1100-wmi.c ++F: drivers/platform/x86/hp/tc1100-wmi.c + + HPET: High Precision Event Timers driver + M: Clemens Ladisch +@@ -10838,7 +10838,7 @@ M: Eric Piel + S: Maintained + F: Documentation/misc-devices/lis3lv02d.rst + F: drivers/misc/lis3lv02d/ +-F: drivers/platform/x86/hp_accel.c ++F: drivers/platform/x86/hp/hp_accel.c + + LIST KUNIT TEST + M: David Gow +diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig +index 61186829d1f6b..50abcf0c483c3 100644 +--- a/drivers/platform/x86/Kconfig ++++ b/drivers/platform/x86/Kconfig +@@ -389,24 +389,7 @@ config GPD_POCKET_FAN + of the CPU temperature. Say Y or M if the kernel may be used on a + GPD pocket. + +-config HP_ACCEL +- tristate "HP laptop accelerometer" +- depends on INPUT && ACPI +- depends on SERIO_I8042 +- select SENSORS_LIS3LV02D +- select NEW_LEDS +- select LEDS_CLASS +- help +- This driver provides support for the "Mobile Data Protection System 3D" +- or "3D DriveGuard" feature of HP laptops. On such systems the driver +- should load automatically (via ACPI alias). +- +- Support for a led indicating disk protection will be provided as +- hp::hddprotect. For more information on the feature, refer to +- Documentation/misc-devices/lis3lv02d.rst. +- +- To compile this driver as a module, choose M here: the module will +- be called hp_accel. ++source "drivers/platform/x86/hp/Kconfig" + + config WIRELESS_HOTKEY + tristate "Wireless hotkey button" +@@ -420,29 +403,6 @@ config WIRELESS_HOTKEY + To compile this driver as a module, choose M here: the module will + be called wireless-hotkey. + +-config HP_WMI +- tristate "HP WMI extras" +- depends on ACPI_WMI +- depends on INPUT +- depends on RFKILL || RFKILL = n +- select INPUT_SPARSEKMAP +- select ACPI_PLATFORM_PROFILE +- help +- Say Y here if you want to support WMI-based hotkeys on HP laptops and +- to read data from WMI such as docking or ambient light sensor state. +- +- To compile this driver as a module, choose M here: the module will +- be called hp-wmi. +- +-config TC1100_WMI +- tristate "HP Compaq TC1100 Tablet WMI Extras" +- depends on !X86_64 +- depends on ACPI +- depends on ACPI_WMI +- help +- This is a driver for the WMI extensions (wireless and bluetooth power +- control) of the HP Compaq TC1100 tablet. +- + config IBM_RTL + tristate "Device driver to enable PRTL support" + depends on PCI +diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile +index 2734a771d1f00..5dba9fe23fb15 100644 +--- a/drivers/platform/x86/Makefile ++++ b/drivers/platform/x86/Makefile +@@ -52,9 +52,7 @@ obj-$(CONFIG_FUJITSU_TABLET) += fujitsu-tablet.o + obj-$(CONFIG_GPD_POCKET_FAN) += gpd-pocket-fan.o + + # Hewlett Packard +-obj-$(CONFIG_HP_ACCEL) += hp_accel.o +-obj-$(CONFIG_HP_WMI) += hp-wmi.o +-obj-$(CONFIG_TC1100_WMI) += tc1100-wmi.o ++obj-$(CONFIG_X86_PLATFORM_DRIVERS_HP) += hp/ + + # Hewlett Packard Enterprise + obj-$(CONFIG_UV_SYSFS) += uv_sysfs.o +diff --git a/drivers/platform/x86/hp/Kconfig b/drivers/platform/x86/hp/Kconfig +new file mode 100644 +index 0000000000000..ae165955311ce +--- /dev/null ++++ b/drivers/platform/x86/hp/Kconfig +@@ -0,0 +1,63 @@ ++# SPDX-License-Identifier: GPL-2.0-only ++# ++# X86 Platform Specific Drivers ++# ++menuconfig X86_PLATFORM_DRIVERS_HP ++ bool "HP X86 Platform Specific Device Drivers" ++ depends on X86_PLATFORM_DEVICES ++ help ++ Say Y here to get to see options for device drivers for various ++ HP x86 platforms, including vendor-specific laptop extension drivers. ++ This option alone does not add any kernel code. ++ ++ If you say N, all options in this submenu will be skipped and disabled. ++ ++if X86_PLATFORM_DRIVERS_HP ++ ++config HP_ACCEL ++ tristate "HP laptop accelerometer" ++ default m ++ depends on INPUT && ACPI ++ depends on SERIO_I8042 ++ select SENSORS_LIS3LV02D ++ select NEW_LEDS ++ select LEDS_CLASS ++ help ++ This driver provides support for the "Mobile Data Protection System 3D" ++ or "3D DriveGuard" feature of HP laptops. On such systems the driver ++ should load automatically (via ACPI alias). ++ ++ Support for a led indicating disk protection will be provided as ++ hp::hddprotect. For more information on the feature, refer to ++ Documentation/misc-devices/lis3lv02d.rst. ++ ++ To compile this driver as a module, choose M here: the module will ++ be called hp_accel. ++ ++config HP_WMI ++ tristate "HP WMI extras" ++ default m ++ depends on ACPI_WMI ++ depends on INPUT ++ depends on RFKILL || RFKILL = n ++ select INPUT_SPARSEKMAP ++ select ACPI_PLATFORM_PROFILE ++ select HWMON ++ help ++ Say Y here if you want to support WMI-based hotkeys on HP laptops and ++ to read data from WMI such as docking or ambient light sensor state. ++ ++ To compile this driver as a module, choose M here: the module will ++ be called hp-wmi. ++ ++config TC1100_WMI ++ tristate "HP Compaq TC1100 Tablet WMI Extras" ++ default m ++ depends on !X86_64 ++ depends on ACPI ++ depends on ACPI_WMI ++ help ++ This is a driver for the WMI extensions (wireless and bluetooth power ++ control) of the HP Compaq TC1100 tablet. ++ ++endif # X86_PLATFORM_DRIVERS_HP +diff --git a/drivers/platform/x86/hp/Makefile b/drivers/platform/x86/hp/Makefile +new file mode 100644 +index 0000000000000..db1eed4cd7c7d +--- /dev/null ++++ b/drivers/platform/x86/hp/Makefile +@@ -0,0 +1,10 @@ ++# SPDX-License-Identifier: GPL-2.0 ++# ++# Makefile for linux/drivers/platform/x86/hp ++# HP x86 Platform-Specific Drivers ++# ++ ++# Hewlett Packard ++obj-$(CONFIG_HP_ACCEL) += hp_accel.o ++obj-$(CONFIG_HP_WMI) += hp-wmi.o ++obj-$(CONFIG_TC1100_WMI) += tc1100-wmi.o +diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp/hp-wmi.c +similarity index 100% +rename from drivers/platform/x86/hp-wmi.c +rename to drivers/platform/x86/hp/hp-wmi.c +diff --git a/drivers/platform/x86/hp_accel.c b/drivers/platform/x86/hp/hp_accel.c +similarity index 99% +rename from drivers/platform/x86/hp_accel.c +rename to drivers/platform/x86/hp/hp_accel.c +index ef24f53753c6e..62a1d93464750 100644 +--- a/drivers/platform/x86/hp_accel.c ++++ b/drivers/platform/x86/hp/hp_accel.c +@@ -26,7 +26,7 @@ + #include + #include + #include +-#include "../../misc/lis3lv02d/lis3lv02d.h" ++#include "../../../misc/lis3lv02d/lis3lv02d.h" + + /* Delayed LEDs infrastructure ------------------------------------ */ + +diff --git a/drivers/platform/x86/tc1100-wmi.c b/drivers/platform/x86/hp/tc1100-wmi.c +similarity index 100% +rename from drivers/platform/x86/tc1100-wmi.c +rename to drivers/platform/x86/hp/tc1100-wmi.c +-- +2.39.2 + diff --git a/queue-5.15/series b/queue-5.15/series index 9cab5a53922..fb05735ac9a 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -101,3 +101,6 @@ phy-st-miphy28lp-use-_poll_timeout-functions-for-wai.patch soundwire-qcom-gracefully-handle-too-many-ports-in-d.patch mfd-dln2-fix-memory-leak-in-dln2_probe.patch parisc-replace-regular-spinlock-with-spin_trylock-on.patch +platform-x86-hp-wmi-support-touchpad-on-off.patch +platform-x86-move-existing-hp-drivers-to-a-new-hp-su.patch +platform-x86-hp-wmi-add-micmute-to-hp_wmi_keymap-str.patch