Changeset 40956 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Apr 16, 2012 10:58:48 PM (13 years ago)

Author:

vboxsync

Message:

PDM,APIC,IO-APIC: More IRQ tagging.

Location:

trunk/src/VBox/Devices/PC

Files:

• DevAPIC.cpp (modified) (3 diffs)
• DevApic.h (modified) (1 diff)
• DevIoApic.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/PC/DevAPIC.cpp

@@ -836 +836 @@
                                       0 /* Polarity - conform to the bus */,
                                       0 /* Trigger mode - edge */,
-                                      0 /*uTagSrc*/);
+                                      pDev->CTX_SUFF(pApicHlp)->pfnCalcIrqTag(pDev->CTX_SUFF(pDevIns), PDM_IRQ_LEVEL_HIGH));
                 APIC_UNLOCK(pDev);
                 break;
@@ -1433 +1433 @@
 
     return apic_bus_deliver(pDev, &DstSet, delivery_mode, vector_num,
-                            polarity, trigger_mode, 0 /* uTagSrc*/);
+                            polarity, trigger_mode, 
+                            pDev->CTX_SUFF(pApicHlp)->pfnCalcIrqTag(pDev->CTX_SUFF(pDevIns), PDM_IRQ_LEVEL_HIGH));
 }
 
@@ -1700 +1701 @@
         LogFlow(("apic_timer: trigger irq\n"));
         apic_set_irq(pDev, pApic, pApic->lvt[APIC_LVT_TIMER] & 0xff, APIC_TRIGGER_EDGE, 
-                     pDev->CTX_SUFF(pApicHlp)->pfnCalcIrqTag(pDevIns));
+                     pDev->CTX_SUFF(pApicHlp)->pfnCalcIrqTag(pDevIns, PDM_IRQ_LEVEL_HIGH));
 
         if (   (pApic->lvt[APIC_LVT_TIMER] & APIC_LVT_TIMER_PERIODIC)

trunk/src/VBox/Devices/PC/DevApic.h

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as

trunk/src/VBox/Devices/PC/DevIoApic.cpp

@@ -149 +149 @@
                 delivery_mode = (entry >> 8) & 7;
                 polarity = (entry >> 13) & 1;
+                uint32_t uTagSrc = pThis->auTagSrc[i];
                 if (trig_mode == APIC_TRIGGER_EDGE)
+                {
+                    pThis->auTagSrc[i] = 0;
                     pThis->irr &= ~mask;
+                }
                 if (delivery_mode == APIC_DM_EXTINT)
                     /* malc: i'm still not so sure about ExtINT delivery */
@@ -159 +163 @@
                 else
                     vector = entry & 0xff;
-                uint32_t uTagSrc = pThis->auTagSrc[i];
-                pThis->auTagSrc[i] = 0;
 
                 int rc = pThis->CTX_SUFF(pIoApicHlp)->pfnApicBusDeliver(pThis->CTX_SUFF(pDevIns),
@@ -202 +204 @@
 
                 if ((level & PDM_IRQ_LEVEL_FLIP_FLOP) == PDM_IRQ_LEVEL_FLIP_FLOP)
+                {
                     pThis->irr &= ~mask;
+                    pThis->auTagSrc[vector] = 0;
+                }
             }
             else
+            {
                 pThis->irr &= ~mask;
+                pThis->auTagSrc[vector] = 0;
+            }
         }
         else
@@ -526 +534 @@
     pThis->irr      = 0;
     for (unsigned i = 0; i < IOAPIC_NUM_PINS; i++)
+    {
         pThis->ioredtbl[i] = 1 << 16; /* mask LVT */
+        pThis->auTagSrc[i] = 0;
+    }
 
     IOAPIC_UNLOCK(pThis);