]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ARM64: kernel: psci: let ACPI probe PSCI version
authorLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Tue, 24 Mar 2015 17:58:53 +0000 (17:58 +0000)
committerWill Deacon <will.deacon@arm.com>
Thu, 26 Mar 2015 15:13:10 +0000 (15:13 +0000)
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>
arch/arm64/kernel/psci.c

index 2caac44981547922c1379d0647ecee470c504a1a..ea18cb53921e8f8ed8197c6cc7090473a5ba56af 100644 (file)
@@ -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