Skip to contentSkip to conversation

arm-bsp/fvp-base: u-boot patch clean-up

PATCH New Jon Mason 1 participant 4 messages Aug 2, 2024

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH 1/4 arm-bsp/fvp-base: u-boot patch clean-up

Move the fvp-base unique u-boot patches to the proper nested directory and rename them to match convention (devtool style).

---
 .../recipes-bsp/u-boot/u-boot-fvp-base.inc    |  3 +-
 ...-wfe-definitions-to-common-Arm-heade.patch | 84 ++++++++++++++++
 ...c_timer-Use-event-stream-for-udelay.patch} | 98 ++-----------------
 3 files changed, 94 insertions(+), 91 deletions(-)
 create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0004-arm-Move-sev-and-wfe-definitions-to-common-Arm-heade.patch
 rename meta-arm-bsp/recipes-bsp/u-boot/u-boot/{tick.patch => fvp-base/0005-armv8-generic_timer-Use-event-stream-for-udelay.patch} (53%)
meta-arm-bsp/recipes-bsp/u-boot/u-boot-fvp-base.inc +2 -1
index 9f8c178a29ef..1bde9c64944a 100644
@@ -4,5 +4,6 @@ SRC_URI:append = " \
     file://0001-vexpress64-Set-the-DM_RNG-property.patch \
     file://0002-vexpress64-Select-PSCI-RESET-by-default.patch \
     file://0003-vexpress64-Imply-CONFIG_ARM64_CRC32-by-default.patch \
-    file://tick.patch \
+    file://0004-arm-Move-sev-and-wfe-definitions-to-common-Arm-heade.patch \
+    file://0005-armv8-generic_timer-Use-event-stream-for-udelay.patch \
     "
meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0004-arm-Move-sev-and-wfe-definitions-to-common-Arm-heade.patch new file +84 -0

84 lines not on this page · raw message

meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0005-armv8-generic_timer-Use-event-stream-for-udelay.patch renamed from meta-arm-bsp/recipes-bsp/u-boot/u-boot/tick.patch +8 -90

132 lines not on this page · raw message

Signature · 1 line
2.39.3 (Apple Git-146)
author
#1 lore raw

PATCH 2/4 arm: use devtool to clean-up patches

---
 .../optee/optee-os/0003-optee-enable-clang-support.patch | 5 ++---
 ...runtime-revert-usage-of-plat_ic_has_interrupt_t.patch | 7 ++-----
 ...measured_boot.c-ignore-TPM-error-and-continue-w.patch | 9 +++------
 .../0001-Patch-in-the-paths-to-the-SBSA-test-suite.patch | 4 ++--
 .../0002-Enforce-using-good-old-BFD-linker.patch         | 4 ++--
 .../gator-daemon/0001-Include-missing-cstdint.patch      | 7 ++-----
 .../0001-daemon-mxml-Define-_GNU_SOURCE.patch            | 7 ++-----
 .../optee-ftpm/0001-add-enum-to-ta-flags.patch           | 4 ++--
 .../optee/optee-os/0003-optee-enable-clang-support.patch | 5 ++---
 9 files changed, 19 insertions(+), 33 deletions(-)
meta-arm-bsp/recipes-security/optee/optee-os/0003-optee-enable-clang-support.patch +2 -3
index 3c13ce3f028c..4718c36d5da1 100644
@@ -1,4 +1,4 @@
-From 59d4c190eae11c93b26cca5a7b005a17dadc8248 Mon Sep 17 00:00:00 2001
+From 1cd944e1953a8665db9019faddc8e7dc31ca20fa Mon Sep 17 00:00:00 2001
 From: Brett Warren <[email protected]>
 Date: Wed, 23 Sep 2020 09:27:34 +0100
 Subject: [PATCH] optee: enable clang support
@@ -10,13 +10,12 @@ compiler-rt. This is mitigated by including the variable as ammended.
 Upstream-Status: Pending
 ChangeId: 8ba69a4b2eb8ebaa047cb266c9aa6c2c3da45701
 Signed-off-by: Brett Warren <[email protected]>
-
 ---
  mk/clang.mk | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/mk/clang.mk b/mk/clang.mk
-index a045beee8..1ebe2f702 100644
+index a045beee8482..1ebe2f702dcd 100644
 --- a/mk/clang.mk
 +++ b/mk/clang.mk
 @@ -30,7 +30,7 @@ comp-cflags-warns-clang := -Wno-language-extension-token \
meta-arm/recipes-bsp/trusted-firmware-a/files/0001-bl31_runtime-revert-usage-of-plat_ic_has_interrupt_t.patch +2 -5
index f6f054df5ae8..bd68c62b865c 100644
@@ -1,4 +1,4 @@
-From fd13a4d304da4233cb954329bf287ec9dfbb7367 Mon Sep 17 00:00:00 2001
+From 29fbd6207d1fcd357c59db124c9983b30b5ccaed Mon Sep 17 00:00:00 2001
 From: Jon Mason <[email protected]>
 Date: Mon, 4 Dec 2023 10:20:21 -0500
 Subject: [PATCH] bl31_runtime: revert usage of plat_ic_has_interrupt_type
@@ -18,7 +18,7 @@ Upstream-Status: Pending
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/bl31/interrupt_mgmt.c b/bl31/interrupt_mgmt.c
-index 68c7f10add21..8e888b676b35 100644
+index a2b2c06859b6..1bcaaf56f912 100644
 --- a/bl31/interrupt_mgmt.c
 +++ b/bl31/interrupt_mgmt.c
 @@ -47,9 +47,9 @@ static intr_type_desc_t intr_type_descs[MAX_INTR_TYPES];
@@ -33,6 +33,3 @@ index 68c7f10add21..8e888b676b35 100644
  
  	return -EINVAL;
  }
--- 
-2.30.2
-
meta-arm/recipes-bsp/trusted-firmware-a/files/0001-qemu_measured_boot.c-ignore-TPM-error-and-continue-w.patch +3 -6
index 2d189d8e8c89..75103332e32e 100644
@@ -1,4 +1,4 @@
-From 1d1425bde8435d6e2b3e4f2b7bcb2eb293ef9601 Mon Sep 17 00:00:00 2001
+From b91c651e6d596cfe27448b19c8fb2f1168493827 Mon Sep 17 00:00:00 2001
 From: Mikko Rapeli <[email protected]>
 Date: Mon, 15 Jan 2024 09:26:56 +0000
 Subject: [PATCH] qemu_measured_boot.c: ignore TPM error and continue with boot
@@ -18,10 +18,10 @@ Signed-off-by: Mikko Rapeli <[email protected]>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/plat/qemu/qemu/qemu_measured_boot.c b/plat/qemu/qemu/qemu_measured_boot.c
-index 122bb23b14..731b081c47 100644
+index 76a4da17e6a9..ec7f44d3720d 100644
 --- a/plat/qemu/qemu/qemu_measured_boot.c
 +++ b/plat/qemu/qemu/qemu_measured_boot.c
-@@ -79,7 +79,8 @@ void bl2_plat_mboot_finish(void)
+@@ -80,7 +80,8 @@ void bl2_plat_mboot_finish(void)
  		 * Note: In QEMU platform, OP-TEE uses nt_fw_config to get the
  		 * secure Event Log buffer address.
  		 */
@@ -31,6 +31,3 @@ index 122bb23b14..731b081c47 100644
  	}
  
  	/* Copy Event Log to Non-secure memory */
--- 
-2.34.1
-
meta-arm/recipes-bsp/uefi/sbsa-acs/0001-Patch-in-the-paths-to-the-SBSA-test-suite.patch +2 -2
index 236245fe7923..6d626be5b8d3 100644
@@ -1,4 +1,4 @@
-From 3a164d9f17591a545d1eafa629b486d4a1563722 Mon Sep 17 00:00:00 2001
+From e7918dbd4a02be2a474534da3f1e565931a5e632 Mon Sep 17 00:00:00 2001
 From: Ross Burton <[email protected]>
 Date: Thu, 16 Feb 2023 21:53:25 +0000
 Subject: [PATCH] Patch in the paths to the SBSA test suite
@@ -10,7 +10,7 @@ Signed-off-by: Ross Burton <[email protected]>
  1 file changed, 3 insertions(+)
 
 diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc
-index dd0d88603f11..91710c0795dc 100644
+index 557b0ec0f3d6..85b3f4fc65d0 100644
 --- a/ShellPkg/ShellPkg.dsc
 +++ b/ShellPkg/ShellPkg.dsc
 @@ -23,6 +23,8 @@
meta-arm/recipes-bsp/uefi/sbsa-acs/0002-Enforce-using-good-old-BFD-linker.patch +2 -2
index 284191d30b97..68a25c71c1d1 100644
@@ -1,4 +1,4 @@
-From 6c403e3ccaae3bb3fd9d0ad220ed8ea98b2b1354 Mon Sep 17 00:00:00 2001
+From 365fb8ebbefaa3c642e18e3c3a16eeccfa0dcc82 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Wed, 7 Apr 2021 00:16:07 -0700
 Subject: [PATCH] Enforce using good old BFD linker
@@ -17,7 +17,7 @@ Signed-off-by: Khem Raj <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
-index 1bf62362b611..2b41be8d5a44 100755
+index c34ecfd557c5..153d097a2688 100755
 --- a/BaseTools/Conf/tools_def.template
 +++ b/BaseTools/Conf/tools_def.template
 @@ -747,7 +747,7 @@ DEFINE GCC_AARCH64_CC_FLAGS        = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -fno-
meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Include-missing-cstdint.patch +2 -5
index 294f804fb4a0..20e994e84e3f 100644
@@ -1,4 +1,4 @@
-From 87745a6cad0f7819ac8f8d3826f5e228ebd843c5 Mon Sep 17 00:00:00 2001
+From 8fba2fe012648efb526d17688c8ed3e5e72f715c Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Thu, 2 Feb 2023 16:39:26 -0800
 Subject: [PATCH] Include missing <cstdint>
@@ -16,7 +16,7 @@ Signed-off-by: Khem Raj <[email protected]>
  1 file changed, 1 insertion(+)
 
 diff --git a/daemon/xml/CurrentConfigXML.h b/daemon/xml/CurrentConfigXML.h
-index 0b239fd..d9047e3 100644
+index 0b239fdb1d70..d9047e3bc080 100644
 --- a/daemon/xml/CurrentConfigXML.h
 +++ b/daemon/xml/CurrentConfigXML.h
 @@ -1,6 +1,7 @@
@@ -27,6 +27,3 @@ index 0b239fd..d9047e3 100644
  #include <set>
  #include <string>
  
--- 
-2.39.1
-
meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-daemon-mxml-Define-_GNU_SOURCE.patch +2 -5
index d2460434f010..0cab34aeaa45 100644
@@ -1,4 +1,4 @@
-From 04e2e924c3ab8da41343277746804dbcd7bf520d Mon Sep 17 00:00:00 2001
+From ab3b2c4a6f2ae839bf3bbcae97493ece574852a7 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Sat, 13 Aug 2022 16:49:52 -0700
 Subject: [PATCH] daemon/mxml: Define _GNU_SOURCE
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <[email protected]>
  1 file changed, 2 insertions(+)
 
 diff --git a/daemon/mxml/mxml-string.c b/daemon/mxml/mxml-string.c
-index 678aeb9..c9cd153 100644
+index 678aeb9c7605..c9cd153030da 100644
 --- a/daemon/mxml/mxml-string.c
 +++ b/daemon/mxml/mxml-string.c
 @@ -13,6 +13,8 @@
@@ -26,6 +26,3 @@ index 678aeb9..c9cd153 100644
  #include "config.h"
  
  
--- 
-2.37.2
-
meta-arm/recipes-security/optee-ftpm/optee-ftpm/0001-add-enum-to-ta-flags.patch +2 -2
index 7c61105b7647..3506127cfd1a 100644
@@ -1,4 +1,4 @@
-From cd7b41b30cf157338cfd5cda3c0f6f33164ad16d Mon Sep 17 00:00:00 2001
+From 2bb67529a8b6096fadd3dd0cf740beded9a01432 Mon Sep 17 00:00:00 2001
 From: Maxim Uvarov <[email protected]>
 Date: Fri, 17 Apr 2020 12:05:53 +0100
 Subject: [PATCH] add enum to ta flags
@@ -13,7 +13,7 @@ Signed-off-by: Maxim Uvarov <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Samples/ARM32-FirmwareTPM/optee_ta/fTPM/user_ta_header_defines.h b/Samples/ARM32-FirmwareTPM/optee_ta/fTPM/user_ta_header_defines.h
-index 92c33c1..e83619d 100644
+index 92c33c169320..e83619d55d3c 100644
 --- a/Samples/ARM32-FirmwareTPM/optee_ta/fTPM/user_ta_header_defines.h
 +++ b/Samples/ARM32-FirmwareTPM/optee_ta/fTPM/user_ta_header_defines.h
 @@ -44,7 +44,7 @@
meta-arm/recipes-security/optee/optee-os/0003-optee-enable-clang-support.patch +2 -3
index 3c13ce3f028c..253a01db2d31 100644
@@ -1,4 +1,4 @@
-From 59d4c190eae11c93b26cca5a7b005a17dadc8248 Mon Sep 17 00:00:00 2001
+From 9cf8ac4e6fcecb33af377e1a322f4841ed4e30ce Mon Sep 17 00:00:00 2001
 From: Brett Warren <[email protected]>
 Date: Wed, 23 Sep 2020 09:27:34 +0100
 Subject: [PATCH] optee: enable clang support
@@ -10,13 +10,12 @@ compiler-rt. This is mitigated by including the variable as ammended.
 Upstream-Status: Pending
 ChangeId: 8ba69a4b2eb8ebaa047cb266c9aa6c2c3da45701
 Signed-off-by: Brett Warren <[email protected]>
-
 ---
  mk/clang.mk | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/mk/clang.mk b/mk/clang.mk
-index a045beee8..1ebe2f702 100644
+index a045beee8482..1ebe2f702dcd 100644
 --- a/mk/clang.mk
 +++ b/mk/clang.mk
 @@ -30,7 +30,7 @@ comp-cflags-warns-clang := -Wno-language-extension-token \
Signature · 1 line
2.39.3 (Apple Git-146)
author
#2 lore raw

PATCH 3/4 arm-bsp: remove unreferenced patches and configs

In reply to Jon Mason
---
 .../files/rwx-segments.patch                  | 45 -------------------
 .../tf-a-tests-no-warn-rwx-segments.patch     | 33 --------------
 .../recipes-bsp/u-boot/u-boot/tc/bootargs.cfg |  3 --
 .../bsp/arm-platforms/arm64.cfg               | 17 -------
 .../arm-platforms/fvp-common-peripherals.cfg  |  8 ----
 .../0003-optee-enable-clang-support.patch     | 29 ------------
 6 files changed, 135 deletions(-)
 delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/rwx-segments.patch
 delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/tf-a-tests-no-warn-rwx-segments.patch
 delete mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot/tc/bootargs.cfg
 delete mode 100644 meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/arm64.cfg
 delete mode 100644 meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp-common-peripherals.cfg
 delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-os/0003-optee-enable-clang-support.patch
meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/rwx-segments.patch deleted +0 -45
deleted file mode 100644
index 403381c9d6ce..000000000000
@@ -1,45 +0,0 @@
-From 051c723a6463a579b05dcaa81f204516737a3645 Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected]>
-Date: Wed, 9 Aug 2023 15:56:03 -0400
-Subject: [PATCH] Binutils 2.39 now warns when a segment has RXW
- permissions[1]:
-
-aarch64-none-elf-ld.bfd: warning: bl31.elf has a LOAD segment with RWX
-permissions
-
-However, TF-A passes --fatal-warnings to LD, so this is a build failure.
-
-There is a ticket filed upstream[2], so until that is resolved just
-remove --fatal-warnings.
-
-[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107
-[2] https://developer.trustedfirmware.org/T996
-
-Upstream-Status: Inappropriate
-Signed-off-by: Ross Burton <[email protected]>
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 1ddb7b84417d..9eae30c923ec 100644
---- a/Makefile
-+++ b/Makefile
-@@ -425,7 +425,7 @@ TF_LDFLAGS		+=	$(TF_LDFLAGS_$(ARCH))
- # LD = gcc (used when GCC LTO is enabled)
- else ifneq ($(findstring gcc,$(notdir $(LD))),)
- # Pass ld options with Wl or Xlinker switches
--TF_LDFLAGS		+=	-Wl,--fatal-warnings -O1
-+TF_LDFLAGS		+=	-O1
- TF_LDFLAGS		+=	-Wl,--gc-sections
- ifeq ($(ENABLE_LTO),1)
- 	ifeq (${ARCH},aarch64)
-@@ -442,7 +442,7 @@ TF_LDFLAGS		+=	$(subst --,-Xlinker --,$(TF_LDFLAGS_$(ARCH)))
- 
- # LD = gcc-ld (ld) or llvm-ld (ld.lld) or other
- else
--TF_LDFLAGS		+=	--fatal-warnings -O1
-+TF_LDFLAGS		+=	-O1
- TF_LDFLAGS		+=	--gc-sections
- # ld.lld doesn't recognize the errata flags,
- # therefore don't add those in that case
meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/tf-a-tests-no-warn-rwx-segments.patch deleted +0 -33
deleted file mode 100644
index 0193e8cc414b..000000000000
@@ -1,33 +0,0 @@
-From 6635341615a5bcb36ce71479ee30dae1599081e2 Mon Sep 17 00:00:00 2001
-From: Anton Antonov <[email protected]>
-Date: Wed, 9 Aug 2023 15:56:03 -0400
-Subject: [PATCH] Binutils 2.39 now warns when a segment has RXW
- permissions[1]:
-
-aarch64-poky-linux-musl-ld: tftf.elf has a LOAD segment with RWX permissions
-
-There is a ticket filed upstream[2], so until that is resolved just
-disable the warning
-
-[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107
-[2] https://developer.trustedfirmware.org/T996
-
-Upstream-Status: Inappropriate
-Signed-off-by: Anton Antonov <[email protected]>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 286a47c7d454..3481187b62cf 100644
---- a/Makefile
-+++ b/Makefile
-@@ -246,7 +246,7 @@ TFTF_SOURCES		:= ${FRAMEWORK_SOURCES}	${TESTS_SOURCES} ${PLAT_SOURCES} ${LIBC_SR
- TFTF_INCLUDES		+= ${PLAT_INCLUDES}
- TFTF_CFLAGS		+= ${COMMON_CFLAGS}
- TFTF_ASFLAGS		+= ${COMMON_ASFLAGS}
--TFTF_LDFLAGS		+= ${COMMON_LDFLAGS}
-+TFTF_LDFLAGS		+= ${COMMON_LDFLAGS} --no-warn-rwx-segments
- TFTF_EXTRA_OBJS 	:=
- 
- ifneq (${BP_OPTION},none)
meta-arm-bsp/recipes-bsp/u-boot/u-boot/tc/bootargs.cfg deleted +0 -3
deleted file mode 100644
index 2bfd403f5b3b..000000000000
@@ -1,3 +0,0 @@
-CONFIG_USE_BOOTARGS=y
-CONFIG_BOOTARGS="console=ttyAMA0 debug earlycon=pl011,0x7ff80000"
-CONFIG_BOOTDELAY=0
meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/arm64.cfg deleted +0 -17
deleted file mode 100644
index 62c023878633..000000000000
@@ -1,17 +0,0 @@
-# SPDX-License-Identifier: MIT
-#
-# ARM64
-#
-CONFIG_ARM64=y
-CONFIG_64BIT=y
-CONFIG_ARCH_VEXPRESS=y
-
-#
-# Bus support
-#
-CONFIG_ARM_AMBA=y
-
-#
-# Bus devices
-#
-CONFIG_VEXPRESS_CONFIG=y
meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp-common-peripherals.cfg deleted +0 -8
deleted file mode 100644
index ecb3cc9da44f..000000000000
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: MIT
-CONFIG_SERIAL_AMBA_PL011=y
-CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-
-CONFIG_ARM_SP805_WATCHDOG=y
-
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_PL031=y
meta-arm-bsp/recipes-security/optee/optee-os/0003-optee-enable-clang-support.patch deleted +0 -29
deleted file mode 100644
index 4718c36d5da1..000000000000
@@ -1,29 +0,0 @@
-From 1cd944e1953a8665db9019faddc8e7dc31ca20fa Mon Sep 17 00:00:00 2001
-From: Brett Warren <[email protected]>
-Date: Wed, 23 Sep 2020 09:27:34 +0100
-Subject: [PATCH] optee: enable clang support
-
-When compiling with clang, the LIBGCC_LOCATE_CFLAG variable used
-to provide a sysroot wasn't included, which results in not locating
-compiler-rt. This is mitigated by including the variable as ammended.
-
-Upstream-Status: Pending
-ChangeId: 8ba69a4b2eb8ebaa047cb266c9aa6c2c3da45701
-Signed-off-by: Brett Warren <[email protected]>
----
- mk/clang.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mk/clang.mk b/mk/clang.mk
-index a045beee8482..1ebe2f702dcd 100644
---- a/mk/clang.mk
-+++ b/mk/clang.mk
-@@ -30,7 +30,7 @@ comp-cflags-warns-clang := -Wno-language-extension-token \
- 
- # Note, use the compiler runtime library (libclang_rt.builtins.*.a) instead of
- # libgcc for clang
--libgcc$(sm)	:= $(shell $(CC$(sm)) $(CFLAGS$(arch-bits-$(sm))) \
-+libgcc$(sm)	:= $(shell $(CC$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CFLAGS$(arch-bits-$(sm))) \
- 			-rtlib=compiler-rt -print-libgcc-file-name 2> /dev/null)
- 
- # Core ASLR relies on the executable being ready to run from its preferred load
Signature · 1 line
2.39.3 (Apple Git-146)
author
#3 lore raw

PATCH 4/4 arm/trusted-firmware-a: remove workaround patch for qemuarm64-secureboot

In reply to Jon Mason

bl31 interrupt type regression has been fixed in v2.11 of trusted firmware a. Since qemuarm64-secureboot is using that version, this patch can be removed.

---
 ...ert-usage-of-plat_ic_has_interrupt_t.patch | 35 -------------------
 .../trusted-firmware-a_%.bbappend             |  1 -
 2 files changed, 36 deletions(-)
 delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/files/0001-bl31_runtime-revert-usage-of-plat_ic_has_interrupt_t.patch
meta-arm/recipes-bsp/trusted-firmware-a/files/0001-bl31_runtime-revert-usage-of-plat_ic_has_interrupt_t.patch deleted +0 -35
deleted file mode 100644
index bd68c62b865c..000000000000
@@ -1,35 +0,0 @@
-From 29fbd6207d1fcd357c59db124c9983b30b5ccaed Mon Sep 17 00:00:00 2001
-From: Jon Mason <[email protected]>
-Date: Mon, 4 Dec 2023 10:20:21 -0500
-Subject: [PATCH] bl31_runtime: revert usage of plat_ic_has_interrupt_type
-
-There is a regression caused by commit
-1f6bb41dd951714b47bf07bb9a332346ca261033 for the trusted services tests.
-This is due to the fact that the referenced commit changes the behavior
-from checking for both INTR_TYPE_EL3 and INTR_TYPE_S_EL1, to referencing
-an existing function that #if for _either_ INTR_TYPE_EL3 or
-INTR_TYPE_S_EL1 (depending on the value of GICV2_G0_FOR_EL3).  To work
-around this issue, revert the check back to its original form.
-
-Signed-off-by: Jon Mason <[email protected]>
-Upstream-Status: Pending
----
- bl31/interrupt_mgmt.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/bl31/interrupt_mgmt.c b/bl31/interrupt_mgmt.c
-index a2b2c06859b6..1bcaaf56f912 100644
---- a/bl31/interrupt_mgmt.c
-+++ b/bl31/interrupt_mgmt.c
-@@ -47,9 +47,9 @@ static intr_type_desc_t intr_type_descs[MAX_INTR_TYPES];
-  ******************************************************************************/
- static int32_t validate_interrupt_type(uint32_t type)
- {
--	if (plat_ic_has_interrupt_type(type)) {
-+	if ((type == INTR_TYPE_S_EL1) || (type == INTR_TYPE_NS) ||
-+	    (type == INTR_TYPE_EL3))
- 		return 0;
--	}
- 
- 	return -EINVAL;
- }
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +0 -1
index 3d42a97c7b94..d996d83beb1f 100644
@@ -9,7 +9,6 @@ TOOLCHAIN:qemuarm-secureboot = "gcc"
 FILESEXTRAPATHS:prepend:qemuarm64-secureboot := "${THISDIR}/files:"
 SRC_URI:append:qemuarm64-secureboot = " \
             file://0001-Add-spmc_manifest-for-qemu.patch \
-            file://0001-bl31_runtime-revert-usage-of-plat_ic_has_interrupt_t.patch \
         "
 
 TFA_PLATFORM:qemuarm64-secureboot = "qemu"
Signature · 1 line
2.39.3 (Apple Git-146)