Multiply with FVP_MAX_PE_PER_CPU in power topology
Elements in fvp_power_domain_tree_desc and PLATFORM_CORE_COUNT are
multiplied by FVP_MAX_PE_PER_CPU in order to implement the correct
topology.
Change-Id: Icb979d719a1b4aac39a95b2829fcabaa53bdedaf
Signed-off-by: Imre Kis <imre.kis@arm.com>
diff --git a/plat/arm/fvp/fvp_topology.c b/plat/arm/fvp/fvp_topology.c
index dddd25b..e13e801 100644
--- a/plat/arm/fvp/fvp_topology.c
+++ b/plat/arm/fvp/fvp_topology.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018-2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -69,13 +69,13 @@
/* Number of cluster nodes */
FVP_CLUSTER_COUNT,
/* Number of children for the first node */
- FVP_MAX_CPUS_PER_CLUSTER,
+ FVP_MAX_CPUS_PER_CLUSTER * FVP_MAX_PE_PER_CPU,
/* Number of children for the second node */
- FVP_MAX_CPUS_PER_CLUSTER,
+ FVP_MAX_CPUS_PER_CLUSTER * FVP_MAX_PE_PER_CPU,
/* Number of children for the third node */
- FVP_MAX_CPUS_PER_CLUSTER,
+ FVP_MAX_CPUS_PER_CLUSTER * FVP_MAX_PE_PER_CPU,
/* Number of children for the fourth node */
- FVP_MAX_CPUS_PER_CLUSTER
+ FVP_MAX_CPUS_PER_CLUSTER * FVP_MAX_PE_PER_CPU
};
const unsigned char *tftf_plat_get_pwr_domain_tree_desc(void)
diff --git a/plat/arm/fvp/include/platform_def.h b/plat/arm/fvp/include/platform_def.h
index 4f64079..b6c926b 100644
--- a/plat/arm/fvp/include/platform_def.h
+++ b/plat/arm/fvp/include/platform_def.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018-2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -129,7 +129,8 @@
#endif
#define PLATFORM_CORE_COUNT (FVP_CLUSTER_COUNT * \
- FVP_MAX_CPUS_PER_CLUSTER)
+ FVP_MAX_CPUS_PER_CLUSTER * \
+ FVP_MAX_PE_PER_CPU)
#define PLATFORM_NUM_AFFS (1 + FVP_CLUSTER_COUNT + \
PLATFORM_CORE_COUNT)
#define PLATFORM_MAX_AFFLVL MPIDR_AFFLVL2