6.15-stable patches

added patches:
	acpi-return-enodev-from-acpi_parse_spcr-when-spcr-support-is-disabled.patch

diff --git a/queue-6.15/acpi-return-enodev-from-acpi_parse_spcr-when-spcr-support-is-disabled.patch b/queue-6.15/acpi-return-enodev-from-acpi_parse_spcr-when-spcr-support-is-disabled.patch
new file mode 100644 (file)
index 0000000..604b496
--- /dev/null
+++ b/queue-6.15/acpi-return-enodev-from-acpi_parse_spcr-when-spcr-support-is-disabled.patch
@@ -0,0 +1,39 @@
+From b9f58d3572a8e1ef707b941eae58ec4014b9269d Mon Sep 17 00:00:00 2001
+From: Li Chen <chenl311@chinatelecom.cn>
+Date: Fri, 20 Jun 2025 21:13:07 +0800
+Subject: ACPI: Return -ENODEV from acpi_parse_spcr() when SPCR support is disabled
+
+From: Li Chen <chenl311@chinatelecom.cn>
+
+commit b9f58d3572a8e1ef707b941eae58ec4014b9269d upstream.
+
+If CONFIG_ACPI_SPCR_TABLE is disabled, acpi_parse_spcr()
+currently returns 0, which may incorrectly suggest that
+SPCR parsing was successful. This patch changes the behavior
+to return -ENODEV to clearly indicate that SPCR support
+is not available.
+
+This prepares the codebase for future changes that depend
+on acpi_parse_spcr() failure detection, such as suppressing
+misleading console messages.
+
+Signed-off-by: Li Chen <chenl311@chinatelecom.cn>
+Acked-by: Hanjun Guo <guohanjun@huawei.com>
+Link: https://lore.kernel.org/r/20250620131309.126555-2-me@linux.beauty
+Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ include/linux/acpi.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/include/linux/acpi.h
++++ b/include/linux/acpi.h
+@@ -1491,7 +1491,7 @@ int acpi_parse_spcr(bool enable_earlycon
+ #else
+ static inline int acpi_parse_spcr(bool enable_earlycon, bool enable_console)
+ {
+-      return 0;
++      return -ENODEV;
+ }
+ #endif
+ 

diff --git a/queue-6.15/series b/queue-6.15/series
index 6132353c0cc05d07a8fa2da29f1906031e87dc9d..41bd74a3f400b693c2b06f36e927be9bbecb7755 100644 (file)
--- a/queue-6.15/series
+++ b/queue-6.15/series
@@ -507,3 +507,4 @@ firmware-arm_scmi-convert-to-system_sleep_pm_ops.patch
 drm-amd-display-allow-dcn301-to-clear-update-flags.patch
 rcu-fix-racy-re-initialization-of-irq_work-causing-hangs.patch
 dm-split-write-bios-on-zone-boundaries-when-zone-append-is-not-emulated.patch
+acpi-return-enodev-from-acpi_parse_spcr-when-spcr-support-is-disabled.patch