Changeset 10643e9 in rtems

Timestamp:

May 13, 2013, 1:44:02 PM (8 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, master

Children:

baf8f4d

Parents:

a29704eb

git-author:

Sebastian Huber <sebastian.huber@…> (05/13/13 13:44:02)

git-committer:

Sebastian Huber <sebastian.huber@…> (05/29/13 09:06:06)

Message:

smp: Make CPU_ALLOCATE_INTERRUPT_STACK optional

Location:

cpukit/score

Files:

• include/rtems/score/percpu.h (modified) (1 diff)
• src/percpu.c (modified) (2 diffs)

cpukit/score/include/rtems/score/percpu.h

@@ -59 +59 @@
 #define __THREAD_CONTROL_DEFINED__
 typedef struct Thread_Control_struct Thread_Control;
-#endif
-
-#if (CPU_ALLOCATE_INTERRUPT_STACK == FALSE) && defined(RTEMS_SMP)
-  #error "RTEMS must allocate per CPU interrupt stack for SMP"
 #endif
 

cpukit/score/src/percpu.c

@@ -32 +32 @@
   void _SMP_Handler_initialize(void)
   {
-    int         cpu;
-    size_t      size;
-    uintptr_t   ptr;
-
+    int cpu;
 
     /*
      *  Initialize per cpu pointer table
      */
-    size = rtems_configuration_get_interrupt_stack_size();
     _Per_CPU_Information_p[0] = &_Per_CPU_Information[0];
     for (cpu=1 ; cpu < rtems_configuration_get_maximum_processors(); cpu++ ) {
@@ -48 +44 @@
       _Per_CPU_Information_p[cpu] = p;
 
-      p->interrupt_stack_low = _Workspace_Allocate_or_fatal_error( size );
+#if CPU_ALLOCATE_INTERRUPT_STACK == TRUE
+      {
+        size_t size = rtems_configuration_get_interrupt_stack_size();
+        uintptr_t ptr;
 
-      ptr = (uintptr_t) _Addresses_Add_offset( p->interrupt_stack_low, size );
-      ptr &= ~(CPU_STACK_ALIGNMENT - 1);
-      p->interrupt_stack_high = (void *)ptr;
+        p->interrupt_stack_low = _Workspace_Allocate_or_fatal_error( size );
+
+        ptr = (uintptr_t) _Addresses_Add_offset( p->interrupt_stack_low, size );
+        ptr &= ~(CPU_STACK_ALIGNMENT - 1);
+        p->interrupt_stack_high = (void *)ptr;
+      }
+#endif
+
       p->state = RTEMS_BSP_SMP_CPU_INITIAL_STATE;
       RTEMS_COMPILER_MEMORY_BARRIER();