diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-bl31_runtime-revert-usage-of-plat_ic_has_interrupt_t.patch b/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-bl31_runtime-revert-usage-of-plat_ic_has_interrupt_t.patch deleted file mode 100644 index bd68c62b..00000000 --- a/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-bl31_runtime-revert-usage-of-plat_ic_has_interrupt_t.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 29fbd6207d1fcd357c59db124c9983b30b5ccaed Mon Sep 17 00:00:00 2001 -From: Jon Mason -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 -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; - } diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend index 3d42a97c..d996d83b 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -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"