diff options
author | Marc Zyngier <marc.zyngier@arm.com> | 2018-05-29 13:11:12 +0100 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2018-05-31 17:35:19 +0100 |
commit | 647d0519b53f440a55df163de21c52a8205431cc (patch) | |
tree | 32e7b767c30e75ce88dfd6574b9c4f8343148e6c /arch/arm64/kernel/cpu_errata.c | |
parent | 986372c4367f46b34a3c0f6918d7fb95cbdf39d6 (diff) | |
download | linux-stable-647d0519b53f440a55df163de21c52a8205431cc.tar.gz linux-stable-647d0519b53f440a55df163de21c52a8205431cc.tar.bz2 linux-stable-647d0519b53f440a55df163de21c52a8205431cc.zip |
arm64: ssbd: Restore mitigation status on CPU resume
On a system where firmware can dynamically change the state of the
mitigation, the CPU will always come up with the mitigation enabled,
including when coming back from suspend.
If the user has requested "no mitigation" via a command line option,
let's enforce it by calling into the firmware again to disable it.
Similarily, for a resume from hibernate, the mitigation could have
been disabled by the boot kernel. Let's ensure that it is set
back on in that case.
Acked-by: Will Deacon <will.deacon@arm.com>
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/kernel/cpu_errata.c')
-rw-r--r-- | arch/arm64/kernel/cpu_errata.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c index 2797bc2c8c6a..cf37ca6fa5f2 100644 --- a/arch/arm64/kernel/cpu_errata.c +++ b/arch/arm64/kernel/cpu_errata.c @@ -303,7 +303,7 @@ void __init arm64_enable_wa2_handling(struct alt_instr *alt, *updptr = cpu_to_le32(aarch64_insn_gen_nop()); } -static void arm64_set_ssbd_mitigation(bool state) +void arm64_set_ssbd_mitigation(bool state) { switch (psci_ops.conduit) { case PSCI_CONDUIT_HVC: |