Merge "Add test to measure latencies when turning ON a cluster"
diff --git a/plat/arm/fvp/fvp_def.h b/plat/arm/fvp/fvp_def.h
index 46323e4..abaa387 100644
--- a/plat/arm/fvp/fvp_def.h
+++ b/plat/arm/fvp/fvp_def.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2019, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -16,7 +16,7 @@
/*******************************************************************************
* Cluster Topology definitions
******************************************************************************/
-#define FVP_MAX_CPUS_PER_CLUSTER 4
+#define FVP_MAX_CPUS_PER_CLUSTER 8
/* Currently the highest cluster count on the FVP is 4 (Quad cluster) */
#define FVP_CLUSTER_COUNT 4
/* Currently multi-threaded CPUs only have a single thread */
diff --git a/plat/arm/fvp/fvp_topology.c b/plat/arm/fvp/fvp_topology.c
index 348f8ef..751a1b8 100644
--- a/plat/arm/fvp/fvp_topology.c
+++ b/plat/arm/fvp/fvp_topology.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2019, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -26,21 +26,37 @@
{ 0, 1 },
{ 0, 2 },
{ 0, 3 },
+ { 0, 4 },
+ { 0, 5 },
+ { 0, 6 },
+ { 0, 7 },
/* Cluster 1 */
{ 1, 0 },
{ 1, 1 },
{ 1, 2 },
{ 1, 3 },
+ { 1, 4 },
+ { 1, 5 },
+ { 1, 6 },
+ { 1, 7 },
/* Cluster 2 */
{ 2, 0 },
{ 2, 1 },
{ 2, 2 },
{ 2, 3 },
+ { 2, 4 },
+ { 2, 5 },
+ { 2, 6 },
+ { 2, 7 },
/* Cluster 3 */
{ 3, 0 },
{ 3, 1 },
{ 3, 2 },
{ 3, 3 },
+ { 3, 4 },
+ { 3, 5 },
+ { 3, 6 },
+ { 3, 7 },
};
/*