Changeset 509040f0 in rtems for c/src/lib/libcpu/powerpc/mpc83xx/network/tsec.c

Timestamp:

04/14/14 15:11:12 (10 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, master

Children:

598f39cd

Parents:

c5831a3f

git-author:

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

git-committer:

Sebastian Huber <sebastian.huber@…> (04/15/14 08:43:05)

Message:

bsps/powerpc: SMP support for one TSEC driver

File:

• c/src/lib/libcpu/powerpc/mpc83xx/network/tsec.c (modified) (8 diffs)

c/src/lib/libcpu/powerpc/mpc83xx/network/tsec.c

@@ -64 +64 @@
   rtems_irq_number irq_num_err;
 
+  rtems_interrupt_lock lock;
+
   /*
    * BD management
@@ -141 +143 @@
                             | TSEC_IEVENT_XFUN   )
 
-#define TSEC_IMASK_SET(reg,mask,val) {  \
-  rtems_interrupt_level level;                  \
-                                                \
-  rtems_interrupt_disable(level);               \
-  (reg) = (((reg) & ~(mask)) |                  \
-           ((val) &  (mask)));                  \
-  rtems_interrupt_enable(level);                \
+static void TSEC_IMASK_SET(struct tsec_struct *sc, uint32_t mask, uint32_t val)
+{
+  volatile uint32_t *reg = &sc->reg_ptr->imask;
+  rtems_interrupt_lock_context lock_context;
+
+  rtems_interrupt_lock_acquire(&sc->lock, &lock_context);
+  *reg = (*reg & ~mask) | (val & mask);
+  rtems_interrupt_lock_release(&sc->lock, &lock_context);
 }
 
@@ -506 +509 @@
   * enable Rx interrupts, make sure this is not interrupted :-)
   */
- TSEC_IMASK_SET(sc->reg_ptr->imask,IEVENT_RXALL,~0);
+ TSEC_IMASK_SET(sc,IEVENT_RXALL,~0);
 
  /*
@@ -877 +880 @@
   * enable Tx interrupts, make sure this is not interrupted :-)
   */
- TSEC_IMASK_SET(sc->reg_ptr->imask,IEVENT_TXALL,~0);
+ TSEC_IMASK_SET(sc,IEVENT_TXALL,~0);
 
  /*
@@ -1157 +1160 @@
    * disable tx interrupts
    */
-  TSEC_IMASK_SET(sc->reg_ptr->imask,IEVENT_TXALL,0);
+  TSEC_IMASK_SET(sc,IEVENT_TXALL,0);
 
 #if defined(CLREVENT_IN_IRQ)
@@ -1201 +1204 @@
    * disable rx interrupts
    */
-  TSEC_IMASK_SET(sc->reg_ptr->imask,IEVENT_RXALL,0);
+  TSEC_IMASK_SET(sc,IEVENT_RXALL,0);
 #if defined(CLREVENT_IN_IRQ)
   /*
@@ -1307 +1310 @@
     (struct tsec_struct *)(irq_conn_data->handle);
 
-  TSEC_IMASK_SET(sc->reg_ptr->imask,
+  TSEC_IMASK_SET(sc,
                        tsec_irq_mask(irq_conn_data->name,sc),
                        ~0);
@@ -1334 +1337 @@
     (struct tsec_struct *)irq_conn_data->handle;
 
-  TSEC_IMASK_SET(sc->reg_ptr->imask,
+  TSEC_IMASK_SET(sc,
                        tsec_irq_mask(irq_conn_data->name,sc),
                        0);