Changeset e0609ac in rtems for c/src/lib/libbsp/shared/include/irq-generic.h

Timestamp:

03/03/14 08:49:12 (10 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, master

Children:

718124e

Parents:

8b50a55

git-author:

Sebastian Huber <sebastian.huber@…> (03/03/14 08:49:12)

git-committer:

Sebastian Huber <sebastian.huber@…> (03/06/14 08:43:58)

Message:

bsps: SMP support for generic interrupt support

File:

• c/src/lib/libbsp/shared/include/irq-generic.h (modified) (4 diffs)

c/src/lib/libbsp/shared/include/irq-generic.h

@@ -10 +10 @@
  * Based on concepts of Pavel Pisa, Till Straumann and Eric Valette.
  *
- * Copyright (c) 2008-2012 embedded brains GmbH.
+ * Copyright (c) 2008-2014 embedded brains GmbH.
  *
  *  embedded brains GmbH
- *  Obere Lagerstr. 30
+ *  Dornierstr. 4
  *  82178 Puchheim
  *  Germany
@@ -30 +30 @@
 #include <rtems/irq-extension.h>
 
+#ifdef RTEMS_SMP
+  #include <rtems/score/atomic.h>
+#endif
+
 #include <bsp/irq.h>
 
@@ -53 +57 @@
 #ifndef BSP_INTERRUPT_HANDLER_TABLE_SIZE
   #define BSP_INTERRUPT_HANDLER_TABLE_SIZE BSP_INTERRUPT_VECTOR_NUMBER
+#endif
+
+/* Internal macros for SMP support, do not use externally */
+#ifdef RTEMS_SMP
+  #define bsp_interrupt_disable(level) do { (void) level; } while (0)
+  #define bsp_interrupt_enable(level) do { } while (0)
+  #define bsp_interrupt_fence(order) _Atomic_Fence(order)
+#else
+  #define bsp_interrupt_disable(level) rtems_interrupt_disable(level)
+  #define bsp_interrupt_enable(level) rtems_interrupt_enable(level)
+  #define bsp_interrupt_fence(order) do { } while (0)
 #endif
 
@@ -239 +254 @@
 {
   if (bsp_interrupt_is_valid_vector(vector)) {
-    bsp_interrupt_handler_entry *e =
+    const bsp_interrupt_handler_entry *e =
       &bsp_interrupt_handler_table [bsp_interrupt_handler_index(vector)];
 
     do {
-      (*e->handler)(e->arg);
+      rtems_interrupt_handler handler;
+      void *arg;
+
+      arg = e->arg;
+      bsp_interrupt_fence(ATOMIC_ORDER_ACQUIRE);
+      handler = e->handler;
+      (*handler)(arg);
+
       e = e->next;
     } while (e != NULL);