Commit bad3fa2f authored by Li Chen's avatar Li Chen Committed by Catalin Marinas
Browse files

ACPI: Suppress misleading SPCR console message when SPCR table is absent 



The kernel currently alway prints:
"Use ACPI SPCR as default console: No/Yes "

even on systems that lack an SPCR table. This can
mislead users into thinking the SPCR table exists
on the machines without SPCR.

With this change, the "Yes" is only printed if
the SPCR table is present, parsed and !param_acpi_nospcr.
This avoids user confusion on SPCR-less systems.

Signed-off-by: default avatarLi Chen <chenl311@chinatelecom.cn>
Acked-by: default avatarHanjun Guo <guohanjun@huawei.com>
Link: https://lore.kernel.org/r/20250620131309.126555-3-me@linux.beauty


Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent b9f58d35

arch/arm64/kernel/acpi.c

+7 −3
Original line number Diff line number Diff line
@@ -197,6 +197,8 @@ static int __init acpi_fadt_sanity_check(void) 
 */

void __init acpi_boot_table_init(void)

{

	int ret;



	/*

	 * Enable ACPI instead of device tree unless

	 * - ACPI has been disabled explicitly (acpi=off), or
@@ -250,10 +252,12 @@ void __init acpi_boot_table_init(void) 
		 * behaviour, use acpi=nospcr to disable console in ACPI SPCR

		 * table as default serial console.

		 */

		acpi_parse_spcr(earlycon_acpi_spcr_enable,

		ret = acpi_parse_spcr(earlycon_acpi_spcr_enable,

			!param_acpi_nospcr);

		pr_info("Use ACPI SPCR as default console: %s\n",

				param_acpi_nospcr ? "No" : "Yes");

		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");



		if (IS_ENABLED(CONFIG_ACPI_BGRT))

			acpi_table_parse(ACPI_SIG_BGRT, acpi_parse_bgrt);