Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33757ded authored by Hanjun Guo's avatar Hanjun Guo Committed by Will Deacon
Browse files

ARM64 / ACPI: Don't unflatten device tree if acpi=force is passed 



Since the policy is that once we pass acpi=force in the early
param, we will not unflatten device tree even if ACPI is disabled
in ACPI table init fails, so fix the code by comparinging both
acpi_disabled and param_acpi_force before the device tree is
unflattened.

CC: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarHanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 735f00bd

arch/arm64/include/asm/acpi.h

+3 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ typedef u64 phys_cpuid_t; 
extern int acpi_disabled;

extern int acpi_noirq;

extern int acpi_pci_disabled;

extern bool param_acpi_force;



/* 1 to indicate PSCI 0.2+ is implemented */

static inline bool acpi_psci_present(void)
@@ -91,6 +92,8 @@ void __init acpi_init_cpus(void); 
static inline bool acpi_psci_present(void) { return false; }

static inline bool acpi_psci_use_hvc(void) { return false; }

static inline void acpi_init_cpus(void) { }



#define param_acpi_force false

#endif /* CONFIG_ACPI */



#endif /*_ASM_ACPI_H*/

arch/arm64/kernel/acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static int enabled_cpus; 
static bool bootcpu_valid  __initdata;



static bool param_acpi_off __initdata;

static bool param_acpi_force __initdata;

bool param_acpi_force __initdata;



static int __init parse_acpi(char *arg)

{

arch/arm64/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ void __init setup_arch(char **cmdline_p) 


	early_ioremap_reset();



	if (acpi_disabled) {

	if (acpi_disabled  && !param_acpi_force) {

		unflatten_device_tree();

		psci_dt_init();

		cpu_read_bootcpu_ops();