From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 19 Aug 2025 12:32:56 +0000 (+0200)
Subject: 6.12-stable patches
X-Git-Tag: v6.12.43~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5640fb99d82644dac6cd0d9936cff05373c39375;p=thirdparty%2Fkernel%2Fstable-queue.git

6.12-stable patches

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

diff --git a/queue-6.12/acpi-return-enodev-from-acpi_parse_spcr-when-spcr-support-is-disabled.patch b/queue-6.12/acpi-return-enodev-from-acpi_parse_spcr-when-spcr-support-is-disabled.patch
new file mode 100644
index 0000000000..35e096bdbf
--- /dev/null
+++ b/queue-6.12/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
+@@ -1472,7 +1472,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.12/series b/queue-6.12/series
index a197d710bf..e672cef0a9 100644
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -436,3 +436,4 @@ 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
 pci-honor-max-link-speed-when-determining-supported-speeds.patch
+acpi-return-enodev-from-acpi_parse_spcr-when-spcr-support-is-disabled.patch