summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2018-10-15 11:32:07 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-10-18 09:16:27 +0200
commitee4e537d3aa18e9a35fef400961ba0ce8edaf7b9 (patch)
tree8b9dea380de99a3da14dce0d4aace6d32ea96d1b
parent1df9a0a8201b4ba2e58f54c0b88810a8cc4f3fbd (diff)
downloadlinux-rpi3-ee4e537d3aa18e9a35fef400961ba0ce8edaf7b9.tar.gz
linux-rpi3-ee4e537d3aa18e9a35fef400961ba0ce8edaf7b9.tar.bz2
linux-rpi3-ee4e537d3aa18e9a35fef400961ba0ce8edaf7b9.zip
ARM: spectre-v2: KVM: invalidate icache on guest exit for Brahma B15
Commit 3c908e16396d130608e831b7fac4b167a2ede6ba upstream. Include Brahma B15 in the Spectre v2 KVM workarounds. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Acked-by: Florian Fainelli <f.fainelli@gmail.com> Boot-tested-by: Tony Lindgren <tony@atomide.com> Reviewed-by: Tony Lindgren <tony@atomide.com> Acked-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: David A. Long <dave.long@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/arm/include/asm/kvm_mmu.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/kvm_mmu.h b/arch/arm/include/asm/kvm_mmu.h
index 082b2861926d..ca62f95f3b4c 100644
--- a/arch/arm/include/asm/kvm_mmu.h
+++ b/arch/arm/include/asm/kvm_mmu.h
@@ -255,6 +255,7 @@ static inline void *kvm_get_hyp_vector(void)
return kvm_ksym_ref(__kvm_hyp_vector_bp_inv);
}
+ case ARM_CPU_PART_BRAHMA_B15:
case ARM_CPU_PART_CORTEX_A15:
{
extern char __kvm_hyp_vector_ic_inv[];