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

Timestamp:

Nov 16, 2010 11:37:01 AM (14 years ago)

Author:

vboxsync

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

67808

Message:

AHCI: Fix ahciHbaSetInterrupt from non R3 contexts

File:

• trunk/src/VBox/Devices/Storage/DevAHCI.cpp (modified) (12 diffs)

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

@@ -943 +943 @@
  * Updates the IRQ level and sets port bit in the global interrupt status register of the HBA.
  */
-static void ahciHbaSetInterrupt(PAHCI pAhci, uint8_t iPort)
+static int ahciHbaSetInterrupt(PAHCI pAhci, uint8_t iPort, int rcBusy)
 {
     Log(("P%u: %s: Setting interrupt\n", iPort, __FUNCTION__));
 
-    PDMCritSectEnter(&pAhci->lock, VINF_SUCCESS);
+    int rc = PDMCritSectEnter(&pAhci->lock, rcBusy);
+    if (rc != VINF_SUCCESS)
+        return rc;
 
     if (pAhci->regHbaCtrl & AHCI_HBA_CTRL_IE)
@@ -985 +987 @@
 
     PDMCritSectLeave(&pAhci->lock);
+    return VINF_SUCCESS;
 }
 
@@ -995 +998 @@
     PAHCI pAhci = (PAHCI)pvUser;
 
-    ahciHbaSetInterrupt(pAhci, pAhci->uCccPortNr);
+    ahciHbaSetInterrupt(pAhci, pAhci->uCccPortNr, VINF_SUCCESS);
 }
 #endif
@@ -1161 +1164 @@
 
                 if (pAhciPort->regIE & AHCI_PORT_IE_DHRE)
-                    ahciHbaSetInterrupt(pAhciPort->CTX_SUFF(pAhci), pAhciPort->iLUN);
+                    ahciHbaSetInterrupt(pAhciPort->CTX_SUFF(pAhci), pAhciPort->iLUN, VINF_SUCCESS);
             }
        }
@@ -1306 +1309 @@
 
                 if (pAhciPort->regIE & AHCI_PORT_IE_DHRE)
-                    ahciHbaSetInterrupt(pAhciPort->CTX_SUFF(pAhci), pAhciPort->iLUN);
+                    ahciHbaSetInterrupt(pAhciPort->CTX_SUFF(pAhci), pAhciPort->iLUN, VINF_SUCCESS);
 #endif
             }
@@ -1371 +1374 @@
 static int PortIntrEnable_w(PAHCI ahci, PAHCIPort pAhciPort, uint32_t iReg, uint32_t u32Value)
 {
+    int rc = VINF_SUCCESS;
     ahciLog(("%s: write u32Value=%#010x\n", __FUNCTION__, u32Value));
     ahciLog(("%s: CPDE=%d TFEE=%d HBFE=%d HBDE=%d IFE=%d INFE=%d OFE=%d IPME=%d PRCE=%d DIE=%d PCE=%d DPE=%d UFE=%d SDBE=%d DSE=%d PSE=%d DHRE=%d\n",
@@ -1383 +1387 @@
              (u32Value & AHCI_PORT_IE_DHRE)));
 
-    pAhciPort->regIE = (u32Value & AHCI_PORT_IE_READONLY);
+    u32Value &= AHCI_PORT_IE_READONLY;
 
     /* Check if some a interrupt status bit changed*/
     uint32_t u32IntrStatus = ASMAtomicReadU32(&pAhciPort->regIS);
 
-    if (pAhciPort->regIE & u32IntrStatus)
-        ahciHbaSetInterrupt(ahci, pAhciPort->iLUN);
-
-    return VINF_SUCCESS;
+    if (u32Value & u32IntrStatus)
+        rc = ahciHbaSetInterrupt(ahci, pAhciPort->iLUN, VINF_IOM_HC_MMIO_WRITE);
+
+    if (rc == VINF_SUCCESS)
+        pAhciPort->regIE = u32Value;
+
+    return rc;
 }
 
@@ -4459 +4466 @@
     ASMAtomicOrU32(&pAhciPort->u32TasksFinished, (1 << pAhciPortTaskState->uTag));
 
-    ahciHbaSetInterrupt(pAhciPort->CTX_SUFF(pAhci), pAhciPort->iLUN);
+    ahciHbaSetInterrupt(pAhciPort->CTX_SUFF(pAhci), pAhciPort->iLUN, VINF_SUCCESS);
 }
 
@@ -4540 +4547 @@
 
         if (fAssertIntr)
-            ahciHbaSetInterrupt(pAhci, pAhciPort->iLUN);
+            ahciHbaSetInterrupt(pAhci, pAhciPort->iLUN, VINF_SUCCESS);
     }
 }
@@ -4604 +4611 @@
 
         if (fAssertIntr)
-            ahciHbaSetInterrupt(pAhci, pAhciPort->iLUN);
+            ahciHbaSetInterrupt(pAhci, pAhciPort->iLUN, VINF_SUCCESS);
     }
 }
@@ -7191 +7198 @@
         pAhciPort->regSERR |= AHCI_PORT_SERR_N;
         if (pAhciPort->regIE & AHCI_PORT_IE_CPDE)
-            ahciHbaSetInterrupt(pAhciPort->CTX_SUFF(pAhci), pAhciPort->iLUN);
+            ahciHbaSetInterrupt(pAhciPort->CTX_SUFF(pAhci), pAhciPort->iLUN, VINF_SUCCESS);
     }
 }
@@ -7228 +7235 @@
         pAhciPort->regSERR |= AHCI_PORT_SERR_N;
         if (pAhciPort->regIE & AHCI_PORT_IE_CPDE)
-            ahciHbaSetInterrupt(pAhciPort->CTX_SUFF(pAhci), pAhciPort->iLUN);
+            ahciHbaSetInterrupt(pAhciPort->CTX_SUFF(pAhci), pAhciPort->iLUN, VINF_SUCCESS);
     }
 }