powerpc/64: Use array of paca pointers and allocate pacas individually

Change the paca array into an array of pointers to pacas. Allocate
pacas individually.

This allows flexibility in where the PACAs are allocated. Future work
will allocate them node-local. Platforms that don't have address limits
on PACAs would be able to defer PACA allocations until later in boot
rather than allocate all possible ones up-front then freeing unused.

This is slightly more overhead (one additional indirection) for cross
CPU paca references, but those aren't too common.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/powerpc/platforms/85xx/smp.c b/arch/powerpc/platforms/85xx/smp.c
index f51fd35f4618..7e966f4cf19a 100644
--- a/arch/powerpc/platforms/85xx/smp.c
+++ b/arch/powerpc/platforms/85xx/smp.c
@@ -147,7 +147,7 @@ static void qoriq_cpu_kill(unsigned int cpu)
         for (i = 0; i < 500; i++) {
                 if (is_cpu_dead(cpu)) {
 #ifdef CONFIG_PPC64
-                        paca[cpu].cpu_start = 0;
+                        paca_ptrs[cpu]->cpu_start = 0;
 #endif
                         return;
                 }
@@ -328,7 +328,7 @@ static int smp_85xx_kick_cpu(int nr)
                 return ret;
 
 done:
-        paca[nr].cpu_start = 1;
+        paca_ptrs[nr]->cpu_start = 1;
         generic_set_cpu_up(nr);
 
         return ret;
@@ -409,14 +409,14 @@ void mpc85xx_smp_kexec_cpu_down(int crash_shutdown, int secondary)
         }
 
         if (disable_threadbit) {
-                while (paca[disable_cpu].kexec_state < KEXEC_STATE_REAL_MODE) {
+                while (paca_ptrs[disable_cpu]->kexec_state < KEXEC_STATE_REAL_MODE) {
                         barrier();
                         now = mftb();
                         if (!notified && now - start > 1000000) {
                                 pr_info("%s/%d: waiting for cpu %d to enter KEXEC_STATE_REAL_MODE (%d)\n",
                                         __func__, smp_processor_id(),
                                         disable_cpu,
-                                        paca[disable_cpu].kexec_state);
+                                        paca_ptrs[disable_cpu]->kexec_state);
                                 notified = true;
                         }
                 }