Changeset b80f920 in rtems for c/src/lib/libbsp/powerpc/qoriq/irq/irq.c

Timestamp:

04/15/14 11:36:35 (9 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, master

Children:

33d0666

Parents:

487b94e7

git-author:

Sebastian Huber <sebastian.huber@…> (04/15/14 11:36:35)

git-committer:

Sebastian Huber <sebastian.huber@…> (04/16/14 07:07:33)

Message:

bsp/qoriq: SMP support for IRQ support

File:

• c/src/lib/libbsp/powerpc/qoriq/irq/irq.c (modified) (4 diffs)

c/src/lib/libbsp/powerpc/qoriq/irq/irq.c

@@ -8 +8 @@
 
 /*
- * Copyright (c) 2010, 2012 embedded brains GmbH.  All rights reserved.
+ * Copyright (c) 2010-2014 embedded brains GmbH.  All rights reserved.
  *
  *  embedded brains GmbH
- *  Obere Lagerstr. 30
+ *  Dornierstr. 4
  *  82178 Puchheim
  *  Germany
@@ -47 +47 @@
 
 #define SPURIOUS 0xffff
+
+static rtems_interrupt_lock lock =
+ RTEMS_INTERRUPT_LOCK_INITIALIZER("QorIQ IRQ");
 
 static const uint16_t vpr_and_dr_offsets [] = {
@@ -169 +172 @@
 
                 if (QORIQ_PIC_PRIORITY_IS_VALID(new_priority)) {
-                        rtems_interrupt_level level;
-
-                        rtems_interrupt_disable(level);
+                        rtems_interrupt_lock_context lock_context;
+
+                        rtems_interrupt_lock_acquire(&lock, &lock_context);
                         old_vpr = *vpr;
                         *vpr = VPR_PRIORITY_SET(old_vpr, (uint32_t) new_priority);
-                        rtems_interrupt_enable(level);
+                        rtems_interrupt_lock_release(&lock, &lock_context);
                 } else if (new_priority < 0) {
                         old_vpr = *vpr;
@@ -221 +224 @@
                 int offs = vpr_and_dr_offsets [vector] << 2;
                 volatile uint32_t *vpr = (volatile uint32_t *) &qoriq.pic + offs;
-                rtems_interrupt_level level;
-
-                rtems_interrupt_disable(level);
+                rtems_interrupt_lock_context lock_context;
+
+                rtems_interrupt_lock_acquire(&lock, &lock_context);
                 *vpr = (*vpr & ~VPR_MSK) | msk;
-                rtems_interrupt_enable(level);
+                rtems_interrupt_lock_release(&lock, &lock_context);
         }