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

Commit b98c079b authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm64: Fix ICH_ELRSR_EL2 sysreg naming 



We previously incorrectly named the define for this system register.

Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@arm.com>
parent accb99bc

arch/arm/include/asm/arch_gicv3.h

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
#define ICH_VTR				__ACCESS_CP15(c12, 4, c11, 1)

#define ICH_MISR			__ACCESS_CP15(c12, 4, c11, 2)

#define ICH_EISR			__ACCESS_CP15(c12, 4, c11, 3)

#define ICH_ELSR			__ACCESS_CP15(c12, 4, c11, 5)

#define ICH_ELRSR			__ACCESS_CP15(c12, 4, c11, 5)

#define ICH_VMCR			__ACCESS_CP15(c12, 4, c11, 7)



#define __LR0(x)			__ACCESS_CP15(c12, 4, c12, x)
@@ -151,7 +151,7 @@ CPUIF_MAP(ICH_HCR, ICH_HCR_EL2) 
CPUIF_MAP(ICH_VTR, ICH_VTR_EL2)

CPUIF_MAP(ICH_MISR, ICH_MISR_EL2)

CPUIF_MAP(ICH_EISR, ICH_EISR_EL2)

CPUIF_MAP(ICH_ELSR, ICH_ELSR_EL2)

CPUIF_MAP(ICH_ELRSR, ICH_ELRSR_EL2)

CPUIF_MAP(ICH_VMCR, ICH_VMCR_EL2)

CPUIF_MAP(ICH_AP0R3, ICH_AP0R3_EL2)

CPUIF_MAP(ICH_AP0R2, ICH_AP0R2_EL2)

arch/arm64/include/asm/sysreg.h

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ 
#define SYS_ICH_VTR_EL2			sys_reg(3, 4, 12, 11, 1)

#define SYS_ICH_MISR_EL2		sys_reg(3, 4, 12, 11, 2)

#define SYS_ICH_EISR_EL2		sys_reg(3, 4, 12, 11, 3)

#define SYS_ICH_ELSR_EL2		sys_reg(3, 4, 12, 11, 5)

#define SYS_ICH_ELRSR_EL2		sys_reg(3, 4, 12, 11, 5)

#define SYS_ICH_VMCR_EL2		sys_reg(3, 4, 12, 11, 7)



#define __SYS__LR0_EL2(x)		sys_reg(3, 4, 12, 12, x)

virt/kvm/arm/hyp/vgic-v3-sr.c

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ void __hyp_text __vgic_v3_save_state(struct kvm_vcpu *vcpu) 
		int i;

		u32 elrsr;



		elrsr = read_gicreg(ICH_ELSR_EL2);

		elrsr = read_gicreg(ICH_ELRSR_EL2);



		write_gicreg(cpu_if->vgic_hcr & ~ICH_HCR_EN, ICH_HCR_EL2);