Skip to content

Commit

Permalink
ARM64: kernel: psci: let ACPI probe PSCI version
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Lorenzo Pieralisi authored and Will Deacon committed Mar 26, 2015
1 parent 48eb3c8 commit d989557
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions arch/arm64/kernel/psci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d989557

Please sign in to comment.