Commit eeb8c198 authored by Punit Agrawal's avatar Punit Agrawal Committed by Will Deacon
Browse files

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

This reverts commit bad3fa2f.

Commit bad3fa2f ("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: default avatarPunit Agrawal <punit.agrawal@oss.qualcomm.com>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 535fdfc5

arch/arm64/kernel/acpi.c

+3 −7
Original line number Diff line number Diff line
@@ -197,8 +197,6 @@ 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
@@ -252,12 +250,10 @@ void __init acpi_boot_table_init(void) 
		 * 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);