From c7581dfab24ce3859151f556102ac0254635e423 Mon Sep 17 00:00:00 2001 From: Harsimran Singh Tungal Date: Wed, 10 Sep 2025 13:51:11 +0100 Subject: [PATCH] arm/trusted-firmware-m: Add alignment checks for Cortex-M0+ based platform binaries Include patch to add relevant checks in GCC linker scripts to validate if the BL2 and Trusted-Firmware-M binary addresses are aligned to 0x100 byte boundary for Cortex-M0+ based platforms. This is required because: For Cortex-M0+ VTOR: 256-byte vector table is at the offset 0x00 of the image. To keep that table in one block, the image base must be a multiple of 0x100. For reference: https://developer.arm.com/documentation/ddi0419/latest/ Signed-off-by: Harsimran Singh Tungal Signed-off-by: Jon Mason --- ...L2-and-TF-M-binary-address-alignment.patch | 134 ++++++++++++++++++ .../trusted-firmware-m-2.2.1-src.inc | 2 + 2 files changed, 136 insertions(+) create mode 100644 meta-arm/recipes-bsp/trusted-firmware-m/files/0001-Add-checks-for-BL2-and-TF-M-binary-address-alignment.patch diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/files/0001-Add-checks-for-BL2-and-TF-M-binary-address-alignment.patch b/meta-arm/recipes-bsp/trusted-firmware-m/files/0001-Add-checks-for-BL2-and-TF-M-binary-address-alignment.patch new file mode 100644 index 00000000..4bed3353 --- /dev/null +++ b/meta-arm/recipes-bsp/trusted-firmware-m/files/0001-Add-checks-for-BL2-and-TF-M-binary-address-alignment.patch @@ -0,0 +1,134 @@ +From 57a1a4cbbc40342c88a6fe2f4eaeadbd15dcbfa6 Mon Sep 17 00:00:00 2001 +From: Harsimran Singh Tungal +Date: Fri, 22 Aug 2025 20:34:10 +0000 +Subject: [PATCH 2/2] Add checks for BL2 and TF-M binary address alignment + +Add relevant checks in GCC linker scripts to validate if the +BL2 and TF-M binary addresses are aligned to 0x100 byte boundary +for Cortex-M0+ based platforms. + +Upstream-Status: Backport [069a9b5a3acece140369ff07281b26e25bc50026] +Signed-off-by: Harsimran Singh Tungal +--- + platform/ext/common/gcc/tfm_common_bl2.ld | 12 +++++++++++- + platform/ext/common/gcc/tfm_common_s.ld.template | 13 ++++++++++++- + platform/ext/common/gcc/tfm_isolation_s.ld.template | 13 ++++++++++++- + platform/ext/common/tfm_s_linker_alignments.h | 9 ++++++++- + 4 files changed, 43 insertions(+), 4 deletions(-) + +diff --git a/platform/ext/common/gcc/tfm_common_bl2.ld b/platform/ext/common/gcc/tfm_common_bl2.ld +index eee915210..65d75980b 100644 +--- a/platform/ext/common/gcc/tfm_common_bl2.ld ++++ b/platform/ext/common/gcc/tfm_common_bl2.ld +@@ -1,5 +1,7 @@ + ;/* +-; * Copyright (c) 2022-2024 Arm Limited. All rights reserved. ++; * SPDX-FileCopyrightText: Copyright The TrustedFirmware-M Contributors ++; * ++; * SPDX-License-Identifier: BSD-3-Clause + ; * + ; * Licensed under the Apache License, Version 2.0 (the "License"); + ; * you may not use this file except in compliance with the License. +@@ -33,6 +35,14 @@ MEMORY + RAM (rwx) : ORIGIN = BL2_DATA_START, LENGTH = BL2_DATA_SIZE + } + ++/* For Cortex-M0+ VTOR: 256-byte vector table is at the offset 0x00 of the image. ++ * To keep that table in one block, the image base must be a multiple of 0x100. ++ * For reference: https://developer.arm.com/documentation/ddi0419/latest/ ++ */ ++#if defined(__ARM_ARCH_6M__) ++CHECK_ALIGNMENT_256(BL2_CODE_START) ++#endif ++ + __heap_size__ = BL2_HEAP_SIZE; + __msp_stack_size__ = BL2_MSP_STACK_SIZE; + +diff --git a/platform/ext/common/gcc/tfm_common_s.ld.template b/platform/ext/common/gcc/tfm_common_s.ld.template +index 023f2224e..db6a2d570 100644 +--- a/platform/ext/common/gcc/tfm_common_s.ld.template ++++ b/platform/ext/common/gcc/tfm_common_s.ld.template +@@ -1,5 +1,8 @@ + ;/* +-; * Copyright (c) 2009-2024 Arm Limited ++; * SPDX-FileCopyrightText: Copyright The TrustedFirmware-M Contributors ++; * ++; * SPDX-License-Identifier: BSD-3-Clause ++; * + ; * Copyright (c) 2022-2024 Cypress Semiconductor Corporation (an Infineon company) + ; * or an affiliate of Cypress Semiconductor Corporation. All rights reserved. + ; * +@@ -38,6 +41,14 @@ MEMORY + #endif + } + ++/* For Cortex-M0+ VTOR: 256-byte vector table is at the offset 0x00 of the image. ++ * To keep that table in one block, the image base must be a multiple of 0x100. ++ * For reference: https://developer.arm.com/documentation/ddi0419/latest/ ++ */ ++#if defined(__ARM_ARCH_6M__) ++CHECK_ALIGNMENT_256(S_CODE_START) ++#endif ++ + #ifndef TFM_LINKER_VENEERS_START + #define TFM_LINKER_VENEERS_START ALIGN(TFM_LINKER_VENEERS_ALIGNMENT) + #endif +diff --git a/platform/ext/common/gcc/tfm_isolation_s.ld.template b/platform/ext/common/gcc/tfm_isolation_s.ld.template +index 00693a19d..6c4f13efa 100644 +--- a/platform/ext/common/gcc/tfm_isolation_s.ld.template ++++ b/platform/ext/common/gcc/tfm_isolation_s.ld.template +@@ -1,5 +1,8 @@ + ;/* +-; * Copyright (c) 2009-2024 Arm Limited ++; * SPDX-FileCopyrightText: Copyright The TrustedFirmware-M Contributors ++; * ++; * SPDX-License-Identifier: BSD-3-Clause ++; * + ; * Copyright (c) 2022-2024 Cypress Semiconductor Corporation (an Infineon company) + ; * or an affiliate of Cypress Semiconductor Corporation. All rights reserved. + ; * +@@ -47,6 +50,14 @@ MEMORY + #endif + } + ++/* For Cortex-M0+ VTOR: 256-byte vector table is at the offset 0x00 of the image. ++ * To keep that table in one block, the image base must be a multiple of 0x100. ++ * For reference: https://developer.arm.com/documentation/ddi0419/latest/ ++ */ ++#if defined(__ARM_ARCH_6M__) ++CHECK_ALIGNMENT_256(S_CODE_START) ++#endif ++ + #ifndef TFM_LINKER_VENEERS_START + #define TFM_LINKER_VENEERS_START ALIGN(TFM_LINKER_VENEERS_ALIGNMENT) + #endif +diff --git a/platform/ext/common/tfm_s_linker_alignments.h b/platform/ext/common/tfm_s_linker_alignments.h +index 0d115575c..fb96938c9 100644 +--- a/platform/ext/common/tfm_s_linker_alignments.h ++++ b/platform/ext/common/tfm_s_linker_alignments.h +@@ -1,7 +1,8 @@ + /* + * Copyright (c) 2022 Cypress Semiconductor Corporation (an Infineon company) + * or an affiliate of Cypress Semiconductor Corporation. All rights reserved. +- * Copyright (c) 2024, Arm Limited. All rights reserved. ++ * ++ * SPDX-FileCopyrightText: Copyright The TrustedFirmware-M Contributors + * + * SPDX-License-Identifier: BSD-3-Clause + * +@@ -21,6 +22,12 @@ + + #define CHECK_ALIGNMENT_4(size) ASSERT((size) % 4 == 0, #size) + ++/* For Cortex-M0+ VTOR: 256-byte vector table is at the offset 0x00 of the image. ++ * To keep that table in one block, the image base must be a multiple of 0x100. ++ * For reference: https://developer.arm.com/documentation/ddi0419/latest/ ++ */ ++#define CHECK_ALIGNMENT_256(addr) ASSERT((addr % 256) == 0, #addr) ++ + /* Default alignment for linker file sections is set to 32 because ARM TrustZone + * protection units (SAU and MPU) require regions to be 32 bytes aligned. */ + #ifndef TFM_LINKER_DEFAULT_ALIGNMENT +-- +2.43.0 + diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.2.1-src.inc b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.2.1-src.inc index 35ef8f8c..833d257a 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.2.1-src.inc +++ b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.2.1-src.inc @@ -21,7 +21,9 @@ SRC_URI_TRUSTED_FIRMWARE_M_MCUBOOT ?= "git://github.com/mcu-tools/mcuboot.git;pr SRC_URI_TRUSTED_FIRMWARE_M_QCBOR ?= "git://github.com/laurencelundblade/QCBOR.git;protocol=https" SRC_URI_TRUSTED_FIRMWARE_M_PSA_ADAC ?= "git://git.trustedfirmware.org/shared/psa-adac.git;protocol=https" SRC_URI_TRUSTED_FIRMWARE_M_T_COSE ?= "git://github.com/laurencelundblade/t_cose.git;protocol=https" + SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_M};branch=${SRCBRANCH_tfm};name=tfm;destsuffix=tfm \ + file://0001-Add-checks-for-BL2-and-TF-M-binary-address-alignment.patch \ ${SRC_URI_TRUSTED_FIRMWARE_M_EXTRAS};branch=${SRCBRANCH_tfm-extras};name=tfm-extras;destsuffix=tfm-extras \ ${SRC_URI_TRUSTED_FIRMWARE_M_TESTS};branch=${SRCBRANCH_tfm-tests};name=tfm-tests;destsuffix=tf-m-tests \ ${SRC_URI_TRUSTED_FIRMWARE_M_CMSIS};branch=${SRCBRANCH_cmsis};name=cmsis;destsuffix=cmsis \