|
@@ -24,6 +24,7 @@
|
|
|
#include <linux/memblock.h>
|
|
|
#include <linux/of_fdt.h>
|
|
|
#include <linux/smp.h>
|
|
|
+#include <linux/serial_core.h>
|
|
|
|
|
|
#include <asm/cputype.h>
|
|
|
#include <asm/cpu_ops.h>
|
|
@@ -206,7 +207,7 @@ void __init acpi_boot_table_init(void)
|
|
|
if (param_acpi_off ||
|
|
|
(!param_acpi_on && !param_acpi_force &&
|
|
|
of_scan_flat_dt(dt_scan_depth1_nodes, NULL)))
|
|
|
- return;
|
|
|
+ goto done;
|
|
|
|
|
|
/*
|
|
|
* ACPI is disabled at this point. Enable it in order to parse
|
|
@@ -226,6 +227,14 @@ void __init acpi_boot_table_init(void)
|
|
|
if (!param_acpi_force)
|
|
|
disable_acpi();
|
|
|
}
|
|
|
+
|
|
|
+done:
|
|
|
+ if (acpi_disabled) {
|
|
|
+ if (earlycon_init_is_deferred)
|
|
|
+ early_init_dt_scan_chosen_stdout();
|
|
|
+ } else {
|
|
|
+ parse_spcr(earlycon_init_is_deferred);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
#ifdef CONFIG_ACPI_APEI
|