Ticket #2009: 0005-LEON3-CPU-index-intialization-_HEAD.patch

c/src/lib/libbsp/sparc/leon3/amba/amba.c

@@ -21 +21 @@
 /* Pointers to Interrupt Controller configuration registers */
 volatile LEON3_IrqCtrl_Regs_Map *LEON3_IrqCtrl_Regs;
 
-int LEON3_Cpu_Index = 0;
-
 /*
  *  amba_initialize
  *
@@ -33 +31 @@
  *  amba_ahb_masters, amba_ahb_slaves and amba.
  */
 
-unsigned int getasr17(void);
-
-__asm__ (" .text  \n"
-    "getasr17:   \n"
-    "retl \n"
-    "mov %asr17, %o0\n"
-);
-
-
-extern rtems_configuration_table Configuration;
 extern int scan_uarts(void);
 
 void amba_initialize(void)
@@ -58 +46 @@
   if ( i > 0 ){
     /* Found APB IRQ_MP Interrupt Controller */
     LEON3_IrqCtrl_Regs = (volatile LEON3_IrqCtrl_Regs_Map *) dev.start;
-#if defined(RTEMS_MULTIPROCESSING)
-      if (rtems_configuration_get_user_multiprocessing_table() != NULL) {
-        unsigned int tmp = getasr17();
-        LEON3_Cpu_Index = (tmp >> 28) & 3;
-      }
-#endif
   }
 
   /* find GP Timer */

c/src/lib/libbsp/sparc/leon3/startup/bspstart.c

@@ -27 +27 @@
  */
 int CPU_SPARC_HAS_SNOOPING;
 
+/* Index of CPU, in an AMP system CPU-index may be non-zero */
+int LEON3_Cpu_Index = 0;
+
 extern void amba_initialize(void);
 
 /*
@@ -48 +51 @@
   return (tmp >> 27) & 1;
 }
 
+/* ASM-function used to get the CPU-Index on calling LEON3 CPUs */
+static inline unsigned int get_asr17(void)
+{
+  unsigned int reg;
+  __asm__ (" mov %%asr17, %0 " : "=r"(reg) :);
+  return reg;
+}
+
 /*
  *  bsp_start
  *
@@ -57 +68 @@
 {
   CPU_SPARC_HAS_SNOOPING = set_snooping();
 
+  /* Get the LEON3 CPU index, normally 0, but for MP systems we do 
+   * _not_ assume that this is CPU0. One may run another OS on CPU0
+   * and RTEMS on this CPU, and AMP system with mixed operating
+   * systems
+   */
+  LEON3_Cpu_Index = (get_asr17() >> 28) & 3;
+
   /* Find UARTs */
   amba_initialize();
 }