Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-24 13:55:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(tc): don't enable TZC on TC3

Browse source 
TZC is being replaced by MSF module on TC3. For fixing boot failure on
TC3, don't enable TZC module on the TC3 platform.

Change-Id: I4434cb28bf523be8dd882f5f8799223642822ee2
Signed-off-by: Tintu Thomas <tintu.thomas@arm.com>
Signed-off-by: Leo Yan <leo.yan@arm.com>
This commit is contained in:
Tintu Thomas 2024-07-02 16:57:05 +01:00 • committed by Leo Yan
parent 4b9be5abfa
commit 8ce29a74a4
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plat/arm/board/tc/include/platform_def.h
View file

@ -333,6 +333,7 @@
*/ */
#define PLAT_CSS_MAX_SCP_BL2U_SIZE 0x20000 #define PLAT_CSS_MAX_SCP_BL2U_SIZE 0x20000
#if TARGET_PLATFORM <= 2
/* TZC Related Constants */ /* TZC Related Constants */
#define PLAT_ARM_TZC_BASE UL(0x25000000) #define PLAT_ARM_TZC_BASE UL(0x25000000)
#define PLAT_ARM_TZC_FILTERS TZC_400_REGION_ATTR_FILTER_BIT(0) #define PLAT_ARM_TZC_FILTERS TZC_400_REGION_ATTR_FILTER_BIT(0)
@ -360,6 +361,7 @@
PLAT_ARM_TZC_NS_DEV_ACCESS}, \ PLAT_ARM_TZC_NS_DEV_ACCESS}, \
{PLAT_ARM_DRAM2_BASE, PLAT_ARM_DRAM2_END, \ {PLAT_ARM_DRAM2_BASE, PLAT_ARM_DRAM2_END, \
ARM_TZC_NS_DRAM_S_ACCESS, PLAT_ARM_TZC_NS_DEV_ACCESS} ARM_TZC_NS_DRAM_S_ACCESS, PLAT_ARM_TZC_NS_DEV_ACCESS}
#endif
/* virtual address used by dynamic mem_protect for chunk_base */ /* virtual address used by dynamic mem_protect for chunk_base */
#define PLAT_ARM_MEM_PROTEC_VA_FRAME UL(0xc0000000) #define PLAT_ARM_MEM_PROTEC_VA_FRAME UL(0xc0000000)

5
plat/arm/board/tc/platform.mk
View file

@ -138,9 +138,12 @@ BL2_SOURCES += ${TC_BASE}/tc_security.c \
${TC_BASE}/tc_bl2_setup.c \ ${TC_BASE}/tc_bl2_setup.c \
lib/utils/mem_region.c \ lib/utils/mem_region.c \
drivers/arm/tzc/tzc400.c \ drivers/arm/tzc/tzc400.c \
plat/arm/common/arm_tzc400.c \
plat/arm/common/arm_nor_psci_mem_protect.c plat/arm/common/arm_nor_psci_mem_protect.c
ifeq ($(shell test $(TARGET_PLATFORM) -le 2; echo $$?),0)
BL2_SOURCES += plat/arm/common/arm_tzc400.c
endif
BL31_SOURCES += ${INTERCONNECT_SOURCES} \ BL31_SOURCES += ${INTERCONNECT_SOURCES} \
${TC_CPU_SOURCES} \ ${TC_CPU_SOURCES} \
${ENT_GIC_SOURCES} \ ${ENT_GIC_SOURCES} \

6
plat/arm/board/tc/tc_security.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2020, Arm Limited. All rights reserved. * Copyright (c) 2024, Arm Limited. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -7,17 +7,21 @@
#include <plat/arm/common/plat_arm.h> #include <plat/arm/common/plat_arm.h>
#include <platform_def.h> #include <platform_def.h>
#if (TARGET_PLATFORM <= 2)
static const arm_tzc_regions_info_t tzc_regions[] = { static const arm_tzc_regions_info_t tzc_regions[] = {
TC_TZC_REGIONS_DEF, TC_TZC_REGIONS_DEF,
{} {}
}; };
#endif
/* Initialize the secure environment */ /* Initialize the secure environment */
void plat_arm_security_setup(void) void plat_arm_security_setup(void)
{ {
#if (TARGET_PLATFORM <= 2)
unsigned int i; unsigned int i;
for (i = 0U; i < TZC400_COUNT; i++) { for (i = 0U; i < TZC400_COUNT; i++) {
arm_tzc400_setup(TZC400_BASE(i), tzc_regions); arm_tzc400_setup(TZC400_BASE(i), tzc_regions);
} }
#endif
} }