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

Timestamp:

Nov 17, 2010 6:37:52 PM (14 years ago)

Author:

vboxsync

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

67862

Message:

AHCI: Better fix for r67808. Don't ignore the return values for R3 usage and use better status code for rcBusy

File:

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

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

@@ -998 +998 @@
     PAHCI pAhci = (PAHCI)pvUser;
 
-    ahciHbaSetInterrupt(pAhci, pAhci->uCccPortNr, VINF_SUCCESS);
+    int rc = ahciHbaSetInterrupt(pAhci, pAhci->uCccPortNr, VERR_IGNORED);
+    AssertRC(rc);
 }
 #endif
@@ -1164 +1165 @@
 
                 if (pAhciPort->regIE & AHCI_PORT_IE_DHRE)
-                    ahciHbaSetInterrupt(pAhciPort->CTX_SUFF(pAhci), pAhciPort->iLUN, VINF_SUCCESS);
+                {
+                    int rc = ahciHbaSetInterrupt(pAhciPort->CTX_SUFF(pAhci), pAhciPort->iLUN, VERR_IGNORED);
+                    AssertRC(rc);
+                }
             }
        }
@@ -1241 +1245 @@
 static int PortCmd_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: ICC=%d ASP=%d ALPE=%d DLAE=%d ATAPI=%d CPD=%d ISP=%d HPCP=%d PMA=%d CPS=%d CR=%d FR=%d ISS=%d CCS=%d FRE=%d CLO=%d POD=%d SUD=%d ST=%d\n",
@@ -1309 +1312 @@
 
                 if (pAhciPort->regIE & AHCI_PORT_IE_DHRE)
-                    ahciHbaSetInterrupt(pAhciPort->CTX_SUFF(pAhci), pAhciPort->iLUN, VINF_SUCCESS);
+                {
+                    int rc = ahciHbaSetInterrupt(pAhciPort->CTX_SUFF(pAhci), pAhciPort->iLUN, VERR_IGNORED);
+                    AssertRC(rc);
+                }
 #endif
             }
@@ -1346 +1352 @@
     pAhciPort->regCMD = u32Value;
 
-    return rc;
+    return VINF_SUCCESS;
 }
 
@@ -4453 +4459 @@
 static void ahciFinishStorageDeviceReset(PAHCIPort pAhciPort, PAHCIPORTTASKSTATE pAhciPortTaskState)
 {
+    int rc;
+
     /* Send a status good D2H FIS. */
     ASMAtomicWriteU32(&pAhciPort->MediaEventStatus, ATA_EVENT_STATUS_UNCHANGED);
@@ -4466 +4474 @@
     ASMAtomicOrU32(&pAhciPort->u32TasksFinished, (1 << pAhciPortTaskState->uTag));
 
-    ahciHbaSetInterrupt(pAhciPort->CTX_SUFF(pAhci), pAhciPort->iLUN, VINF_SUCCESS);
+    rc = ahciHbaSetInterrupt(pAhciPort->CTX_SUFF(pAhci), pAhciPort->iLUN, VERR_IGNORED);
+    AssertRC(rc);
 }
 
@@ -4547 +4556 @@
 
         if (fAssertIntr)
-            ahciHbaSetInterrupt(pAhci, pAhciPort->iLUN, VINF_SUCCESS);
+        {
+            int rc = ahciHbaSetInterrupt(pAhci, pAhciPort->iLUN, VERR_IGNORED);
+            AssertRC(rc);
+        }
     }
 }
@@ -4611 +4623 @@
 
         if (fAssertIntr)
-            ahciHbaSetInterrupt(pAhci, pAhciPort->iLUN, VINF_SUCCESS);
+        {
+            int rc = ahciHbaSetInterrupt(pAhci, pAhciPort->iLUN, VERR_IGNORED);
+            AssertRC(rc);
+        }
     }
 }
@@ -7198 +7213 @@
         pAhciPort->regSERR |= AHCI_PORT_SERR_N;
         if (pAhciPort->regIE & AHCI_PORT_IE_CPDE)
-            ahciHbaSetInterrupt(pAhciPort->CTX_SUFF(pAhci), pAhciPort->iLUN, VINF_SUCCESS);
+        {
+            int rc = ahciHbaSetInterrupt(pAhciPort->CTX_SUFF(pAhci), pAhciPort->iLUN, VERR_IGNORED);
+            AssertRC(rc);
+        }
     }
 }
@@ -7235 +7253 @@
         pAhciPort->regSERR |= AHCI_PORT_SERR_N;
         if (pAhciPort->regIE & AHCI_PORT_IE_CPDE)
-            ahciHbaSetInterrupt(pAhciPort->CTX_SUFF(pAhci), pAhciPort->iLUN, VINF_SUCCESS);
+        {
+            int rc = ahciHbaSetInterrupt(pAhciPort->CTX_SUFF(pAhci), pAhciPort->iLUN, VERR_IGNORED);
+            AssertRC(rc);
+        }
     }
 }