| 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:53 -0500 |
| Subject: ARM: KVM: report support for SMCCC_ARCH_WORKAROUND_1 |
| 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-16-dave.long@linaro.org> |
| |
| From: Russell King <rmk+kernel@armlinux.org.uk> |
| |
| Commit add5609877c6785cc002c6ed7e008b1d61064439 upstream. |
| |
| Report support for SMCCC_ARCH_WORKAROUND_1 to KVM guests for affected |
| CPUs. |
| |
| Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> |
| Boot-tested-by: Tony Lindgren <tony@atomide.com> |
| Reviewed-by: Tony Lindgren <tony@atomide.com> |
| Reviewed-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_host.h | 14 ++++++++++++-- |
| 1 file changed, 12 insertions(+), 2 deletions(-) |
| |
| --- a/arch/arm/include/asm/kvm_host.h |
| +++ b/arch/arm/include/asm/kvm_host.h |
| @@ -21,6 +21,7 @@ |
| |
| #include <linux/types.h> |
| #include <linux/kvm_types.h> |
| +#include <asm/cputype.h> |
| #include <asm/kvm.h> |
| #include <asm/kvm_asm.h> |
| #include <asm/kvm_mmio.h> |
| @@ -323,8 +324,17 @@ static inline int kvm_arm_vcpu_arch_has_ |
| |
| static inline bool kvm_arm_harden_branch_predictor(void) |
| { |
| - /* No way to detect it yet, pretend it is not there. */ |
| - return false; |
| + switch(read_cpuid_part()) { |
| +#ifdef CONFIG_HARDEN_BRANCH_PREDICTOR |
| + case ARM_CPU_PART_BRAHMA_B15: |
| + case ARM_CPU_PART_CORTEX_A12: |
| + case ARM_CPU_PART_CORTEX_A15: |
| + case ARM_CPU_PART_CORTEX_A17: |
| + return true; |
| +#endif |
| + default: |
| + return false; |
| + } |
| } |
| |
| #define KVM_SSBD_UNKNOWN -1 |
