plat/tc0: Change to 8 cores for Theodul
This includes changing to 8 cores for header file, dts
and topology. The missing uart node is also added to
cactus.dts.
Signed-off-by: Usama Arif <usama.arif@arm.com>
Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
Change-Id: I1c70f9fd92273d7b5dc97875707e469d7f39c12d
diff --git a/el3_payload/plat/tc0/platform.h b/el3_payload/plat/tc0/platform.h
index b1919b5..5e43002 100644
--- a/el3_payload/plat/tc0/platform.h
+++ b/el3_payload/plat/tc0/platform.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Arm Limited. All rights reserved.
+ * Copyright (c) 2020-2021, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -9,11 +9,11 @@
#define PRIMARY_CPU_MPID 0x0
-#define CPUS_COUNT 4
+#define CPUS_COUNT 8
#define UART_BASE 0x7ff80000
-#define TC0_MAX_CPUS_PER_CLUSTER 4
+#define TC0_MAX_CPUS_PER_CLUSTER 8
#define TC0_MAX_PE_PER_CPU 1
#endif /* PLATFORM_H */
diff --git a/plat/arm/tc0/include/platform_def.h b/plat/arm/tc0/include/platform_def.h
index fbfc230..acdf370 100644
--- a/plat/arm/tc0/include/platform_def.h
+++ b/plat/arm/tc0/include/platform_def.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Arm Limited. All rights reserved.
+ * Copyright (c) 2020-2021, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -13,7 +13,7 @@
#define PLATFORM_LINKER_ARCH aarch64
#define TC0_CLUSTER_COUNT 1
-#define TC0_MAX_CPUS_PER_CLUSTER 4
+#define TC0_MAX_CPUS_PER_CLUSTER 8
#define TC0_MAX_PE_PER_CPU 1
/*******************************************************************************
diff --git a/plat/arm/tc0/tc0_topology.c b/plat/arm/tc0/tc0_topology.c
index feb8727..9e30b64 100644
--- a/plat/arm/tc0/tc0_topology.c
+++ b/plat/arm/tc0/tc0_topology.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Arm Limited. All rights reserved.
+ * Copyright (c) 2020-2021, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -12,11 +12,15 @@
unsigned int cluster_id;
unsigned int cpu_id;
} tc0_cores[] = {
- /* Cluster0: 4 cores*/
+ /* Cluster0: 8 cores*/
{ 0, 0 },
{ 0, 1 },
{ 0, 2 },
- { 0, 3 }
+ { 0, 3 },
+ { 0, 4 },
+ { 0, 5 },
+ { 0, 6 },
+ { 0, 7 }
};
/*
diff --git a/spm/cactus/plat/arm/tc0/fdts/cactus-secondary.dts b/spm/cactus/plat/arm/tc0/fdts/cactus-secondary.dts
index cc7715c..5b90eb8 100644
--- a/spm/cactus/plat/arm/tc0/fdts/cactus-secondary.dts
+++ b/spm/cactus/plat/arm/tc0/fdts/cactus-secondary.dts
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Arm Limited. All rights reserved.
+ * Copyright (c) 2020-2021, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -18,7 +18,7 @@
ffa-version = <0x00010000>; /* 31:16 - Major, 15:0 - Minor */
uuid = <0xd1582309 0xf02347b9 0x827c4464 0xf5578fc8>;
id = <2>;
- execution-ctx-count = <4>;
+ execution-ctx-count = <8>;
exception-level = <2>; /* S-EL1 */
execution-state = <0>; /* AARCH64 */
load-address = <0xfe100000>;
diff --git a/spm/cactus/plat/arm/tc0/fdts/cactus-tertiary.dts b/spm/cactus/plat/arm/tc0/fdts/cactus-tertiary.dts
index 8567e06..724d595 100644
--- a/spm/cactus/plat/arm/tc0/fdts/cactus-tertiary.dts
+++ b/spm/cactus/plat/arm/tc0/fdts/cactus-tertiary.dts
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Arm Limited. All rights reserved.
+ * Copyright (c) 2020-2021, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -18,7 +18,7 @@
ffa-version = <0x00010000>; /* 31:16 - Major, 15:0 - Minor */
uuid = <0x79b55c73 0x1d8c44b9 0x859361e1 0x770ad8d2>;
id = <3>;
- execution-ctx-count = <4>;
+ execution-ctx-count = <8>;
exception-level = <2>; /* S-EL1 */
execution-state = <0>; /* AARCH64 */
load-address = <0xfe200000>;
diff --git a/spm/cactus/plat/arm/tc0/fdts/cactus.dts b/spm/cactus/plat/arm/tc0/fdts/cactus.dts
index 4b27959..bd7c546 100644
--- a/spm/cactus/plat/arm/tc0/fdts/cactus.dts
+++ b/spm/cactus/plat/arm/tc0/fdts/cactus.dts
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Arm Limited. All rights reserved.
+ * Copyright (c) 2020-2021, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -18,7 +18,7 @@
ffa-version = <0x00010000>; /* 31:16 - Major, 15:0 - Minor */
uuid = <0xb4b5671e 0x4a904fe1 0xb81ffb13 0xdae1dacb>;
id = <1>;
- execution-ctx-count = <4>;
+ execution-ctx-count = <8>;
exception-level = <2>; /* S-EL1 */
execution-state = <0>; /* AARCH64 */
load-address = <0xfe000000>;
@@ -54,4 +54,13 @@
attributes = <0x3>; /* read-write */
};
};
+
+ device-regions {
+ compatible = "arm,ffa-manifest-device-regions";
+ uart2 {
+ base-address = <0x00000000 0x7FF80000>;
+ pages-count = <1>;
+ attributes = <0x3>; /* read-write */
+ };
+ };
};
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 ae4d4e8..d551314 100644
--- a/spm/cactus/plat/arm/tc0/include/cactus_platform_def.h
+++ b/spm/cactus/plat/arm/tc0/include/cactus_platform_def.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Arm Limited. All rights reserved.
+ * Copyright (c) 2020-2021, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -17,8 +17,8 @@
#define PLAT_CACTUS_RX_BASE ULL(0xfe300000)
-#define CACTUS_PRIMARY_EC_COUNT (4U)
-#define CACTUS_SECONDARY_EC_COUNT (4U)
-#define CACTUS_TERTIARY_EC_COUNT (4U)
+#define CACTUS_PRIMARY_EC_COUNT (8U)
+#define CACTUS_SECONDARY_EC_COUNT (8U)
+#define CACTUS_TERTIARY_EC_COUNT (8U)
#endif /* CACTUS_PLATFORM_DEF_H */