Changeset 6fdded2c in rtems

Timestamp:

May 10, 2017, 10:39:23 AM (3 years ago)

Author:

Daniel Hellstrom <daniel@…>

Branches:

master

Children:

818f10bc

Parents:

3feae3b

git-author:

Daniel Hellstrom <daniel@…> (05/10/17 10:39:23)

git-committer:

Daniel Hellstrom <daniel@…> (05/14/17 10:32:00)

Message:

leon, gr1553bm: SMP support by using spin-locks

File:

• c/src/lib/libbsp/sparc/shared/1553/gr1553bm.c (modified) (6 diffs)

c/src/lib/libbsp/sparc/shared/1553/gr1553bm.c

@@ -24 +24 @@
 #define GR1553BM_READ_REG(adr) (*(volatile uint32_t *)(adr))
 
-#ifndef IRQ_GLOBAL_PREPARE
- #define IRQ_GLOBAL_PREPARE(level) rtems_interrupt_level level
+/* Use interrupt lock privmitives compatible with SMP defined in
+ * RTEMS 4.11.99 and higher.
+ */
+#if (((__RTEMS_MAJOR__ << 16) | (__RTEMS_MINOR__ << 8) | __RTEMS_REVISION__) >= 0x040b63)
+
+/* map via rtems_interrupt_lock_* API: */
+#define SPIN_DECLARE(lock) RTEMS_INTERRUPT_LOCK_MEMBER(lock)
+#define SPIN_INIT(lock, name) rtems_interrupt_lock_initialize(lock, name)
+#define SPIN_LOCK(lock, level) rtems_interrupt_lock_acquire_isr(lock, &level)
+#define SPIN_LOCK_IRQ(lock, level) rtems_interrupt_lock_acquire(lock, &level)
+#define SPIN_UNLOCK(lock, level) rtems_interrupt_lock_release_isr(lock, &level)
+#define SPIN_UNLOCK_IRQ(lock, level) rtems_interrupt_lock_release(lock, &level)
+#define SPIN_IRQFLAGS(k) rtems_interrupt_lock_context k
+#define SPIN_ISR_IRQFLAGS(k) SPIN_IRQFLAGS(k)
+#define SPIN_FREE(lock) rtems_interrupt_lock_destroy(lock)
+
+#else
+
+/* maintain single-core compatibility with older versions of RTEMS: */
+#define SPIN_DECLARE(name)
+#define SPIN_INIT(lock, name)
+#define SPIN_LOCK(lock, level)
+#define SPIN_LOCK_IRQ(lock, level) rtems_interrupt_disable(level)
+#define SPIN_UNLOCK(lock, level)
+#define SPIN_UNLOCK_IRQ(lock, level) rtems_interrupt_enable(level)
+#define SPIN_IRQFLAGS(k) rtems_interrupt_level k
+#define SPIN_ISR_IRQFLAGS(k)
+#define SPIN_FREE(lock)
+
+#ifdef RTEMS_SMP
+#error SMP mode not compatible with these interrupt lock primitives
 #endif
 
-#ifndef IRQ_GLOBAL_DISABLE
- #define IRQ_GLOBAL_DISABLE(level) rtems_interrupt_disable(level)
-#endif
-
-#ifndef IRQ_GLOBAL_ENABLE
- #define IRQ_GLOBAL_ENABLE(level) rtems_interrupt_enable(level)
 #endif
 
@@ -39 +62 @@
         struct drvmgr_dev **pdev;
         struct gr1553b_regs *regs;
+        SPIN_DECLARE(devlock);
 
         void *buffer;
@@ -81 +105 @@
 static void gr1553bm_hw_start(struct gr1553bm_priv *priv)
 {
-        IRQ_GLOBAL_PREPARE(oldLevel);
+        SPIN_IRQFLAGS(irqflags);
 
         /* Enable IRQ source and mark running state */
-        IRQ_GLOBAL_DISABLE(oldLevel);
+        SPIN_LOCK_IRQ(&priv->devlock, irqflags);
 
         priv->started = 1;
@@ -104 +128 @@
                 | GR1553B_BM_CTRL_BMEN;
 
-        IRQ_GLOBAL_ENABLE(oldLevel);
+        SPIN_UNLOCK_IRQ(&priv->devlock, irqflags);
 }
 
 static void gr1553bm_hw_stop(struct gr1553bm_priv *priv)
 {
-        IRQ_GLOBAL_PREPARE(oldLevel);
-
-        IRQ_GLOBAL_DISABLE(oldLevel);
+        SPIN_IRQFLAGS(irqflags);
+
+        SPIN_LOCK_IRQ(&priv->devlock, irqflags);
 
         /* Stop Logging */
@@ -124 +148 @@
         priv->started = 0;
 
-        IRQ_GLOBAL_ENABLE(oldLevel);
+        SPIN_UNLOCK_IRQ(&priv->devlock, irqflags);
 }
 
@@ -153 +177 @@
         pnpinfo = &ambadev->info;
         priv->regs = (struct gr1553b_regs *)pnpinfo->apb_slv->start;
+        SPIN_INIT(&priv->devlock, "gr1553bm");
 
         /* Start with default configuration */