Drop a broken ACPI patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.18/revert-acpi-processor-update-cpuidle-driver-check-in.patch b/queue-6.18/revert-acpi-processor-update-cpuidle-driver-check-in.patch
new file mode 100644 (file)
index 0000000..6034e92
--- /dev/null
+++ b/queue-6.18/revert-acpi-processor-update-cpuidle-driver-check-in.patch
@@ -0,0 +1,39 @@
+From ba783b451456824cf0288a87bc3029c5f33d9741 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Sat, 28 Feb 2026 10:35:45 -0500
+Subject: Revert "ACPI: processor: Update cpuidle driver check in
+ __acpi_processor_start()"
+
+This reverts commit 0089ce1c056aee547115bdc25c223f8f88c08498 which is
+upstream commit 6cfed39c2ce64ac024bbde458a9727105e0b8c66.
+
+This commit is causing a suspend regression on systems such as the Asus
+Zephyrus G14 (GA402RJ) with Ryzen 7 6700H: when suspending, the display
+turns off but the device fails to fully power down. This is not seen
+with v7.0-rc1 which indicates that there are changes missing. Therefore,
+revert this change.
+
+Link: https://lore.kernel.org/all/lA7Dz_m7_nCF8KkRyEOcSCLg799Mm9_DN2r9hx7ISjw32OoKiB1r_YjGHIFX8vgqxpOkVJ8d_yHb-VsGAvIWC942D4-zdWxAIP4_k6ZIQi8=@protonmail.com/
+Fixes: 0089ce1c056a ("ACPI: processor: Update cpuidle driver check in __acpi_processor_start()")
+Reported-by: Athul Krishna <athul.krishna.kr@protonmail.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/acpi/processor_driver.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
+index 7644de24d2faa..65e779be64ffc 100644
+--- a/drivers/acpi/processor_driver.c
++++ b/drivers/acpi/processor_driver.c
+@@ -166,7 +166,7 @@ static int __acpi_processor_start(struct acpi_device *device)
+       if (result && !IS_ENABLED(CONFIG_ACPI_CPU_FREQ_PSS))
+               dev_dbg(&device->dev, "CPPC data invalid or not present\n");
+ 
+-      if (cpuidle_get_driver() == &acpi_idle_driver)
++      if (!cpuidle_get_driver() || cpuidle_get_driver() == &acpi_idle_driver)
+               acpi_processor_power_init(pr);
+ 
+       acpi_pss_perf_init(pr);
+-- 
+2.51.0
+

diff --git a/queue-6.18/series b/queue-6.18/series
index ab3a119c247d0fb69b6822d3d3c8e0d6709da176..fc053d43860e5b7262cd242a1fd9c2f32ac3478e 100644 (file)
--- a/queue-6.18/series
+++ b/queue-6.18/series
@@ -748,3 +748,4 @@ tracing-wake-up-poll-waiters-for-hist-files-when-rem.patch
 rust-list-add-unsafe-blocks-for-container_of-and-saf.patch
 ntb-ntb_transport-fix-too-small-buffer-for-debugfs_n.patch
 alsa-pcm-revert-bufs-move-in-snd_pcm_xfern_frames_io.patch
+revert-acpi-processor-update-cpuidle-driver-check-in.patch

diff --git a/queue-6.19/revert-acpi-processor-update-cpuidle-driver-check-in.patch b/queue-6.19/revert-acpi-processor-update-cpuidle-driver-check-in.patch
new file mode 100644 (file)
index 0000000..e941122
--- /dev/null
+++ b/queue-6.19/revert-acpi-processor-update-cpuidle-driver-check-in.patch
@@ -0,0 +1,39 @@
+From c8c22ef5a1dc6d6e99e0fd586122a7e6f52ab0f3 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Sat, 28 Feb 2026 10:35:45 -0500
+Subject: Revert "ACPI: processor: Update cpuidle driver check in
+ __acpi_processor_start()"
+
+This reverts commit 0089ce1c056aee547115bdc25c223f8f88c08498 which is
+upstream commit 6cfed39c2ce64ac024bbde458a9727105e0b8c66.
+
+This commit is causing a suspend regression on systems such as the Asus
+Zephyrus G14 (GA402RJ) with Ryzen 7 6700H: when suspending, the display
+turns off but the device fails to fully power down. This is not seen
+with v7.0-rc1 which indicates that there are changes missing. Therefore,
+revert this change.
+
+Link: https://lore.kernel.org/all/lA7Dz_m7_nCF8KkRyEOcSCLg799Mm9_DN2r9hx7ISjw32OoKiB1r_YjGHIFX8vgqxpOkVJ8d_yHb-VsGAvIWC942D4-zdWxAIP4_k6ZIQi8=@protonmail.com/
+Fixes: 0089ce1c056a ("ACPI: processor: Update cpuidle driver check in __acpi_processor_start()")
+Reported-by: Athul Krishna <athul.krishna.kr@protonmail.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/acpi/processor_driver.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
+index 7644de24d2faa..65e779be64ffc 100644
+--- a/drivers/acpi/processor_driver.c
++++ b/drivers/acpi/processor_driver.c
+@@ -166,7 +166,7 @@ static int __acpi_processor_start(struct acpi_device *device)
+       if (result && !IS_ENABLED(CONFIG_ACPI_CPU_FREQ_PSS))
+               dev_dbg(&device->dev, "CPPC data invalid or not present\n");
+ 
+-      if (cpuidle_get_driver() == &acpi_idle_driver)
++      if (!cpuidle_get_driver() || cpuidle_get_driver() == &acpi_idle_driver)
+               acpi_processor_power_init(pr);
+ 
+       acpi_pss_perf_init(pr);
+-- 
+2.51.0
+

diff --git a/queue-6.19/series b/queue-6.19/series
index 69152b644af40f1ec7d39ce04b3bb2f014008ded..06db46a650df554356137c688f1b463489685b4d 100644 (file)
--- a/queue-6.19/series
+++ b/queue-6.19/series
@@ -840,3 +840,4 @@ tracing-wake-up-poll-waiters-for-hist-files-when-rem.patch
 rust-list-add-unsafe-blocks-for-container_of-and-saf.patch
 ntb-ntb_transport-fix-too-small-buffer-for-debugfs_n.patch
 alsa-pcm-revert-bufs-move-in-snd_pcm_xfern_frames_io.patch
+revert-acpi-processor-update-cpuidle-driver-check-in.patch