diff options
| author | Vladimir Murzin <vladimir.murzin@arm.com> | 2019-02-20 15:00:13 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-27 14:46:23 +0100 |
| commit | 1a65ea1ea865e74490b2cb186d3ce3f934b9550d (patch) | |
| tree | 59715f79cb41eb749bc08e610ddbefefda2fd69f | |
| parent | feb8ad9508f6fbba81b99cf25af1de7bee72c7b3 (diff) | |
| download | linux-stable-1a65ea1ea865e74490b2cb186d3ce3f934b9550d.tar.gz linux-stable-1a65ea1ea865e74490b2cb186d3ce3f934b9550d.tar.bz2 linux-stable-1a65ea1ea865e74490b2cb186d3ce3f934b9550d.zip | |
ARM: 8848/1: virt: Align GIC version check with arm64 counterpart
[ Upstream commit 9db043d36bd379f4cc99054c079de0dabfc38d03 ]
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: e59941b9b381 ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | arch/arm/kernel/hyp-stub.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S index 60146e32619a..82a942894fc0 100644 --- a/arch/arm/kernel/hyp-stub.S +++ b/arch/arm/kernel/hyp-stub.S @@ -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 |