ARM: kernel: update topology to use new MPIDR macros

This patch updates the topology initialization code to use the newly
defined accessors to retrieve the MPIDR affinity levels.

Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Acked-by: Nicolas Pitre <nico@linaro.org>

diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c
index cd68d1aa9c3daa28751bbc96495660b28b27403f..79282ebcd9394f154d63d8edc7576aac2f66e7f7 100644 (file)
--- a/arch/arm/kernel/topology.c
+++ b/arch/arm/kernel/topology.c
@@ -257,19 +257,14 @@ void store_cpu_topology(unsigned int cpuid)
 
                if (mpidr & MPIDR_MT_BITMASK) {
                        /* core performance interdependency */
-                       cpuid_topo->thread_id = (mpidr >> MPIDR_LEVEL0_SHIFT)
-                               & MPIDR_LEVEL0_MASK;
-                       cpuid_topo->core_id = (mpidr >> MPIDR_LEVEL1_SHIFT)
-                               & MPIDR_LEVEL1_MASK;
-                       cpuid_topo->socket_id = (mpidr >> MPIDR_LEVEL2_SHIFT)
-                               & MPIDR_LEVEL2_MASK;
+                       cpuid_topo->thread_id = MPIDR_AFFINITY_LEVEL(mpidr, 0);
+                       cpuid_topo->core_id = MPIDR_AFFINITY_LEVEL(mpidr, 1);
+                       cpuid_topo->socket_id = MPIDR_AFFINITY_LEVEL(mpidr, 2);
                } else {
                        /* largely independent cores */
                        cpuid_topo->thread_id = -1;
-                       cpuid_topo->core_id = (mpidr >> MPIDR_LEVEL0_SHIFT)
-                               & MPIDR_LEVEL0_MASK;
-                       cpuid_topo->socket_id = (mpidr >> MPIDR_LEVEL1_SHIFT)
-                               & MPIDR_LEVEL1_MASK;
+                       cpuid_topo->core_id = MPIDR_AFFINITY_LEVEL(mpidr, 0);
+                       cpuid_topo->socket_id = MPIDR_AFFINITY_LEVEL(mpidr, 1);
                }
        } else {
                /*