diff mbox series

[2/2] arm-bsp/u-boot: corstone1000: disable EFI debug support

Message ID 20260427124338.2280651-2-michael.safwat@arm.com
State New
Headers show
Series [1/2] arm-bsp/u-boot: fix Corstone1000 FVP detection in patch set | expand

Commit Message

Michael Safwat April 27, 2026, 12:43 p.m. UTC 
Add a U-Boot patch to disable CONFIG_EFI_DEBUG_SUPPORT in the
Corstone1000 defconfigs.

EFI debug support is now enabled by default and changes the EFI memory
layout. On Corstone1000 this can cause a boot failure after
ExitBootServices(), reproduced on the Cortex-A320 FVP path with MTE
enabled.

Signed-off-by: Michael Safwat <michael.safwat@arm.com>
---
 .../u-boot/u-boot-corstone1000.inc            |  5 ++
 ...rstone1000-disable-EFI-debug-support.patch | 46 +++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0040-configs-corstone1000-disable-EFI-debug-support.patch
diff mbox series

Patch

diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-corstone1000.inc b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-corstone1000.inc
index 9660fbc6..e3dec3c0 100644
--- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-corstone1000.inc
+++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-corstone1000.inc
@@ -81,6 +81,11 @@  SRC_URI:append = " \
     file://0039-corstone1000-a320-Add-Corstone1000-board-variant.patch \
 "
 
+# Disable the debug feature
+SRC_URI:append = " \
+    file://0040-configs-corstone1000-disable-EFI-debug-support.patch \
+"
+
 uboot_configure_config:append() {
    openssl req -x509 -sha256 -newkey rsa:2048 -subj /CN=CRT/ -keyout ${B}/CRT.key -out ${S}/CRT.crt -nodes -days 365
 }
diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0040-configs-corstone1000-disable-EFI-debug-support.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0040-configs-corstone1000-disable-EFI-debug-support.patch
new file mode 100644
index 00000000..efd44bfd
--- /dev/null
+++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0040-configs-corstone1000-disable-EFI-debug-support.patch
@@ -0,0 +1,46 @@ 
+From e43e45860f3aecac1a58836c14ec9e961c284ad7 Mon Sep 17 00:00:00 2001
+From: Michael Safwat <michael.safwat@arm.com>
+Date: Thu, 23 Apr 2026 18:16:45 +0100
+Subject: [PATCH] configs: corstone1000: disable EFI debug support
+
+CONFIG_EFI_DEBUG_SUPPORT was recently enabled by default and introduces an
+early EFI_RUNTIME_SERVICES_DATA allocation for the EFI system table pointer.
+
+On Corstone1000, this shifts the EFI memory layout enough to trigger a boot
+hang on the Cortex-A320 FVP path when Linux boots with MTE enabled through the
+EFI flow. The failure happens after ExitBootServices().
+
+Disable CONFIG_EFI_DEBUG_SUPPORT in the Corstone1000 defconfigs so the
+platform keeps the previous EFI memory layout and avoids the issue.
+
+Signed-off-by: Michael Safwat <michael.safwat@arm.com>
+Upstream-Status: Pending
+---
+ configs/corstone1000-a320_defconfig | 1 +
+ configs/corstone1000_defconfig      | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/configs/corstone1000-a320_defconfig b/configs/corstone1000-a320_defconfig
+index c7636bf45f8..290c6223bb1 100644
+--- a/configs/corstone1000-a320_defconfig
++++ b/configs/corstone1000-a320_defconfig
+@@ -13,6 +13,7 @@ CONFIG_SYS_LOAD_ADDR=0x82100000
+ CONFIG_IDENT_STRING=" corstone1000-a320 aarch64 "
+ CONFIG_FWU_NUM_IMAGES_PER_BANK=4
+ CONFIG_EFI_SECURE_BOOT=y
++# CONFIG_EFI_DEBUG_SUPPORT is not set
+ CONFIG_EFI_SET_TIME=y
+ CONFIG_EFI_MM_COMM_TEE=y
+ CONFIG_FFA_SHARED_MM_BUF_SIZE=4096
+diff --git a/configs/corstone1000_defconfig b/configs/corstone1000_defconfig
+index 6ff855e7ce9..8448925e46a 100644
+--- a/configs/corstone1000_defconfig
++++ b/configs/corstone1000_defconfig
+@@ -13,6 +13,7 @@ CONFIG_SYS_LOAD_ADDR=0x82100000
+ CONFIG_IDENT_STRING=" corstone1000 aarch64 "
+ CONFIG_FWU_NUM_IMAGES_PER_BANK=4
+ CONFIG_EFI_SECURE_BOOT=y
++# CONFIG_EFI_DEBUG_SUPPORT is not set
+ CONFIG_EFI_SET_TIME=y
+ CONFIG_EFI_MM_COMM_TEE=y
+ CONFIG_FFA_SHARED_MM_BUF_SIZE=4096