Skip to content

Commit 4f6de67

Browse files
Joakim Tjernlundctmarinas
authored andcommitted
arm64: Correct wrong label in macro __init_el2_gicv3
In commit: 114945d ("arm64: Fix labels in el2_setup macros") We renamed a label from '1' to '.Lskip_gicv3_\@', but failed to update a branch to it, which now targets a later label also called '1'. The branch is taken rarely, when GICv3 is present but SRE is disabled at EL3, causing a boot-time crash. Update the caller to the new label name. Fixes: 114945d ("arm64: Fix labels in el2_setup macros") Cc: <stable@vger.kernel.org> # 5.12.x Signed-off-by: Joakim Tjernlund <joakim.tjernlund@infinera.com> Link: https://lore.kernel.org/r/20220214175643.21931-1-joakim.tjernlund@infinera.com Reviewed-by: Mark Rutland <mark.rutland@arm.com> Reviewed-by: Marc Zyngier <maz@kernel.org> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
1 parent da5fb9e commit 4f6de67

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

arch/arm64/include/asm/el2_setup.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
msr_s SYS_ICC_SRE_EL2, x0
107107
isb // Make sure SRE is now set
108108
mrs_s x0, SYS_ICC_SRE_EL2 // Read SRE back,
109-
tbz x0, #0, 1f // and check that it sticks
109+
tbz x0, #0, .Lskip_gicv3_\@ // and check that it sticks
110110
msr_s SYS_ICH_HCR_EL2, xzr // Reset ICC_HCR_EL2 to defaults
111111
.Lskip_gicv3_\@:
112112
.endm

0 commit comments

Comments
 (0)