Changeset 37269 in vbox for trunk/src/VBox

Timestamp:

May 30, 2011 9:15:14 PM (14 years ago)

Author:

vboxsync

Message:

AHCI: Fix return code for index/Data pair access

File:

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

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

@@ -1525 +1525 @@
     ahciLog(("%s: write u32Value=%#010x\n", __FUNCTION__, u32Value));
 
+    Assert(!(u32Value & ~AHCI_PORT_FB_RESERVED));
+
     pAhciPort->regFB = (u32Value & AHCI_PORT_FB_RESERVED);
     pAhciPort->GCPhysAddrFb = AHCI_RTGCPHYS_FROM_U32(pAhciPort->regFBU, pAhciPort->regFB);
@@ -1570 +1572 @@
 {
     ahciLog(("%s: write u32Value=%#010x\n", __FUNCTION__, u32Value));
+
+    Assert(!(u32Value & ~AHCI_PORT_CLB_RESERVED));
 
     pAhciPort->regCLB = (u32Value & AHCI_PORT_CLB_RESERVED);
@@ -2390 +2394 @@
             Assert(iReg == 1);
             rc = ahciRegisterWrite(pAhci, pAhci->regIdx, &u32, cb);
+            if (rc == VINF_IOM_HC_MMIO_WRITE)
+                rc = VINF_IOM_HC_IOPORT_WRITE;
         }
     }
@@ -2430 +2436 @@
             Assert(iReg == 1);
             rc = ahciRegisterRead(pAhci, pAhci->regIdx, pu32, cb);
+            if (rc == VINF_IOM_HC_MMIO_READ)
+                rc = VINF_IOM_HC_IOPORT_READ;
         }
     }
@@ -8160 +8168 @@
     PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
 
+    LogFlowFunc(("pThis=%#p\n", pThis));
+
     /*
      * Validate and read configuration.