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

Commit 561454e2 authored by Mark Rutland's avatar Mark Rutland Committed by Catalin Marinas
Browse files

arm64/kvm: use ESR_ELx_EC to extract EC 



Now that we have a helper to extract the EC from an ESR_ELx value, make
use of this in the arm64 KVM code for simplicity and consistency. There
should be no functional changes as a result of this patch.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Cc: Dave P Martin <dave.martin@arm.com>
Cc: Huang Shijie <shijie.huang@arm.com>
Cc: James Morse <james.morse@arm.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: kvmarm@lists.cs.columbia.edu
Acked-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 275f344b

arch/arm64/include/asm/kvm_emulate.h

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ static inline bool kvm_vcpu_trap_il_is32bit(const struct kvm_vcpu *vcpu) 


static inline u8 kvm_vcpu_trap_get_class(const struct kvm_vcpu *vcpu)

{

	return kvm_vcpu_get_hsr(vcpu) >> ESR_ELx_EC_SHIFT;

	return ESR_ELx_EC(kvm_vcpu_get_hsr(vcpu));

}



static inline bool kvm_vcpu_trap_is_iabt(const struct kvm_vcpu *vcpu)

arch/arm64/kvm/handle_exit.c

+2 −2
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static int kvm_handle_guest_debug(struct kvm_vcpu *vcpu, struct kvm_run *run) 
	run->exit_reason = KVM_EXIT_DEBUG;

	run->debug.arch.hsr = hsr;



	switch (hsr >> ESR_ELx_EC_SHIFT) {

	switch (ESR_ELx_EC(hsr)) {

	case ESR_ELx_EC_WATCHPT_LOW:

		run->debug.arch.far = vcpu->arch.fault.far_el2;

		/* fall through */
@@ -149,7 +149,7 @@ static exit_handle_fn arm_exit_handlers[] = { 
static exit_handle_fn kvm_get_exit_handler(struct kvm_vcpu *vcpu)

{

	u32 hsr = kvm_vcpu_get_hsr(vcpu);

	u8 hsr_ec = hsr >> ESR_ELx_EC_SHIFT;

	u8 hsr_ec = ESR_ELx_EC(hsr);



	if (hsr_ec >= ARRAY_SIZE(arm_exit_handlers) ||

	    !arm_exit_handlers[hsr_ec]) {

arch/arm64/kvm/hyp/switch.c

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ static bool __hyp_text __translate_far_to_hpfar(u64 far, u64 *hpfar) 
static bool __hyp_text __populate_fault_info(struct kvm_vcpu *vcpu)

{

	u64 esr = read_sysreg_el2(esr);

	u8 ec = esr >> ESR_ELx_EC_SHIFT;

	u8 ec = ESR_ELx_EC(esr);

	u64 hpfar, far;



	vcpu->arch.fault.esr_el2 = esr;