| From foo@baz Wed Nov 21 19:20:53 CET 2018 |
| From: David Long <dave.long@linaro.org> |
| Date: Wed, 7 Nov 2018 11:43:51 -0500 |
| Subject: ARM: spectre-v2: KVM: invalidate icache on guest exit for Brahma B15 |
| To: stable@vger.kernel.org, Russell King - ARM Linux <linux@armlinux.org.uk>, Florian Fainelli <f.fainelli@gmail.com>, Tony Lindgren <tony@atomide.com>, Marc Zyngier <marc.zyngier@arm.com>, Mark Rutland <mark.rutland@arm.com> |
| Cc: Greg KH <gregkh@linuxfoundation.org>, Mark Brown <broonie@kernel.org> |
| Message-ID: <20181107164402.9380-14-dave.long@linaro.org> |
| |
| From: Russell King <rmk+kernel@armlinux.org.uk> |
| |
| 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> |
| --- |
| arch/arm/include/asm/kvm_mmu.h | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| --- a/arch/arm/include/asm/kvm_mmu.h |
| +++ b/arch/arm/include/asm/kvm_mmu.h |
| @@ -257,6 +257,7 @@ static inline void *kvm_get_hyp_vector(v |
| 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[]; |
