diff mbox series

arm-bsp/linux-yocto: remove upstreamed corstone1000 patch

Message ID 20220307155815.2814399-1-ross.burton@arm.com
State New
Headers show
Series arm-bsp/linux-yocto: remove upstreamed corstone1000 patch | expand

Commit Message

Ross Burton March 7, 2022, 3:58 p.m. UTC 
This patch is now merged upstream in 7285daac, 5.15.25 onwards.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 ...rong-label-in-macro-__init_el2_gicv3.patch | 47 -------------------
 .../linux/linux-arm-platforms.inc             |  1 -
 2 files changed, 48 deletions(-)
 delete mode 100644 meta-arm-bsp/recipes-kernel/linux/files/corstone1000/0001-arm64-Correct-wrong-label-in-macro-__init_el2_gicv3.patch

Comments

Jon Mason March 7, 2022, 6:55 p.m. UTC | #1 
On Mon, 7 Mar 2022 15:58:15 +0000, Ross Burton wrote:
> This patch is now merged upstream in 7285daac, 5.15.25 onwards.

Applied, thanks!

[1/1] arm-bsp/linux-yocto: remove upstreamed corstone1000 patch
      commit: 8b377a5c7d71deedc36a3fb6acd33e8b19f1d4e9

Best regards,
diff mbox series

Patch

diff --git a/meta-arm-bsp/recipes-kernel/linux/files/corstone1000/0001-arm64-Correct-wrong-label-in-macro-__init_el2_gicv3.patch b/meta-arm-bsp/recipes-kernel/linux/files/corstone1000/0001-arm64-Correct-wrong-label-in-macro-__init_el2_gicv3.patch
deleted file mode 100644
index b0ede372..00000000
--- a/meta-arm-bsp/recipes-kernel/linux/files/corstone1000/0001-arm64-Correct-wrong-label-in-macro-__init_el2_gicv3.patch
+++ /dev/null
@@ -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
-
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc
index 2ea47bc3..95ecfd53 100644
--- a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc
+++ b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc
@@ -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
 KERNEL_EXTRA_ARGS:corstone1000 += "CONFIG_INITRAMFS_COMPRESSION_NONE=y"
 SRC_URI:append:corstone1000 = " \
-           file://0001-arm64-Correct-wrong-label-in-macro-__init_el2_gicv3.patch \
            file://defconfig  \
         "