Commit 2a6bf513 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

Merge branch kvm-arm64/misc-5.16 into kvmarm-master/next 



* kvm-arm64/misc-5.16:
  : .
  : - Allow KVM to be disabled from the command-line
  : - Clean up CONFIG_KVM vs CONFIG_HAVE_KVM
  : - Fix endianess evaluation on MMIO access from EL0
  : .
  KVM: arm64: Fix reporting of endianess when the access originates at EL0

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parents cd67e9af 69adec18

arch/arm64/include/asm/kvm_emulate.h

+4 −1
Original line number Diff line number Diff line
@@ -396,7 +396,10 @@ static inline bool kvm_vcpu_is_be(struct kvm_vcpu *vcpu) 
	if (vcpu_mode_is_32bit(vcpu))

		return !!(*vcpu_cpsr(vcpu) & PSR_AA32_E_BIT);



	return !!(vcpu_read_sys_reg(vcpu, SCTLR_EL1) & (1 << 25));

	if (vcpu_mode_priv(vcpu))

		return !!(vcpu_read_sys_reg(vcpu, SCTLR_EL1) & SCTLR_ELx_EE);

	else

		return !!(vcpu_read_sys_reg(vcpu, SCTLR_EL1) & SCTLR_EL1_E0E);

}



static inline unsigned long vcpu_data_guest_to_host(struct kvm_vcpu *vcpu,