plat: tc0: enable TZC

Change-Id: Ic2bb8482f0b602f6b7850d4fa553448bc4931edc
Signed-off-by: Usama Arif <usama.arif@arm.com>

diff --git a/plat/arm/board/tc0/include/platform_def.h b/plat/arm/board/tc0/include/platform_def.h
index a8d471ee339a5bec66bb0745d01aaaf797333729..075c4037b93fda521dd8b5290557def65498987f 100644 (file)
--- a/plat/arm/board/tc0/include/platform_def.h
+++ b/plat/arm/board/tc0/include/platform_def.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2020, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -191,4 +191,19 @@
  */
 #define PLAT_CSS_MAX_SCP_BL2U_SIZE     0x20000
 
+/* TZC Related Constants */
+#define PLAT_ARM_TZC_BASE              UL(0x25000000)
+#define PLAT_ARM_TZC_FILTERS           TZC_400_REGION_ATTR_FILTER_BIT(0)
+
+#define TZC400_OFFSET                  UL(0x1000000)
+#define TZC400_COUNT                   4
+
+#define TZC400_BASE(n)                 (PLAT_ARM_TZC_BASE + \
+                                        (n * TZC400_OFFSET))
+
+#define TZC_NSAID_DEFAULT              U(0)
+
+#define PLAT_ARM_TZC_NS_DEV_ACCESS     \
+               (TZC_REGION_ACCESS_RDWR(TZC_NSAID_DEFAULT))
+
 #endif /* PLATFORM_DEF_H */

diff --git a/plat/arm/board/tc0/platform.mk b/plat/arm/board/tc0/platform.mk
index 903fabfb05829e7e65b6e643e2c68fc7d2813f87..05d691ee234cf840dfde60472d406f83e9a128d9 100644 (file)
--- a/plat/arm/board/tc0/platform.mk
+++ b/plat/arm/board/tc0/platform.mk
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, ARM Limited and Contributors. All rights reserved.
+# Copyright (c) 2020, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -61,6 +61,8 @@ BL2_SOURCES           +=      ${TC0_BASE}/tc0_security.c      \
                                ${TC0_BASE}/tc0_err.c           \
                                ${TC0_BASE}/tc0_trusted_boot.c          \
                                lib/utils/mem_region.c                  \
+                               drivers/arm/tzc/tzc400.c                \
+                               plat/arm/common/arm_tzc400.c            \
                                plat/arm/common/arm_nor_psci_mem_protect.c
 
 BL31_SOURCES           +=      ${INTERCONNECT_SOURCES} \

diff --git a/plat/arm/board/tc0/tc0_security.c b/plat/arm/board/tc0/tc0_security.c
index 6aa38c822c0dd3b61ac34968fa2c766e36d93c89..5f1cb1159b047157bf0e54e04b87a214e52163a1 100644 (file)
--- a/plat/arm/board/tc0/tc0_security.c
+++ b/plat/arm/board/tc0/tc0_security.c
@@ -1,12 +1,23 @@
 /*
- * Copyright (c) 2020, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2020, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#include <plat/arm/common/plat_arm.h>
 #include <platform_def.h>
 
+static const arm_tzc_regions_info_t tzc_regions[] = {
+       ARM_TZC_REGIONS_DEF,
+       {}
+};
+
 /* Initialize the secure environment */
 void plat_arm_security_setup(void)
 {
+       unsigned int i;
+
+       for (i = 0U; i < TZC400_COUNT; i++) {
+               arm_tzc400_setup(TZC400_BASE(i), tzc_regions);
+       }
 }