| From 7798e7e44750e1c36d786e0fd0e909308b105eb4 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 20 Feb 2019 15:00:13 +0100 |
| Subject: ARM: 8848/1: virt: Align GIC version check with arm64 counterpart |
| |
| From: Vladimir Murzin <vladimir.murzin@arm.com> |
| |
| [ 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> |
| --- |
| arch/arm/kernel/hyp-stub.S | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S |
| index 15d073ae5da2a..f5e5e3e196592 100644 |
| --- a/arch/arm/kernel/hyp-stub.S |
| +++ b/arch/arm/kernel/hyp-stub.S |
| @@ -179,8 +179,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 |
| -- |
| 2.20.1 |
| |