Commit d6c850dd authored by Fuad Tabba's avatar Fuad Tabba Committed by Marc Zyngier
Browse files

KVM: arm64: MDCR_EL2 is a 64-bit register 



Fix the places in KVM that treat MDCR_EL2 as a 32-bit register.
More recent features (e.g., FEAT_SPEv1p2) use bits above 31.

No functional change intended.

Acked-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarFuad Tabba <tabba@google.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20210817081134.2918285-4-tabba@google.com
parent e6bc555c

arch/arm64/include/asm/kvm_arm.h

+10 −10
Original line number Diff line number Diff line
@@ -281,18 +281,18 @@ 
/* Hyp Debug Configuration Register bits */

#define MDCR_EL2_E2TB_MASK	(UL(0x3))

#define MDCR_EL2_E2TB_SHIFT	(UL(24))

#define MDCR_EL2_TTRF		(1 << 19)

#define MDCR_EL2_TPMS		(1 << 14)

#define MDCR_EL2_TTRF		(UL(1) << 19)

#define MDCR_EL2_TPMS		(UL(1) << 14)

#define MDCR_EL2_E2PB_MASK	(UL(0x3))

#define MDCR_EL2_E2PB_SHIFT	(UL(12))

#define MDCR_EL2_TDRA		(1 << 11)

#define MDCR_EL2_TDOSA		(1 << 10)

#define MDCR_EL2_TDA		(1 << 9)

#define MDCR_EL2_TDE		(1 << 8)

#define MDCR_EL2_HPME		(1 << 7)

#define MDCR_EL2_TPM		(1 << 6)

#define MDCR_EL2_TPMCR		(1 << 5)

#define MDCR_EL2_HPMN_MASK	(0x1F)

#define MDCR_EL2_TDRA		(UL(1) << 11)

#define MDCR_EL2_TDOSA		(UL(1) << 10)

#define MDCR_EL2_TDA		(UL(1) << 9)

#define MDCR_EL2_TDE		(UL(1) << 8)

#define MDCR_EL2_HPME		(UL(1) << 7)

#define MDCR_EL2_TPM		(UL(1) << 6)

#define MDCR_EL2_TPMCR		(UL(1) << 5)

#define MDCR_EL2_HPMN_MASK	(UL(0x1F))



/* For compatibility with fault code shared with 32-bit */

#define FSC_FAULT	ESR_ELx_FSC_FAULT

arch/arm64/include/asm/kvm_asm.h

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ extern u64 __vgic_v3_read_vmcr(void); 
extern void __vgic_v3_write_vmcr(u32 vmcr);

extern void __vgic_v3_init_lrs(void);



extern u32 __kvm_get_mdcr_el2(void);

extern u64 __kvm_get_mdcr_el2(void);



#define __KVM_EXTABLE(from, to)						\

	"	.pushsection	__kvm_ex_table, \"a\"\n"		\

arch/arm64/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ struct kvm_vcpu_arch { 


	/* HYP configuration */

	u64 hcr_el2;

	u32 mdcr_el2;

	u64 mdcr_el2;



	/* Exception Information */

	struct kvm_vcpu_fault_info fault;

arch/arm64/kvm/debug.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
				DBG_MDSCR_KDE | \

				DBG_MDSCR_MDE)



static DEFINE_PER_CPU(u32, mdcr_el2);

static DEFINE_PER_CPU(u64, mdcr_el2);



/**

 * save/restore_guest_debug_regs

arch/arm64/kvm/hyp/nvhe/debug-sr.c

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ void __debug_switch_to_host(struct kvm_vcpu *vcpu) 
	__debug_switch_to_host_common(vcpu);

}



u32 __kvm_get_mdcr_el2(void)

u64 __kvm_get_mdcr_el2(void)

{

	return read_sysreg(mdcr_el2);

}