Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7fc401a authored by Russell King's avatar Russell King Committed by Greg Kroah-Hartman
Browse files

ARM: KVM: report support for SMCCC_ARCH_WORKAROUND_1 



Commit add5609877c6785cc002c6ed7e008b1d61064439 upstream.

Report support for SMCCC_ARCH_WORKAROUND_1 to KVM guests for affected
CPUs.

Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Boot-tested-by: default avatarTony Lindgren <tony@atomide.com>
Reviewed-by: default avatarTony Lindgren <tony@atomide.com>
Reviewed-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarDavid A. Long <dave.long@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8502541e

arch/arm/include/asm/kvm_host.h

+12 −2
Original line number Diff line number Diff line
@@ -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>
@@ -298,9 +299,18 @@ int kvm_arm_vcpu_arch_has_attr(struct kvm_vcpu *vcpu, 


static inline bool kvm_arm_harden_branch_predictor(void)

{

	/* No way to detect it yet, pretend it is not there. */

	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

#define KVM_SSBD_FORCE_DISABLE		0