Merge changes from topic "tc0_tfa_v25"
* changes:
plat: tc0: enable managed exit for primary cactus
plat: tc0: set PLAT_CACTUS_CORE_COUNT, disable SMMUv3 tests
plat: tc0: Update GICR base address
diff --git a/plat/arm/tc0/include/platform_def.h b/plat/arm/tc0/include/platform_def.h
index acdf370..9df99d1 100644
--- a/plat/arm/tc0/include/platform_def.h
+++ b/plat/arm/tc0/include/platform_def.h
@@ -72,7 +72,7 @@
/* GIC-600 & interrupt handling related constants */
#define TC0_GICD_BASE 0x30000000
-#define TC0_GICR_BASE 0x30140000
+#define TC0_GICR_BASE 0x30080000
#define TC0_GICC_BASE 0x2C000000
/* SoC's PL011 UART0 related constants */
@@ -109,7 +109,12 @@
/* Platform specific page table and MMU setup constants */
#define PLAT_PHY_ADDR_SPACE_SIZE (1ull << 36)
#define PLAT_VIRT_ADDR_SPACE_SIZE (1ull << 36)
+
+#if IMAGE_CACTUS
+#define MAX_XLAT_TABLES 6
+#else
#define MAX_XLAT_TABLES 5
+#endif
#define MAX_MMAP_REGIONS 16
/*******************************************************************************
diff --git a/plat/arm/tc0/tests_to_skip.txt b/plat/arm/tc0/tests_to_skip.txt
index f039eed..0d1c16d 100644
--- a/plat/arm/tc0/tests_to_skip.txt
+++ b/plat/arm/tc0/tests_to_skip.txt
@@ -4,9 +4,9 @@
# SPDX-License-Identifier: BSD-3-Clause
#
-# System suspend is not supported as there are no wakeup sources in tc0 FVP
+# Disable SMMUv3 tests
+SMMUv3 tests
# PSCI is enabled but not tested
PSCI STAT/Stats test cases after system suspend
PSCI System Suspend Validation
-PSCI NODE_HW_STATE
diff --git a/spm/cactus/plat/arm/tc0/fdts/cactus.dts b/spm/cactus/plat/arm/tc0/fdts/cactus.dts
index bd7c546..eaca735 100644
--- a/spm/cactus/plat/arm/tc0/fdts/cactus.dts
+++ b/spm/cactus/plat/arm/tc0/fdts/cactus.dts
@@ -25,7 +25,7 @@
entrypoint-offset = <0x00001000>;
xlat-granule = <0>; /* 4KiB */
boot-order = <0>;
- messaging-method = <0>; /* Direct messaging only */
+ messaging-method = <3>; /* Direct messaging with managed exit */
run-time-model = <1>; /* Run to completion */
/* Boot protocol */
diff --git a/spm/cactus/plat/arm/tc0/include/cactus_platform_def.h b/spm/cactus/plat/arm/tc0/include/cactus_platform_def.h
index 42dd291..585391d 100644
--- a/spm/cactus/plat/arm/tc0/include/cactus_platform_def.h
+++ b/spm/cactus/plat/arm/tc0/include/cactus_platform_def.h
@@ -16,9 +16,20 @@
#define CACTUS_PL011_UART_CLK_IN_HZ PL011_UART1_CLK_IN_HZ
#define PLAT_CACTUS_RX_BASE ULL(0xfe300000)
+#define PLAT_CACTUS_CORE_COUNT (8)
#define CACTUS_PRIMARY_EC_COUNT (8U)
#define CACTUS_SECONDARY_EC_COUNT (8U)
#define CACTUS_TERTIARY_EC_COUNT (1U)
+/* Scratch memory used for SMMUv3 driver testing purposes in Cactus SP */
+/* SMMUv3 tests are disabled for TC platform */
+#define PLAT_CACTUS_MEMCPY_BASE ULL(0xfe400000)
+#define PLAT_CACTUS_MEMCPY_RANGE ULL(0x8000)
+
+/* Base address of user and PRIV frames in SMMUv3TestEngine */
+/* SMMUv3 tests are disabled for TC platform */
+#define USR_BASE_FRAME ULL(0x0)
+#define PRIV_BASE_FRAME ULL(0x0)
+
#endif /* CACTUS_PLATFORM_DEF_H */