Changeset db71e2a in mainline for kernel/arch/mips32/src/exception.c

Timestamp:

2013-07-24T17:42:25Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes.

usb hc macro changes from mainline were reverted, too many conflicts

File:

• kernel/arch/mips32/src/exception.c (modified) (1 diff)

kernel/arch/mips32/src/exception.c

@@ -165 +165 @@
 static void interrupt_exception(unsigned int n, istate_t *istate)
 {
+        uint32_t ip;
+        uint32_t im;
+
         /* Decode interrupt number and process the interrupt */
-        uint32_t cause = (cp0_cause_read() >> 8) & 0xff;
+        ip = (cp0_cause_read() & cp0_cause_ip_mask) >> cp0_cause_ip_shift;
+        im = (cp0_status_read() & cp0_status_im_mask) >> cp0_status_im_shift;
         
         unsigned int i;
         for (i = 0; i < 8; i++) {
-                if (cause & (1 << i)) {
+
+                /*
+                 * The interrupt could only occur if it is unmasked in the
+                 * status register. On the other hand, an interrupt can be
+                 * apparently pending even if it is masked, so we need to
+                 * check both the masked and pending interrupts.
+                 */
+                if (im & ip & (1 << i)) {
                         irq_t *irq = irq_dispatch_and_lock(i);
                         if (irq) {