From 06cec933def225ef64d81983829c349f47b89319 Mon Sep 17 00:00:00 2001 From: Levi Yun Date: Thu, 8 Aug 2024 13:13:23 +0100 Subject: [PATCH] fix(fvp): exclude extend memory map TZC regions The commit 192287523350 ("fix(spm-mm): carve out NS buffer TZC400 region") removes overlaps of ns shared buffer in secure memory region. Unfortunately, this separation increases 1 region and over maximum number of TZC programmable regions when they include extended memory map regions (DRAM3 to DRAM6). This causes boot failure of StandaloneMm with spmc_el3 && sp_el0 with ASSERT: drivers/arm/tzc/tzc400.c:256. To fix this, like SPM_MM, exclude setting extended memory map regions when it uses SPMC_AT_EL3 && SPC_AT_EL3_SEL0_SP. Signed-off-by: Levi Yun Change-Id: I2d40bea066ca030050dfe951218cd17171010676 --- plat/arm/board/fvp/fvp_security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plat/arm/board/fvp/fvp_security.c b/plat/arm/board/fvp/fvp_security.c index 573d92efb..5b970346f 100644 --- a/plat/arm/board/fvp/fvp_security.c +++ b/plat/arm/board/fvp/fvp_security.c @@ -24,7 +24,7 @@ void plat_arm_security_setup(void) const arm_tzc_regions_info_t fvp_tzc_regions[] = { ARM_TZC_REGIONS_DEF, -#if !SPM_MM && !ENABLE_RME +#if !SPM_MM && !ENABLE_RME && !(SPMC_AT_EL3 && SPMC_AT_EL3_SEL0_SP) {FVP_DRAM3_BASE, FVP_DRAM3_END, ARM_TZC_NS_DRAM_S_ACCESS, PLAT_ARM_TZC_NS_DEV_ACCESS}, {FVP_DRAM4_BASE, FVP_DRAM4_END,