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

Commit 21bc5281 authored by Mark Rutland's avatar Mark Rutland Committed by Marc Zyngier
Browse files

arm64/kvm: sysreg: fix typo'd SYS_ICC_IGRPEN*_EL1 



Per ARM DDI 0487B.a, the registers are named ICC_IGRPEN*_EL1 rather than
ICC_GRPEN*_EL1. Correct our mnemonics and comments to match, before we
add more GICv3 register definitions.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: kvmarm@lists.cs.columbia.edu
Acked-by: default avatarChristoffer Dall <cdall@linaro.org>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarChristoffer Dall <cdall@linaro.org>
parent 7b1dba1f

arch/arm64/include/asm/arch_gicv3.h

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static inline void gic_write_ctlr(u32 val) 


static inline void gic_write_grpen1(u32 val)

{

	write_sysreg_s(val, SYS_ICC_GRPEN1_EL1);

	write_sysreg_s(val, SYS_ICC_IGRPEN1_EL1);

	isb();

}

arch/arm64/include/asm/sysreg.h

+2 −2
Original line number Diff line number Diff line
@@ -195,8 +195,8 @@ 
#define SYS_ICC_BPR1_EL1		sys_reg(3, 0, 12, 12, 3)

#define SYS_ICC_CTLR_EL1		sys_reg(3, 0, 12, 12, 4)

#define SYS_ICC_SRE_EL1			sys_reg(3, 0, 12, 12, 5)

#define SYS_ICC_GRPEN0_EL1		sys_reg(3, 0, 12, 12, 6)

#define SYS_ICC_GRPEN1_EL1		sys_reg(3, 0, 12, 12, 7)

#define SYS_ICC_IGRPEN0_EL1		sys_reg(3, 0, 12, 12, 6)

#define SYS_ICC_IGRPEN1_EL1		sys_reg(3, 0, 12, 12, 7)



#define SYS_CONTEXTIDR_EL1		sys_reg(3, 0, 13, 0, 1)

#define SYS_TPIDR_EL1			sys_reg(3, 0, 13, 0, 4)

arch/arm64/kvm/vgic-sys-reg-v3.c

+1 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ static const struct sys_reg_desc gic_v3_icc_reg_descs[] = { 
	{ Op0(3), Op1(0), CRn(12), CRm(12), Op2(5), access_gic_sre },

	/* ICC_IGRPEN0_EL1 */

	{ Op0(3), Op1(0), CRn(12), CRm(12), Op2(6), access_gic_grpen0 },

	/* ICC_GRPEN1_EL1 */

	/* ICC_IGRPEN1_EL1 */

	{ Op0(3), Op1(0), CRn(12), CRm(12), Op2(7), access_gic_grpen1 },

};

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

+2 −2
Original line number Diff line number Diff line
@@ -986,7 +986,7 @@ int __hyp_text __vgic_v3_perform_cpuif_access(struct kvm_vcpu *vcpu) 
			return 0;

		fn = __vgic_v3_write_eoir;

		break;

	case SYS_ICC_GRPEN1_EL1:

	case SYS_ICC_IGRPEN1_EL1:

		if (is_read)

			fn = __vgic_v3_read_igrpen1;

		else
@@ -1032,7 +1032,7 @@ int __hyp_text __vgic_v3_perform_cpuif_access(struct kvm_vcpu *vcpu) 
			return 0;

		fn = __vgic_v3_read_hppir;

		break;

	case SYS_ICC_GRPEN0_EL1:

	case SYS_ICC_IGRPEN0_EL1:

		if (is_read)

			fn = __vgic_v3_read_igrpen0;

		else