diff options
| author | Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> | 2015-05-13 15:12:47 +0200 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2015-05-19 17:09:29 +0200 |
| commit | 0f0783365cbb7ec13a8f02198f6e1a146d94a5a9 (patch) | |
| tree | bb22a64d655d11cac8135fb3852d2b28c63531e5 /arch/arm64/include/asm/acpi.h | |
| parent | ARM64: kernel: make cpu_ops hooks DT agnostic (diff) | |
| download | linux-0f0783365cbb7ec13a8f02198f6e1a146d94a5a9.tar.xz linux-0f0783365cbb7ec13a8f02198f6e1a146d94a5a9.zip | |
ARM64: kernel: unify ACPI and DT cpus initialization
The code that initializes cpus on arm64 is currently split in two
different code paths that carry out DT and ACPI cpus initialization.
Most of the code executing SMP initialization is common and should
be merged to reduce discrepancies between ACPI and DT initialization
and to have code initializing cpus in a single common place in the
kernel.
This patch refactors arm64 SMP cpus initialization code to merge
ACPI and DT boot paths in a common file and to create sanity
checks that can be reused by both boot methods.
Current code assumes PSCI is the only available boot method
when arm64 boots with ACPI; this can be easily extended if/when
the ACPI parking protocol is merged into the kernel.
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: Hanjun Guo <hanjun.guo@linaro.org>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Tested-by: Hanjun Guo <hanjun.guo@linaro.org>
Tested-by: Mark Rutland <mark.rutland@arm.com> [DT]
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/include/asm/acpi.h')
| -rw-r--r-- | arch/arm64/include/asm/acpi.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h index 59c05d8ea4a0..1240b867d4a2 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h @@ -93,4 +93,8 @@ static inline bool acpi_psci_use_hvc(void) { return false; } static inline void acpi_init_cpus(void) { } #endif /* CONFIG_ACPI */ +static inline const char *acpi_get_enable_method(int cpu) +{ + return acpi_psci_present() ? "psci" : NULL; +} #endif /*_ASM_ACPI_H*/ |