smp: Add and use _Per_CPU_Get()

Add and use _Per_CPU_Get_by_index() and _Per_CPU_Get_index().  Add
_Per_CPU_Send_interrupt().  This avoids direct access of
_Per_CPU_Information.

3 files changed, 11 insertions, 8 deletions

diff --git a/c/src/lib/libbsp/i386/shared/smp/smp-imps.c b/c/src/lib/libbsp/i386/shared/smp/smp-imps.c
index 57ec5db3e8..250dfad2ad 100644
--- a/c/src/lib/libbsp/i386/shared/smp/smp-imps.c
+++ b/c/src/lib/libbsp/i386/shared/smp/smp-imps.c
@@ -269,7 +269,7 @@ boot_cpu(imps_processor *proc)
   );
 
   reset[1] = (uint32_t)secondary_cpu_initialize;
-  reset[2] = (uint32_t)_Per_CPU_Information[apicid].interrupt_stack_high;
+  reset[2] = (uint32_t)_Per_CPU_Get_by_index(apicid)->interrupt_stack_high;
 
   /*
    *  Generic CPU startup sequence starts here.
diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/smp.c b/c/src/lib/libbsp/powerpc/qoriq/startup/smp.c
index 30bcb7bc28..9caaa99a01 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/startup/smp.c
+++ b/c/src/lib/libbsp/powerpc/qoriq/startup/smp.c
@@ -87,6 +87,7 @@ static void mmu_config_undo(void)
 
 static void release_core_1(void)
 {
+  const Per_CPU_Control *second_cpu = _Per_CPU_Get_by_index(1);
   uboot_spin_table *spin_table = (uboot_spin_table *) SPIN_TABLE;
   qoriq_mmu_context mmu_context;
 
@@ -96,7 +97,7 @@ static void release_core_1(void)
   qoriq_mmu_write_to_tlb1(&mmu_context, TLB_BEGIN);
 
   spin_table->pir = 1;
-  spin_table->r3_lower = (uint32_t) _Per_CPU_Information[1].interrupt_stack_high;
+  spin_table->r3_lower = (uint32_t) second_cpu->interrupt_stack_high;
   spin_table->addr_upper = 0;
   rtems_cache_flush_multiple_data_lines(spin_table, sizeof(*spin_table));
   ppc_synchronize_data();
@@ -108,13 +109,15 @@ static void release_core_1(void)
 
 void qoriq_secondary_cpu_initialize(void)
 {
+  const Per_CPU_Control *second_cpu = _Per_CPU_Get_by_index(1);
+
   /* Disable decrementer */
   PPC_CLEAR_SPECIAL_PURPOSE_REGISTER_BITS(BOOKE_TCR, BOOKE_TCR_DIE);
 
   /* Initialize exception handler */
   ppc_exc_initialize_with_vector_base(
     PPC_INTERRUPT_DISABLE_MASK_DEFAULT,
-    (uintptr_t) _Per_CPU_Information[1].interrupt_stack_low,
+    (uintptr_t) second_cpu->interrupt_stack_low,
     rtems_configuration_get_interrupt_stack_size(),
     bsp_exc_vector_base
   );
diff --git a/c/src/lib/libbsp/sparc/leon3/smp/smp_leon3.c b/c/src/lib/libbsp/sparc/leon3/smp/smp_leon3.c
index 8862ca5f7a..f7b70f3b14 100644
--- a/c/src/lib/libbsp/sparc/leon3/smp/smp_leon3.c
+++ b/c/src/lib/libbsp/sparc/leon3/smp/smp_leon3.c
@@ -86,12 +86,13 @@ uint32_t bsp_smp_initialize( uint32_t configured_cpu_count )
     return 1;
 
   for ( cpu=1 ; cpu < found_cpus ; cpu++ ) {
-    
+    const Per_CPU_Control *per_cpu = _Per_CPU_Get_by_index( cpu );
+
     #if defined(RTEMS_DEBUG)
       printk( "Waking CPU %d\n", cpu );
     #endif
 
-    bsp_ap_stack = _Per_CPU_Information[cpu].interrupt_stack_high -
+    bsp_ap_stack = per_cpu->interrupt_stack_high -
                       CPU_MINIMUM_STACK_FRAME_SIZE;
     bsp_ap_entry = leon3_secondary_cpu_initialize;
 
@@ -101,9 +102,8 @@ uint32_t bsp_smp_initialize( uint32_t configured_cpu_count )
       printk(
         "CPU %d is %s\n",
         cpu,
-        _Per_CPU_Information[cpu].state
-          == PER_CPU_STATE_READY_TO_BEGIN_MULTITASKING ?
-            "online" : "offline"
+        per_cpu->state == PER_CPU_STATE_READY_TO_BEGIN_MULTITASKING ?
+          "online" : "offline"
       );
     #endif
   }