mirror of
https://git.yoctoproject.org/meta-arm
synced 2026-05-09 17:40:46 +00:00
arm-bsp/linux-yocto: remove upstreamed corstone1000 patch
This patch is now merged upstream in 7285daac, 5.15.25 onwards. Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
-47
@@ -1,47 +0,0 @@
|
|||||||
Upstream-Status: Backport [4f6de676d94ee8ddfc2e7e7cd935fc7cb2feff3a]
|
|
||||||
Signed-off-by: Emekcan Aras <Emekcan.Aras@arm.com>
|
|
||||||
|
|
||||||
From 5bad687c47aa1958042e34695824da44cf28d6ff Mon Sep 17 00:00:00 2001
|
|
||||||
From: Joakim Tjernlund <joakim.tjernlund@infinera.com>
|
|
||||||
Date: Mon, 14 Feb 2022 18:56:43 +0100
|
|
||||||
Subject: [PATCH] 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 | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/arch/arm64/include/asm/el2_setup.h b/arch/arm64/include/asm/el2_setup.h
|
|
||||||
index 3198acb2aad8..7f3c87f7a0ce 100644
|
|
||||||
--- a/arch/arm64/include/asm/el2_setup.h
|
|
||||||
+++ b/arch/arm64/include/asm/el2_setup.h
|
|
||||||
@@ -106,7 +106,7 @@
|
|
||||||
msr_s SYS_ICC_SRE_EL2, x0
|
|
||||||
isb // Make sure SRE is now set
|
|
||||||
mrs_s x0, SYS_ICC_SRE_EL2 // Read SRE back,
|
|
||||||
- tbz x0, #0, 1f // and check that it sticks
|
|
||||||
+ tbz x0, #0, .Lskip_gicv3_\@ // and check that it sticks
|
|
||||||
msr_s SYS_ICH_HCR_EL2, xzr // Reset ICC_HCR_EL2 to defaults
|
|
||||||
.Lskip_gicv3_\@:
|
|
||||||
.endm
|
|
||||||
--
|
|
||||||
2.25.1
|
|
||||||
|
|
||||||
@@ -39,7 +39,6 @@ LINUX_KERNEL_TYPE:corstone1000 = "standard"
|
|||||||
#disabling the rootfs cpio file compression so it is not compressed twice when bundled with the kernel
|
#disabling the rootfs cpio file compression so it is not compressed twice when bundled with the kernel
|
||||||
KERNEL_EXTRA_ARGS:corstone1000 += "CONFIG_INITRAMFS_COMPRESSION_NONE=y"
|
KERNEL_EXTRA_ARGS:corstone1000 += "CONFIG_INITRAMFS_COMPRESSION_NONE=y"
|
||||||
SRC_URI:append:corstone1000 = " \
|
SRC_URI:append:corstone1000 = " \
|
||||||
file://0001-arm64-Correct-wrong-label-in-macro-__init_el2_gicv3.patch \
|
|
||||||
file://defconfig \
|
file://defconfig \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user