mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-06-04 14:10:01 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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.

Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Jon Mason
2024-08-02 14:25:25 -04:00
parent e687068e5a
commit bf85e4a9a1
2 changed files with 0 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-arm/recipes-bsp/trusted-firmware-a/files/0001-bl31_runtime-revert-usage-of-plat_ic_has_interrupt_t.patch
-35
View File
@@ -1,35 +0,0 @@
From 29fbd6207d1fcd357c59db124c9983b30b5ccaed Mon Sep 17 00:00:00 2001
From: Jon Mason <jon.mason@arm.com>
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 <jon.mason@arm.com>
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
-1
View File
@@ -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"