Skip to content

Commit fe0d2f6

Browse files
Punit Agrawalgregkh
authored andcommitted
Revert "ACPI: Suppress misleading SPCR console message when SPCR table is absent"
commit eeb8c19 upstream. This reverts commit bad3fa2. Commit bad3fa2 ("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 <[email protected]> Signed-off-by: Will Deacon <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent a1eb567 commit fe0d2f6

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

arch/arm64/kernel/acpi.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,6 @@ static int __init acpi_fadt_sanity_check(void)
197197
*/
198198
void __init acpi_boot_table_init(void)
199199
{
200-
int ret;
201-
202200
/*
203201
* Enable ACPI instead of device tree unless
204202
* - ACPI has been disabled explicitly (acpi=off), or
@@ -252,12 +250,10 @@ void __init acpi_boot_table_init(void)
252250
* behaviour, use acpi=nospcr to disable console in ACPI SPCR
253251
* table as default serial console.
254252
*/
255-
ret = acpi_parse_spcr(earlycon_acpi_spcr_enable,
253+
acpi_parse_spcr(earlycon_acpi_spcr_enable,
256254
!param_acpi_nospcr);
257-
if (!ret || param_acpi_nospcr || !IS_ENABLED(CONFIG_ACPI_SPCR_TABLE))
258-
pr_info("Use ACPI SPCR as default console: No\n");
259-
else
260-
pr_info("Use ACPI SPCR as default console: Yes\n");
255+
pr_info("Use ACPI SPCR as default console: %s\n",
256+
param_acpi_nospcr ? "No" : "Yes");
261257

262258
if (IS_ENABLED(CONFIG_ACPI_BGRT))
263259
acpi_table_parse(ACPI_SIG_BGRT, acpi_parse_bgrt);

0 commit comments

Comments
 (0)