summaryrefslogtreecommitdiffstats
path: root/arch/arm64/kernel/psci.c
diff options
context:
space:
mode:
authorLorenzo Pieralisi <lorenzo.pieralisi@arm.com>2015-03-24 17:58:53 +0000
committerWill Deacon <will.deacon@arm.com>2015-03-26 15:13:10 +0000
commitd9895571877e965a9f3e18a2a30611322099ae30 (patch)
tree1738fc24eacf8b5467cad3d5c6626855025c1615 /arch/arm64/kernel/psci.c
parent48eb3c8a8b4fffb48f64019e1f68a7de4db4cc43 (diff)
downloadlinux-d9895571877e965a9f3e18a2a30611322099ae30.tar.gz
linux-d9895571877e965a9f3e18a2a30611322099ae30.tar.bz2
linux-d9895571877e965a9f3e18a2a30611322099ae30.zip
ARM64: kernel: psci: let ACPI probe PSCI version
PSCI v0.2+ allows the kernel to probe the PSCI firmware version. This patch replaces the default initialization of PSCI v0.2+ functions with code that allows probing PSCI firmware version and initializes PSCI functions accordingly. Cc: Sudeep Holla <sudeep.holla@arm.com> Cc: Mark Rutland <mark.rutland@arm.com> Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/kernel/psci.c')
-rw-r--r--arch/arm64/kernel/psci.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c
index 2caac4498154..ea18cb53921e 100644
--- a/arch/arm64/kernel/psci.c
+++ b/arch/arm64/kernel/psci.c
@@ -439,9 +439,7 @@ int __init psci_acpi_init(void)
else
invoke_psci_fn = __invoke_psci_fn_smc;
- psci_0_2_set_functions();
-
- return 0;
+ return psci_probe();
}
#ifdef CONFIG_SMP