From c4a99e894943efcc093bbb8d0b5c0339ac7a7fdf Mon Sep 17 00:00:00 2001 From: Jimmy Huang Date: Fri, 14 Aug 2015 15:25:16 +0800 Subject: [PATCH] mt8173: Fix cluster 0 core count Use constant macro defined in platform_def.h to replace hardcoded value. This patch fix following assert in new psci-1.0 framework. ASSERT: populate_power_domain_tree <183> : j == PLATFORM_CORE_COUNT Change-Id: I9b7eda525479464a8c3805b6fe14ffb10debaf72 Signed-off-by: Jimmy Huang --- plat/mediatek/mt8173/plat_topology.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plat/mediatek/mt8173/plat_topology.c b/plat/mediatek/mt8173/plat_topology.c index eacebe0cd..96598b656 100644 --- a/plat/mediatek/mt8173/plat_topology.c +++ b/plat/mediatek/mt8173/plat_topology.c @@ -28,18 +28,20 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include +#include #include unsigned int plat_get_aff_count(unsigned int aff_lvl, unsigned long mpidr) { /* Report 1 (absent) instance at levels higher that the cluster level */ if (aff_lvl > MPIDR_AFFLVL1) - return 1; + return PLATFORM_SYSTEM_COUNT; if (aff_lvl == MPIDR_AFFLVL1) - return 2; /* We have two clusters */ + return PLATFORM_CLUSTER_COUNT; - return mpidr & 0x100 ? 2 : 2; /* 2 cpus in cluster 1, 2 in cluster 0 */ + return mpidr & 0x100 ? PLATFORM_CLUSTER1_CORE_COUNT : + PLATFORM_CLUSTER0_CORE_COUNT; } unsigned int plat_get_aff_state(unsigned int aff_lvl, unsigned long mpidr)