From patchwork Fri Aug 2 18:25:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 47227 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6843C52D6F for ; Fri, 2 Aug 2024 18:25:42 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.2484.1722623133390322031 for ; Fri, 02 Aug 2024 11:25:33 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 81E45DA7 for ; Fri, 2 Aug 2024 11:25:58 -0700 (PDT) Received: from H24V3P4C17.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 1AB2E3F766 for ; Fri, 2 Aug 2024 11:25:31 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 1/4] arm-bsp/fvp-base: u-boot patch clean-up Date: Fri, 2 Aug 2024 14:25:22 -0400 Message-Id: <20240802182525.80611-1-jon.mason@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 02 Aug 2024 18:25:42 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5947 Move the fvp-base unique u-boot patches to the proper nested directory and rename them to match convention (devtool style). Signed-off-by: Jon Mason --- .../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%) diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-fvp-base.inc b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-fvp-base.inc index 9f8c178a29ef..1bde9c64944a 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-fvp-base.inc +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-fvp-base.inc @@ -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 \ " diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0004-arm-Move-sev-and-wfe-definitions-to-common-Arm-heade.patch b/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 mode 100644 index 000000000000..088b4dccb5b3 --- /dev/null +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0004-arm-Move-sev-and-wfe-definitions-to-common-Arm-heade.patch @@ -0,0 +1,84 @@ +From b18a3c183d20812933d192d4b0d622b11ef2bf29 Mon Sep 17 00:00:00 2001 +From: Peter Hoyes +Date: Wed, 1 May 2024 09:16:32 +0100 +Subject: [PATCH] arm: Move sev() and wfe() definitions to common Arm header + file + +The sev() and wfe() asm macros are currently defined only for +mach-exynos. As these are common Arm instructions, move them to the +common asm/system.h header file, for both Armv7 and Armv8, so they +can be used by other machines. + +wfe may theoretically trigger a context switch if an interrupt occurs +so add a memory barrier to this call. + +Signed-off-by: Peter Hoyes +Reviewed-by: Andre Przywara + +Upstream-Status: Backport +Signed-off-by: Ross Burton +--- + arch/arm/include/asm/system.h | 9 +++++++++ + arch/arm/mach-exynos/include/mach/system.h | 19 ------------------- + 2 files changed, 9 insertions(+), 19 deletions(-) + +diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h +index 43f7503571d7..51123c296843 100644 +--- a/arch/arm/include/asm/system.h ++++ b/arch/arm/include/asm/system.h +@@ -154,6 +154,13 @@ enum dcache_option { + "wfi" : : : "memory"); \ + }) + ++#define wfe() \ ++ ({asm volatile( \ ++ "wfe" : : : "memory"); \ ++ }) ++ ++#define sev() asm volatile("sev") ++ + static inline unsigned int current_el(void) + { + unsigned long el; +@@ -369,6 +376,8 @@ void switch_to_hypervisor_ret(void); + + #ifdef __ARM_ARCH_7A__ + #define wfi() __asm__ __volatile__ ("wfi" : : : "memory") ++#define wfe() __asm__ __volatile__ ("wfe" : : : "memory") ++#define sev() __asm__ __volatile__ ("sev") + #else + #define wfi() + #endif +diff --git a/arch/arm/mach-exynos/include/mach/system.h b/arch/arm/mach-exynos/include/mach/system.h +index 5d0bebac5733..0aed4c3e2bf6 100644 +--- a/arch/arm/mach-exynos/include/mach/system.h ++++ b/arch/arm/mach-exynos/include/mach/system.h +@@ -36,25 +36,6 @@ struct exynos5_sysreg { + + #define USB20_PHY_CFG_HOST_LINK_EN (1 << 0) + +-/* +- * This instruction causes an event to be signaled to all cores +- * within a multiprocessor system. If SEV is implemented, +- * WFE must also be implemented. +- */ +-#define sev() __asm__ __volatile__ ("sev\n\t" : : ); +-/* +- * If the Event Register is not set, WFE suspends execution until +- * one of the following events occurs: +- * - an IRQ interrupt, unless masked by the CPSR I-bit +- * - an FIQ interrupt, unless masked by the CPSR F-bit +- * - an Imprecise Data abort, unless masked by the CPSR A-bit +- * - a Debug Entry request, if Debug is enabled +- * - an Event signaled by another processor using the SEV instruction. +- * If the Event Register is set, WFE clears it and returns immediately. +- * If WFE is implemented, SEV must also be implemented. +- */ +-#define wfe() __asm__ __volatile__ ("wfe\n\t" : : ); +- + /* Move 0xd3 value to CPSR register to enable SVC mode */ + #define svc32_mode_en() __asm__ __volatile__ \ + ("@ I&F disable, Mode: 0x13 - SVC\n\t" \ +-- +2.30.2 + diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/tick.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0005-armv8-generic_timer-Use-event-stream-for-udelay.patch similarity index 53% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot/tick.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0005-armv8-generic_timer-Use-event-stream-for-udelay.patch index 370bc2745914..ac29b463cd01 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/tick.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/fvp-base/0005-armv8-generic_timer-Use-event-stream-for-udelay.patch @@ -1,92 +1,7 @@ -From b18a3c183d20812933d192d4b0d622b11ef2bf29 Mon Sep 17 00:00:00 2001 -From: Peter Hoyes -Date: Wed, 1 May 2024 09:16:32 +0100 -Subject: [PATCH 1/2] arm: Move sev() and wfe() definitions to common Arm - header file - -The sev() and wfe() asm macros are currently defined only for -mach-exynos. As these are common Arm instructions, move them to the -common asm/system.h header file, for both Armv7 and Armv8, so they -can be used by other machines. - -wfe may theoretically trigger a context switch if an interrupt occurs -so add a memory barrier to this call. - -Signed-off-by: Peter Hoyes -Reviewed-by: Andre Przywara - -Upstream-Status: Backport -Signed-off-by: Ross Burton ---- - arch/arm/include/asm/system.h | 9 +++++++++ - arch/arm/mach-exynos/include/mach/system.h | 19 ------------------- - 2 files changed, 9 insertions(+), 19 deletions(-) - -diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h -index 43f7503571..51123c2968 100644 ---- a/arch/arm/include/asm/system.h -+++ b/arch/arm/include/asm/system.h -@@ -154,6 +154,13 @@ enum dcache_option { - "wfi" : : : "memory"); \ - }) - -+#define wfe() \ -+ ({asm volatile( \ -+ "wfe" : : : "memory"); \ -+ }) -+ -+#define sev() asm volatile("sev") -+ - static inline unsigned int current_el(void) - { - unsigned long el; -@@ -369,6 +376,8 @@ void switch_to_hypervisor_ret(void); - - #ifdef __ARM_ARCH_7A__ - #define wfi() __asm__ __volatile__ ("wfi" : : : "memory") -+#define wfe() __asm__ __volatile__ ("wfe" : : : "memory") -+#define sev() __asm__ __volatile__ ("sev") - #else - #define wfi() - #endif -diff --git a/arch/arm/mach-exynos/include/mach/system.h b/arch/arm/mach-exynos/include/mach/system.h -index 5d0bebac57..0aed4c3e2b 100644 ---- a/arch/arm/mach-exynos/include/mach/system.h -+++ b/arch/arm/mach-exynos/include/mach/system.h -@@ -36,25 +36,6 @@ struct exynos5_sysreg { - - #define USB20_PHY_CFG_HOST_LINK_EN (1 << 0) - --/* -- * This instruction causes an event to be signaled to all cores -- * within a multiprocessor system. If SEV is implemented, -- * WFE must also be implemented. -- */ --#define sev() __asm__ __volatile__ ("sev\n\t" : : ); --/* -- * If the Event Register is not set, WFE suspends execution until -- * one of the following events occurs: -- * - an IRQ interrupt, unless masked by the CPSR I-bit -- * - an FIQ interrupt, unless masked by the CPSR F-bit -- * - an Imprecise Data abort, unless masked by the CPSR A-bit -- * - a Debug Entry request, if Debug is enabled -- * - an Event signaled by another processor using the SEV instruction. -- * If the Event Register is set, WFE clears it and returns immediately. -- * If WFE is implemented, SEV must also be implemented. -- */ --#define wfe() __asm__ __volatile__ ("wfe\n\t" : : ); -- - /* Move 0xd3 value to CPSR register to enable SVC mode */ - #define svc32_mode_en() __asm__ __volatile__ \ - ("@ I&F disable, Mode: 0x13 - SVC\n\t" \ --- -2.34.1 - - From ebc84d7b60c1ed3398e9f600fe3dc8406500bd35 Mon Sep 17 00:00:00 2001 From: Peter Hoyes Date: Wed, 1 May 2024 09:16:33 +0100 -Subject: [PATCH 2/2] armv8: generic_timer: Use event stream for udelay +Subject: [PATCH] armv8: generic_timer: Use event stream for udelay Polling cntpct_el0 in a tight loop for delays is inefficient. This is particularly apparent on Arm FVPs, which do not simulate @@ -105,6 +20,9 @@ board family. Signed-off-by: Peter Hoyes Reviewed-by: Andre Przywara + +Upstream-Status: Backport +Signed-off-by: Ross Burton --- arch/arm/cpu/armv8/Kconfig | 8 ++++++++ arch/arm/cpu/armv8/generic_timer.c | 27 +++++++++++++++++++++++++++ @@ -112,7 +30,7 @@ Reviewed-by: Andre Przywara 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv8/Kconfig b/arch/arm/cpu/armv8/Kconfig -index 9f0fb369f7..199335cd60 100644 +index 9f0fb369f773..199335cd6040 100644 --- a/arch/arm/cpu/armv8/Kconfig +++ b/arch/arm/cpu/armv8/Kconfig @@ -191,6 +191,14 @@ config ARMV8_EA_EL3_FIRST @@ -131,7 +49,7 @@ index 9f0fb369f7..199335cd60 100644 bool "ARM64 Accelerated Cryptographic Algorithms" diff --git a/arch/arm/cpu/armv8/generic_timer.c b/arch/arm/cpu/armv8/generic_timer.c -index e4aa5a4745..1de7ec596f 100644 +index e4aa5a474553..1de7ec596fc7 100644 --- a/arch/arm/cpu/armv8/generic_timer.c +++ b/arch/arm/cpu/armv8/generic_timer.c @@ -114,3 +114,30 @@ ulong timer_get_boot_us(void) @@ -166,7 +84,7 @@ index e4aa5a4745..1de7ec596f 100644 +} +#endif diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h -index 51123c2968..7e30cac32a 100644 +index 51123c296843..7e30cac32a09 100644 --- a/arch/arm/include/asm/system.h +++ b/arch/arm/include/asm/system.h @@ -69,8 +69,10 @@ @@ -183,5 +101,5 @@ index 51123c2968..7e30cac32a 100644 /* * HCR_EL2 bits definitions -- -2.34.1 +2.30.2 From patchwork Fri Aug 2 18:25:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 47228 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B311AC3DA7F for ; Fri, 2 Aug 2024 18:25:42 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.2450.1722623135043224386 for ; Fri, 02 Aug 2024 11:25:35 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 3A33BDA7 for ; Fri, 2 Aug 2024 11:26:00 -0700 (PDT) Received: from H24V3P4C17.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 70C603F766 for ; Fri, 2 Aug 2024 11:25:33 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 2/4] arm: use devtool to clean-up patches Date: Fri, 2 Aug 2024 14:25:23 -0400 Message-Id: <20240802182525.80611-2-jon.mason@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20240802182525.80611-1-jon.mason@arm.com> References: <20240802182525.80611-1-jon.mason@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 02 Aug 2024 18:25:42 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5948 Signed-off-by: Jon Mason --- .../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(-) diff --git a/meta-arm-bsp/recipes-security/optee/optee-os/0003-optee-enable-clang-support.patch b/meta-arm-bsp/recipes-security/optee/optee-os/0003-optee-enable-clang-support.patch index 3c13ce3f028c..4718c36d5da1 100644 --- a/meta-arm-bsp/recipes-security/optee/optee-os/0003-optee-enable-clang-support.patch +++ b/meta-arm-bsp/recipes-security/optee/optee-os/0003-optee-enable-clang-support.patch @@ -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 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 - --- 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 \ 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 index f6f054df5ae8..bd68c62b865c 100644 --- 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 @@ -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 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 - diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-qemu_measured_boot.c-ignore-TPM-error-and-continue-w.patch b/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-qemu_measured_boot.c-ignore-TPM-error-and-continue-w.patch index 2d189d8e8c89..75103332e32e 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-qemu_measured_boot.c-ignore-TPM-error-and-continue-w.patch +++ b/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-qemu_measured_boot.c-ignore-TPM-error-and-continue-w.patch @@ -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 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 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 - diff --git a/meta-arm/recipes-bsp/uefi/sbsa-acs/0001-Patch-in-the-paths-to-the-SBSA-test-suite.patch b/meta-arm/recipes-bsp/uefi/sbsa-acs/0001-Patch-in-the-paths-to-the-SBSA-test-suite.patch index 236245fe7923..6d626be5b8d3 100644 --- a/meta-arm/recipes-bsp/uefi/sbsa-acs/0001-Patch-in-the-paths-to-the-SBSA-test-suite.patch +++ b/meta-arm/recipes-bsp/uefi/sbsa-acs/0001-Patch-in-the-paths-to-the-SBSA-test-suite.patch @@ -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 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 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 @@ diff --git a/meta-arm/recipes-bsp/uefi/sbsa-acs/0002-Enforce-using-good-old-BFD-linker.patch b/meta-arm/recipes-bsp/uefi/sbsa-acs/0002-Enforce-using-good-old-BFD-linker.patch index 284191d30b97..68a25c71c1d1 100644 --- a/meta-arm/recipes-bsp/uefi/sbsa-acs/0002-Enforce-using-good-old-BFD-linker.patch +++ b/meta-arm/recipes-bsp/uefi/sbsa-acs/0002-Enforce-using-good-old-BFD-linker.patch @@ -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 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 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- diff --git a/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Include-missing-cstdint.patch b/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Include-missing-cstdint.patch index 294f804fb4a0..20e994e84e3f 100644 --- a/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Include-missing-cstdint.patch +++ b/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-Include-missing-cstdint.patch @@ -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 Date: Thu, 2 Feb 2023 16:39:26 -0800 Subject: [PATCH] Include missing @@ -16,7 +16,7 @@ Signed-off-by: Khem Raj 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 #include --- -2.39.1 - diff --git a/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-daemon-mxml-Define-_GNU_SOURCE.patch b/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-daemon-mxml-Define-_GNU_SOURCE.patch index d2460434f010..0cab34aeaa45 100644 --- a/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-daemon-mxml-Define-_GNU_SOURCE.patch +++ b/meta-arm/recipes-devtools/gator-daemon/gator-daemon/0001-daemon-mxml-Define-_GNU_SOURCE.patch @@ -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 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 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 - diff --git a/meta-arm/recipes-security/optee-ftpm/optee-ftpm/0001-add-enum-to-ta-flags.patch b/meta-arm/recipes-security/optee-ftpm/optee-ftpm/0001-add-enum-to-ta-flags.patch index 7c61105b7647..3506127cfd1a 100644 --- a/meta-arm/recipes-security/optee-ftpm/optee-ftpm/0001-add-enum-to-ta-flags.patch +++ b/meta-arm/recipes-security/optee-ftpm/optee-ftpm/0001-add-enum-to-ta-flags.patch @@ -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 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 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 @@ diff --git a/meta-arm/recipes-security/optee/optee-os/0003-optee-enable-clang-support.patch b/meta-arm/recipes-security/optee/optee-os/0003-optee-enable-clang-support.patch index 3c13ce3f028c..253a01db2d31 100644 --- a/meta-arm/recipes-security/optee/optee-os/0003-optee-enable-clang-support.patch +++ b/meta-arm/recipes-security/optee/optee-os/0003-optee-enable-clang-support.patch @@ -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 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 - --- 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 \ From patchwork Fri Aug 2 18:25:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 47230 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id BBACBC52D71 for ; Fri, 2 Aug 2024 18:25:42 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.2485.1722623136028083766 for ; Fri, 02 Aug 2024 11:25:36 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 61466DA7 for ; Fri, 2 Aug 2024 11:26:01 -0700 (PDT) Received: from H24V3P4C17.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id DC2C53F766 for ; Fri, 2 Aug 2024 11:25:34 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 3/4] arm-bsp: remove unreferenced patches and configs Date: Fri, 2 Aug 2024 14:25:24 -0400 Message-Id: <20240802182525.80611-3-jon.mason@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20240802182525.80611-1-jon.mason@arm.com> References: <20240802182525.80611-1-jon.mason@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 02 Aug 2024 18:25:42 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5949 Signed-off-by: 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 diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/rwx-segments.patch b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/rwx-segments.patch deleted file mode 100644 index 403381c9d6ce..000000000000 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/rwx-segments.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 051c723a6463a579b05dcaa81f204516737a3645 Mon Sep 17 00:00:00 2001 -From: Ross Burton -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 ---- - 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 diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/tf-a-tests-no-warn-rwx-segments.patch b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/tf-a-tests-no-warn-rwx-segments.patch deleted file mode 100644 index 0193e8cc414b..000000000000 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/tf-a-tests-no-warn-rwx-segments.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6635341615a5bcb36ce71479ee30dae1599081e2 Mon Sep 17 00:00:00 2001 -From: Anton Antonov -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 ---- - 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) diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/tc/bootargs.cfg b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/tc/bootargs.cfg deleted file mode 100644 index 2bfd403f5b3b..000000000000 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/tc/bootargs.cfg +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="console=ttyAMA0 debug earlycon=pl011,0x7ff80000" -CONFIG_BOOTDELAY=0 diff --git a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/arm64.cfg b/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/arm64.cfg deleted file mode 100644 index 62c023878633..000000000000 --- a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/arm64.cfg +++ /dev/null @@ -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 diff --git a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp-common-peripherals.cfg b/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp-common-peripherals.cfg deleted file mode 100644 index ecb3cc9da44f..000000000000 --- a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp-common-peripherals.cfg +++ /dev/null @@ -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 diff --git a/meta-arm-bsp/recipes-security/optee/optee-os/0003-optee-enable-clang-support.patch b/meta-arm-bsp/recipes-security/optee/optee-os/0003-optee-enable-clang-support.patch deleted file mode 100644 index 4718c36d5da1..000000000000 --- a/meta-arm-bsp/recipes-security/optee/optee-os/0003-optee-enable-clang-support.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1cd944e1953a8665db9019faddc8e7dc31ca20fa Mon Sep 17 00:00:00 2001 -From: Brett Warren -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 ---- - 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 From patchwork Fri Aug 2 18:25:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 47229 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A57D0C3DA4A for ; Fri, 2 Aug 2024 18:25:42 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.2486.1722623137939104067 for ; Fri, 02 Aug 2024 11:25:38 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 01CC6DA7 for ; Fri, 2 Aug 2024 11:26:03 -0700 (PDT) Received: from H24V3P4C17.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 51E7E3F766 for ; Fri, 2 Aug 2024 11:25:36 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 4/4] arm/trusted-firmware-a: remove workaround patch for qemuarm64-secureboot Date: Fri, 2 Aug 2024 14:25:25 -0400 Message-Id: <20240802182525.80611-4-jon.mason@arm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20240802182525.80611-1-jon.mason@arm.com> References: <20240802182525.80611-1-jon.mason@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 02 Aug 2024 18:25:42 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5950 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 --- ...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 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 bd68c62b865c..000000000000 --- 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 3d42a97c7b94..d996d83beb1f 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"