Changeset 53115 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Oct 22, 2014 12:13:05 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

96643

Message:

Storage/AHCI: Correct fix for r96392 (AHCI: Update HBA interrupt status register before executing the write)

File:

• trunk/src/VBox/Devices/Storage/DevAHCI.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Storage/DevAHCI.cpp

@@ -1704 +1704 @@
         return rc;
 
-#if 0 /* temporarily disabled for investigation */
-    /* Update interrupt status register first. */
+    ahci->regHbaIs &= ~(u32Value);
+
+    /*
+     * Update interrupt status register and check for ports who
+     * set the interrupt inbetween.
+     */
+    bool fClear = true;
     ahci->regHbaIs |= ASMAtomicXchgU32(&ahci->u32PortsInterrupted, 0);
-#endif
-
-    if (u32Value > 0)
-    {
+    if (!ahci->regHbaIs)
+    {
+        unsigned i = 0;
+
+        /* Check if the cleared ports have a interrupt status bit set. */
+        while ((u32Value > 0) && (i < AHCI_MAX_NR_PORTS_IMPL))
+        {
+            if (u32Value & 0x01)
+            {
+                PAHCIPort pAhciPort = &ahci->ahciPort[i];
+
+                if (pAhciPort->regIE & pAhciPort->regIS)
+                {
+                    Log(("%s: Interrupt status of port %u set -> Set interrupt again\n", __FUNCTION__, i));
+                    ASMAtomicOrU32(&ahci->u32PortsInterrupted, 1 << i);
+                    fClear = false;
+                    break;
+                }
+            }
+            u32Value >>= 1;
+            i++;
+        }
+    }
+    else
+        fClear = false;
+
+    if (fClear)
+        ahciHbaClearInterrupt(ahci);
+    else
+    {
+        Log(("%s: Not clearing interrupt: u32PortsInterrupted=%#010x\n", __FUNCTION__, ahci->u32PortsInterrupted));
         /*
-         * Clear the interrupt only if no port has signalled
-         * an interrupt and the guest has cleared all set interrupt
-         * notification bits.
+         * We need to set the interrupt again because the I/O APIC does not set it again even if the
+         * line is still high.
+         * We need to clear it first because the PCI bus only calls the interrupt controller if the state changes.
          */
-        bool fClear = true;
-
-        ahci->regHbaIs &= ~(u32Value);
-
-        fClear = !ahci->u32PortsInterrupted && !ahci->regHbaIs;
-        if (fClear)
-        {
-            unsigned i = 0;
-
-            /* Check if the cleared ports have a interrupt status bit set. */
-            while ((u32Value > 0) && (i < AHCI_MAX_NR_PORTS_IMPL))
-            {
-                if (u32Value & 0x01)
-                {
-                    PAHCIPort pAhciPort = &ahci->ahciPort[i];
-
-                    if (pAhciPort->regIE & pAhciPort->regIS)
-                    {
-                        Log(("%s: Interrupt status of port %u set -> Set interrupt again\n", __FUNCTION__, i));
-                        ASMAtomicOrU32(&ahci->u32PortsInterrupted, 1 << i);
-                        fClear = false;
-                        break;
-                    }
-                }
-                u32Value = u32Value >> 1;
-                i++;
-            }
-        }
-
-        if (fClear)
-            ahciHbaClearInterrupt(ahci);
-        else
-        {
-            Log(("%s: Not clearing interrupt: u32PortsInterrupted=%#010x\n", __FUNCTION__, ahci->u32PortsInterrupted));
-            /*
-             * We need to set the interrupt again because the I/O APIC does not set it again even if the
-             * line is still high.
-             * We need to clear it first because the PCI bus only calls the interrupt controller if the state changes.
-             */
-            PDMDevHlpPCISetIrq(ahci->CTX_SUFF(pDevIns), 0, 0);
-            PDMDevHlpPCISetIrq(ahci->CTX_SUFF(pDevIns), 0, 1);
-        }
+        PDMDevHlpPCISetIrq(ahci->CTX_SUFF(pDevIns), 0, 0);
+        PDMDevHlpPCISetIrq(ahci->CTX_SUFF(pDevIns), 0, 1);
     }