From: Greg Kroah-Hartman Date: Wed, 3 Dec 2025 13:32:08 +0000 (+0100) Subject: 6.17-stable patches X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=434f38e8794bead1937172c612913498e1211669;p=thirdparty%2Fkernel%2Fstable-queue.git 6.17-stable patches added patches: revert-acpi-suppress-misleading-spcr-console-message-when-spcr-table-is-absent.patch --- diff --git a/queue-6.17/revert-acpi-suppress-misleading-spcr-console-message-when-spcr-table-is-absent.patch b/queue-6.17/revert-acpi-suppress-misleading-spcr-console-message-when-spcr-table-is-absent.patch new file mode 100644 index 0000000000..9b2d6a3e1d --- /dev/null +++ b/queue-6.17/revert-acpi-suppress-misleading-spcr-console-message-when-spcr-table-is-absent.patch @@ -0,0 +1,55 @@ +From eeb8c19896952e18fb538ec76e603884070a6c6a Mon Sep 17 00:00:00 2001 +From: Punit Agrawal +Date: Fri, 31 Oct 2025 11:11:37 +0000 +Subject: Revert "ACPI: Suppress misleading SPCR console message when SPCR table is absent" + +From: Punit Agrawal + +commit eeb8c19896952e18fb538ec76e603884070a6c6a upstream. + +This reverts commit bad3fa2fb9206f4dcec6ddef094ec2fbf6e8dcb2. + +Commit bad3fa2fb920 ("ACPI: Suppress misleading SPCR console message +when SPCR table is absent") mistakenly assumes acpi_parse_spcr() +returning 0 to indicate a failure to parse SPCR. While addressing the +resultant incorrect logging it was deemed that dropping the message is +a better approach as it is not particularly useful. + +Roll back the commit introducing the bug as a step towards dropping +the log message. + +Link: https://lore.kernel.org/all/aQN0YWUYaPYWpgJM@willie-the-truck/ +Signed-off-by: Punit Agrawal +Signed-off-by: Will Deacon +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/kernel/acpi.c | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) + +--- a/arch/arm64/kernel/acpi.c ++++ b/arch/arm64/kernel/acpi.c +@@ -197,8 +197,6 @@ out: + */ + void __init acpi_boot_table_init(void) + { +- int ret; +- + /* + * Enable ACPI instead of device tree unless + * - ACPI has been disabled explicitly (acpi=off), or +@@ -252,12 +250,10 @@ done: + * behaviour, use acpi=nospcr to disable console in ACPI SPCR + * table as default serial console. + */ +- ret = acpi_parse_spcr(earlycon_acpi_spcr_enable, ++ acpi_parse_spcr(earlycon_acpi_spcr_enable, + !param_acpi_nospcr); +- if (!ret || param_acpi_nospcr || !IS_ENABLED(CONFIG_ACPI_SPCR_TABLE)) +- pr_info("Use ACPI SPCR as default console: No\n"); +- else +- pr_info("Use ACPI SPCR as default console: Yes\n"); ++ pr_info("Use ACPI SPCR as default console: %s\n", ++ param_acpi_nospcr ? "No" : "Yes"); + + if (IS_ENABLED(CONFIG_ACPI_BGRT)) + acpi_table_parse(ACPI_SIG_BGRT, acpi_parse_bgrt); diff --git a/queue-6.17/series b/queue-6.17/series index 0a47ca6049..126d6ccbac 100644 --- a/queue-6.17/series +++ b/queue-6.17/series @@ -142,3 +142,4 @@ libceph-replace-bug_on-with-bounds-check-for-map-max_osd.patch mm-swap-remove-duplicate-nr_swap_pages-decrement-in-get_swap_page_of_type.patch usb-udc-add-trace-event-for-usb_gadget_set_state.patch usb-gadget-udc-fix-use-after-free-in-usb_gadget_state_work.patch +revert-acpi-suppress-misleading-spcr-console-message-when-spcr-table-is-absent.patch