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

ARM: KVM: Correctly order SGI register entries in the cp15 array 



The ICC_ASGI1R and ICC_SGI0R register entries in the cp15 array
are not correctly ordered, leading to a BUG() at boot time.

Move them to their natural location.

Fixes: 3e8a8a50 ("KVM: arm: vgic-v3: Add support for ICC_SGI0R and ICC_ASGI1R accesses")
Reported-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Tested-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 7876320f

arch/arm/kvm/coproc.c

+4 −4
Original line number Diff line number Diff line
@@ -478,15 +478,15 @@ static const struct coproc_reg cp15_regs[] = { 


	/* ICC_SGI1R */

	{ CRm64(12), Op1( 0), is64, access_gic_sgi},

	/* ICC_ASGI1R */

	{ CRm64(12), Op1( 1), is64, access_gic_sgi},

	/* ICC_SGI0R */

	{ CRm64(12), Op1( 2), is64, access_gic_sgi},



	/* VBAR: swapped by interrupt.S. */

	{ CRn(12), CRm( 0), Op1( 0), Op2( 0), is32,

			NULL, reset_val, c12_VBAR, 0x00000000 },



	/* ICC_ASGI1R */

	{ CRm64(12), Op1( 1), is64, access_gic_sgi},

	/* ICC_SGI0R */

	{ CRm64(12), Op1( 2), is64, access_gic_sgi},

	/* ICC_SRE */

	{ CRn(12), CRm(12), Op1( 0), Op2(5), is32, access_gic_sre },