summaryrefslogtreecommitdiff
path: root/plat/mediatek
diff options
context:
space:
mode:
authordanh-arm <dan.handley@arm.com>2015-08-18 12:40:22 +0100
committerdanh-arm <dan.handley@arm.com>2015-08-18 12:40:22 +0100
commitb0b4855f742ecf9320961f879aec8673841fcd63 (patch)
tree9ff9f4a8fd2b1cc8fdb14f6b86b39399ffee8a47 /plat/mediatek
parent6ab9bbbc3a70d206fac7821d2143383fb4160d4a (diff)
parentc4a99e894943efcc093bbb8d0b5c0339ac7a7fdf (diff)
Merge pull request #365 from mtk09422/plat_topology
mt8173: Fix cluster 0 core count
Diffstat (limited to 'plat/mediatek')
-rw-r--r--plat/mediatek/mt8173/plat_topology.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/plat/mediatek/mt8173/plat_topology.c b/plat/mediatek/mt8173/plat_topology.c
index eacebe0c..96598b65 100644
--- a/plat/mediatek/mt8173/plat_topology.c
+++ b/plat/mediatek/mt8173/plat_topology.c
@@ -28,18 +28,20 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <arch.h>
+#include <platform_def.h>
#include <psci.h>
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)