OSDN Git Service

arm64: Correct wrong label in macro __init_el2_gicv3
authorJoakim Tjernlund <joakim.tjernlund@infinera.com>
Mon, 14 Feb 2022 17:56:43 +0000 (18:56 +0100)
committerCatalin Marinas <catalin.marinas@arm.com>
Mon, 14 Feb 2022 18:37:07 +0000 (18:37 +0000)
commit4f6de676d94ee8ddfc2e7e7cd935fc7cb2feff3a
tree49bc539368f055b377eeaa3b0714ed605fac30cd
parentda5fb9e1ad3fbf632dce735f1bdad257ca528499
arm64: Correct wrong label in macro __init_el2_gicv3

In commit:

  114945d84a30a5fe ("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: 114945d84a30 ("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>
arch/arm64/include/asm/el2_setup.h