From 549f542b5239c08d546b65531bc53810bb9a2d1b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 24 Feb 2026 17:18:43 -0800 Subject: [PATCH] drop some 6.12 patches --- ...all-notifier-for-system-events-as-we.patch | 76 ------------------- ...-send-key_power-for-acpi_button_noti.patch | 50 ------------ queue-6.12/series | 2 - 3 files changed, 128 deletions(-) delete mode 100644 queue-6.12/acpi-button-install-notifier-for-system-events-as-we.patch delete mode 100644 queue-6.12/acpi-button-only-send-key_power-for-acpi_button_noti.patch diff --git a/queue-6.12/acpi-button-install-notifier-for-system-events-as-we.patch b/queue-6.12/acpi-button-install-notifier-for-system-events-as-we.patch deleted file mode 100644 index d33cf9af31..0000000000 --- a/queue-6.12/acpi-button-install-notifier-for-system-events-as-we.patch +++ /dev/null @@ -1,76 +0,0 @@ -From b61cd528a0a6ee4360fa1690867410116cb9f211 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 3 Mar 2025 15:27:09 -0600 -Subject: ACPI: button: Install notifier for system events as well - -From: Mario Limonciello - -[ Upstream commit a7e23ec17feecc7bac0d500cea900cace7b50129 ] - -On some systems when the system is put to sleep pressing the ACPI power -button will cause the EC SCI to try to wake the system by a Notify(DEV, 0x2) -with an intention to wake the system up from suspend. - -This behavior matches the ACPI specification in ACPI 6.4 section -4.8.3.1.1.2 which describes that the AML handler would generate a Notify() -with a code of 0x2 to indicate it was responsible for waking the system. - -This currently doesn't work because acpi_button_add() only configured -`ACPI_DEVICE_NOTIFY` which means that device handler notifications -0x80 through 0xFF are handled. - -To fix the wakeups on such systems, adjust the ACPI button handler to -use `ACPI_ALL_NOTIFY` which will handle all events 0x00 through 0x7F. - -Reported-by: Yijun Shen -Tested-by: Richard Gong -Link: https://uefi.org/htmlspecs/ACPI_Spec_6_4_html/04_ACPI_Hardware_Specification/ACPI_Hardware_Specification.html?highlight=0x2#control-method-power-button -Signed-off-by: Mario Limonciello -Tested-by: Yijun Shen -Link: https://patch.msgid.link/20250303212719.4153485-1-superm1@kernel.org -[ rjw: Removed uneeded semicolon ] -Signed-off-by: Rafael J. Wysocki -Stable-dep-of: e91f8c5305b9 ("ACPI: button: Call device_init_wakeup() earlier during probe") -Signed-off-by: Sasha Levin ---- - drivers/acpi/button.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c -index 6d7c413982167..7c45b5dc2da73 100644 ---- a/drivers/acpi/button.c -+++ b/drivers/acpi/button.c -@@ -24,6 +24,7 @@ - #define ACPI_BUTTON_CLASS "button" - #define ACPI_BUTTON_FILE_STATE "state" - #define ACPI_BUTTON_TYPE_UNKNOWN 0x00 -+#define ACPI_BUTTON_NOTIFY_WAKE 0x02 - #define ACPI_BUTTON_NOTIFY_STATUS 0x80 - - #define ACPI_BUTTON_SUBCLASS_POWER "power" -@@ -443,7 +444,12 @@ static void acpi_button_notify(acpi_handle handle, u32 event, void *data) - struct input_dev *input; - int keycode; - -- if (event != ACPI_BUTTON_NOTIFY_STATUS) { -+ switch (event) { -+ case ACPI_BUTTON_NOTIFY_STATUS: -+ break; -+ case ACPI_BUTTON_NOTIFY_WAKE: -+ break; -+ default: - acpi_handle_debug(device->handle, "Unsupported event [0x%x]\n", - event); - return; -@@ -631,7 +637,7 @@ static int acpi_button_add(struct acpi_device *device) - break; - default: - status = acpi_install_notify_handler(device->handle, -- ACPI_DEVICE_NOTIFY, handler, -+ ACPI_ALL_NOTIFY, handler, - device); - break; - } --- -2.51.0 - diff --git a/queue-6.12/acpi-button-only-send-key_power-for-acpi_button_noti.patch b/queue-6.12/acpi-button-only-send-key_power-for-acpi_button_noti.patch deleted file mode 100644 index 810f924838..0000000000 --- a/queue-6.12/acpi-button-only-send-key_power-for-acpi_button_noti.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 324f3ad8127ce1ca957c4f1ad1c14d3fa2bd7860 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 4 Apr 2025 09:50:22 -0500 -Subject: ACPI: button: Only send `KEY_POWER` for `ACPI_BUTTON_NOTIFY_STATUS` - -From: Mario Limonciello - -[ Upstream commit a8605b0ed187f53f077a769ce2b52ddb97f3eb42 ] - -Commit a7e23ec17feec ("ACPI: button: Install notifier for system -events as well") modified the ACPI button behavior to send -`ACPI_BUTTON_NOTIFY_WAKE` events. - -This caused a regression on Dell Optiplex 3040 sending `KEY_POWER` -randomly at runtime. - -Adjust logic so that the `ACPI_BUTTON_NOTIFY_WAKE` event will never -send `KEY_POWER`. - -Fixes: a7e23ec17feec ("ACPI: button: Install notifier for system events as well") -Reported-by: Ian Laurie -Closes: https://lore.kernel.org/linux-acpi/CAJZ5v0hbA6bqxHupTh4NZR-GVSb9M5RL7JSb2yQgvYYJg+z2aQ@mail.gmail.com/T/#md8071e480212201f23e4929607386750d3b6bc13 -Closes: https://bugzilla.redhat.com/show_bug.cgi?id=2357044 -Signed-off-by: Mario Limonciello -Tested-by: Ian Laurie -Link: https://patch.msgid.link/20250404145034.2608574-1-superm1@kernel.org -[ rjw: Changelog edits ] -Signed-off-by: Rafael J. Wysocki -Stable-dep-of: e91f8c5305b9 ("ACPI: button: Call device_init_wakeup() earlier during probe") -Signed-off-by: Sasha Levin ---- - drivers/acpi/button.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c -index 7c45b5dc2da73..3c6dd9b4ba0ad 100644 ---- a/drivers/acpi/button.c -+++ b/drivers/acpi/button.c -@@ -458,7 +458,7 @@ static void acpi_button_notify(acpi_handle handle, u32 event, void *data) - acpi_pm_wakeup_event(&device->dev); - - button = acpi_driver_data(device); -- if (button->suspended) -+ if (button->suspended || event == ACPI_BUTTON_NOTIFY_WAKE) - return; - - input = button->input; --- -2.51.0 - diff --git a/queue-6.12/series b/queue-6.12/series index 24369ea923..bcf51ca92f 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -356,8 +356,6 @@ io_uring-cancel-de-unionize-file-and-user_data-in-st.patch fs-ntfs3-initialize-new-folios-before-use.patch fs-ntfs3-prevent-infinite-loops-caused-by-the-next-v.patch fs-ntfs3-fix-slab-out-of-bounds-read-in-deleteindexe.patch -acpi-button-install-notifier-for-system-events-as-we.patch -acpi-button-only-send-key_power-for-acpi_button_noti.patch acpi-cppc-fix-remaining-for_each_possible_cpu-to-use.patch powercap-intel_rapl_tpmi-remove-fw_bug-from-invalid-.patch kbuild-add-objtool-to-top-level-clean-target.patch -- 2.47.3