ARM: 7847/1: mcpm: Factor out logical-to-physical CPU translation

This patch factors the logical-to-physical CPU translation out of
mcpm_boot_secondary(), so that it can be reused elsewhere.

Signed-off-by: Dave Martin <Dave.Martin@arm.com>
Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 13 insertions, 4 deletions

diff --git a/arch/arm/common/mcpm_platsmp.c b/arch/arm/common/mcpm_platsmp.c
index 1bc34c7567fd..c0c3cd799ccc 100644
--- a/arch/arm/common/mcpm_platsmp.c
+++ b/arch/arm/common/mcpm_platsmp.c
@@ -19,14 +19,23 @@
 #include <asm/smp.h>
 #include <asm/smp_plat.h>
 
+static void cpu_to_pcpu(unsigned int cpu,
+                        unsigned int *pcpu, unsigned int *pcluster)
+{
+        unsigned int mpidr;
+
+        mpidr = cpu_logical_map(cpu);
+        *pcpu = MPIDR_AFFINITY_LEVEL(mpidr, 0);
+        *pcluster = MPIDR_AFFINITY_LEVEL(mpidr, 1);
+}
+
 static int mcpm_boot_secondary(unsigned int cpu, struct task_struct *idle)
 {
-        unsigned int mpidr, pcpu, pcluster, ret;
+        unsigned int pcpu, pcluster, ret;
         extern void secondary_startup(void);
 
-        mpidr = cpu_logical_map(cpu);
-        pcpu = MPIDR_AFFINITY_LEVEL(mpidr, 0);
-        pcluster = MPIDR_AFFINITY_LEVEL(mpidr, 1);
+        cpu_to_pcpu(cpu, &pcpu, &pcluster);
+
         pr_debug("%s: logical CPU %d is physical CPU %d cluster %d\n",
                  __func__, cpu, pcpu, pcluster);