Commit 9db043d3 authored Feb 20, 2019 by Vladimir Murzin Committed by Russell King Feb 26, 2019

ARM: 8848/1: virt: Align GIC version check with arm64 counterpart

arm64 has got relaxation on GIC version check at early boot stage due
to update of the GIC architecture let's align ARM with that.

To help backports (even though the code was correct at the time of writing)
Fixes: e59941b9 ("ARM: 8527/1: virt: enable GICv3 system registers")
Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com>
Reviewed-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>

parent b7e8c939

arch/arm/kernel/hyp-stub.S

+2 −2

Original line number	Diff line number	Diff line
		@@ -180,8 +180,8 @@ ARM_BE8(orr r7, r7, #(1 << 25)) @ HSCTLR.EE
		@ Check whether GICv3 system registers are available
		mrc p15, 0, r7, c0, c1, 1 @ ID_PFR1
		ubfx r7, r7, #28, #4
		cmp r7, #1
		bne 2f
		teq r7, #0
		beq 2f

		@ Enable system register accesses
		mrc p15, 4, r7, c12, c9, 5 @ ICC_HSRE