Changeset fe235a1 in rtems

Timestamp:

Aug 21, 2003, 5:05:56 PM (17 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

d36c457

Parents:

fc9caa91

Message:

2003-08-21 Till Strauman <strauman@…>

PR 456/bsps

• irq/irq.c: Fix race condition when installing an ISR.

Location:

c/src/lib/libbsp

Files:

• i386/shared/ChangeLog (modified) (1 diff)
• i386/shared/irq/irq.c (modified) (3 diffs)
• powerpc/shared/ChangeLog (modified) (1 diff)
• powerpc/shared/irq/irq.c (modified) (4 diffs)

c/src/lib/libbsp/i386/shared/ChangeLog

@@ +1 @@
+2003-08-21      Till Strauman <strauman@slac.stanford.edu>
+
+        PR 456/bsps
+        * irq/irq.c: Fix race condition when installing an ISR.
+
 2003-08-16      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 

c/src/lib/libbsp/i386/shared/irq/irq.c

@@ -236 +236 @@
      * to get the previous handler before accepting to disconnect.
      */
+    _CPU_ISR_Disable(level);
     if (rtems_hdl_tbl[irq->name].hdl != default_rtems_entry.hdl) {
-      return 0;
-    }
-    _CPU_ISR_Disable(level);
+          _CPU_ISR_Enable(level);
+      return 0;
+    }
 
     /*
@@ -266 +267 @@
 int BSP_get_current_rtems_irq_handler   (rtems_irq_connect_data* irq)
 {
+     unsigned int level;
+
      if (!isValidInterrupt(irq->name)) {
       return 0;
      }
+    _CPU_ISR_Disable(level);
      *irq = rtems_hdl_tbl[irq->name];
+    _CPU_ISR_Enable(level);
      return 1;
 }
@@ -287 +292 @@
      * to get the previous handler before accepting to disconnect.
      */
+    _CPU_ISR_Disable(level);
     if (rtems_hdl_tbl[irq->name].hdl != irq->hdl) {
-      return 0;
-    }
-    _CPU_ISR_Disable(level);
+      _CPU_ISR_Enable(level);
+      return 0;
+    }
 
     /*

c/src/lib/libbsp/powerpc/shared/ChangeLog

@@ +1 @@
+2003-08-21      Till Strauman <strauman@slac.stanford.edu>
+
+        PR 456/bsps
+        * irq/irq.c: Fix race condition when installing an ISR.
+
 2003-08-16      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 

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

@@ -132 +132 @@
       return 0;
     }
+
+    _CPU_ISR_Disable(level);
+
     if ( (int)rtems_hdl_tbl[irq->name].next_handler  == -1 ) {
+      _CPU_ISR_Enable(level);
       printk("IRQ vector %d already connected to an unshared handler\n",irq->name);
       return 0;
     }
-    _CPU_ISR_Disable(level);
-
 
      vchain = (rtems_irq_connect_data*)malloc(sizeof(rtems_irq_connect_data));
@@ -202 +204 @@
      * to get the previous handler before accepting to disconnect.
      */
+    _CPU_ISR_Disable(level);
     if (rtems_hdl_tbl[irq->name].hdl != default_rtems_entry.hdl) {
+      _CPU_ISR_Enable(level);
       printk("IRQ vector %d already connected\n",irq->name);
       return 0;
     }
-    _CPU_ISR_Disable(level);
 
     /*
@@ -246 +249 @@
 int BSP_get_current_rtems_irq_handler   (rtems_irq_connect_data* irq)
 {
+     unsigned int level;
+
      if (!isValidInterrupt(irq->name)) {
       return 0;
      }
+     _CPU_ISR_Disable(level);
      *irq = rtems_hdl_tbl[irq->name];
+     _CPU_ISR_Enable(level);
      return 1;
 }
@@ -268 +275 @@
      * to get the previous handler before accepting to disconnect.
      */
+    _CPU_ISR_Disable(level);
     if (rtems_hdl_tbl[irq->name].hdl != irq->hdl) {
+      _CPU_ISR_Enable(level);
       return 0;
     }
-    _CPU_ISR_Disable(level);
 
     if( (int)rtems_hdl_tbl[irq->name].next_handler != -1 )