summaryrefslogtreecommitdiffstats
path: root/drivers/firmware
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2018-01-02 22:45:41 +0100
committerCatalin Marinas <catalin.marinas@arm.com>2018-01-08 19:43:38 +0100
commitd68e3ba5303f7e1099f51fdcd155f5263da8569b (patch)
tree26dd6bb5f38353a19ac9f80989f0a30f7dfa7ca6 /drivers/firmware
parentarm64: cpufeature: Pass capability structure to ->enable callback (diff)
downloadlinux-d68e3ba5303f7e1099f51fdcd155f5263da8569b.tar.xz
linux-d68e3ba5303f7e1099f51fdcd155f5263da8569b.zip
drivers/firmware: Expose psci_get_version through psci_ops structure
Entry into recent versions of ARM Trusted Firmware will invalidate the CPU branch predictor state in order to protect against aliasing attacks. This patch exposes the PSCI "VERSION" function via psci_ops, so that it can be invoked outside of the PSCI driver where necessary. Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'drivers/firmware')
-rw-r--r--drivers/firmware/psci.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
index d687ca3d5049..8b25d31e8401 100644
--- a/drivers/firmware/psci.c
+++ b/drivers/firmware/psci.c
@@ -496,6 +496,8 @@ static void __init psci_init_migrate(void)
static void __init psci_0_2_set_functions(void)
{
pr_info("Using standard PSCI v0.2 function IDs\n");
+ psci_ops.get_version = psci_get_version;
+
psci_function_id[PSCI_FN_CPU_SUSPEND] =
PSCI_FN_NATIVE(0_2, CPU_SUSPEND);
psci_ops.cpu_suspend = psci_cpu_suspend;