Changeset 68535 in vbox for trunk/src/VBox/Devices

Timestamp:

Aug 28, 2017 12:13:04 PM (7 years ago)

Author:

vboxsync

Message:

AHCI: Additional logging, fixed confusing grammar/typo (send vs. sent).

File:

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

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

@@ -343 +343 @@
     /** Device has spun up. */
     bool                            fSpunUp;
-    /** First D2H FIS was send. */
-    bool                            fFirstD2HFisSend;
+    /** First D2H FIS was sent. */
+    bool                            fFirstD2HFisSent;
     /** Attached device is a CD/DVD drive. */
     bool                            fATAPI;
@@ -957 +957 @@
 static void ahciPortResetFinish(PAHCIPort pAhciPort)
 {
+    ahciLog(("%s: Initiated.\n", __FUNCTION__));
+
     /* Cancel all tasks first. */
     bool fAllTasksCanceled = ahciCancelActiveTasks(pAhciPort);
@@ -972 +974 @@
     pAhciPort->regTFD  |= ATA_STAT_BUSY;
 
-    if ((pAhciPort->regCMD & AHCI_PORT_CMD_FRE) && (!pAhciPort->fFirstD2HFisSend))
+    if ((pAhciPort->regCMD & AHCI_PORT_CMD_FRE) && (!pAhciPort->fFirstD2HFisSent))
     {
         ahciPostFirstD2HFisIntoMemory(pAhciPort);
@@ -1056 +1058 @@
         if (ASMAtomicReadBool(&pAhciPort->fWrkThreadSleeping))
             ahciIoThreadKick(pAhci, pAhciPort);
-    }
+        else
+            ahciLog(("%s: Worker thread busy, no need to kick.\n", __FUNCTION__));
+    }
+    else
+        ahciLog(("%s: Nothing to do (CMD=%08x).\n", __FUNCTION__, pAhciPort->regCMD));
 
     pAhciPort->regCI |= u32Value;
@@ -1151 +1157 @@
         pAhciPort->regSIG  = UINT32_MAX;
         pAhciPort->regTFD  = 0x7f;
-        pAhciPort->fFirstD2HFisSend = false;
+        pAhciPort->fFirstD2HFisSent = false;
         pAhciPort->regSCTL = u32Value;
     }
@@ -1309 +1315 @@
             }
             else
+            {
+                if (!pAhciPort->pDrvBase)
+                    ahciLog(("%s: No pDrvBase, clearing PxCMD.CR!\n", __FUNCTION__));
+                else
+                    ahciLog(("%s: PxIS.PCS set (PxIS=%#010x), clearing PxCMD.CR!\n", __FUNCTION__, pAhciPort->regIS));
+
                 u32Value &= ~AHCI_PORT_CMD_CR;
+            }
         }
         else
@@ -1363 +1376 @@
         }
     }
+    else
+        ahciLog(("%s: No pDrvBase, no fPoweredOn + fSpunUp, doing nothing!\n", __FUNCTION__));
 
     if (u32Value & AHCI_PORT_CMD_FRE)
@@ -1370 +1385 @@
         u32Value |= AHCI_PORT_CMD_FR;
 
-        /* Send the first D2H FIS only if it wasn't already send. */
-        if (   !pAhciPort->fFirstD2HFisSend
+        /* Send the first D2H FIS only if it wasn't already sent. */
+        if (   !pAhciPort->fFirstD2HFisSent
             && pAhciPort->pDrvBase)
         {
@@ -1378 +1393 @@
 #else
             ahciPostFirstD2HFisIntoMemory(pAhciPort);
-            pAhciPort->fFirstD2HFisSend = true;
+            pAhciPort->fFirstD2HFisSent = true;
 #endif
         }
@@ -2731 +2746 @@
     uint8_t d2hFis[AHCI_CMDFIS_TYPE_D2H_SIZE];
 
-    pAhciPort->fFirstD2HFisSend = true;
+    pAhciPort->fFirstD2HFisSent = true;
 
     ahciLog(("%s: Sending First D2H FIS from FIFO\n", __FUNCTION__));
@@ -4779 +4794 @@
         pHlp->pfnPrintf(pHlp, "PortPoweredOn=%RTbool\n", pThisPort->fPoweredOn);
         pHlp->pfnPrintf(pHlp, "PortSpunUp=%RTbool\n", pThisPort->fSpunUp);
-        pHlp->pfnPrintf(pHlp, "PortFirstD2HFisSend=%RTbool\n", pThisPort->fFirstD2HFisSend);
+        pHlp->pfnPrintf(pHlp, "PortFirstD2HFisSent=%RTbool\n", pThisPort->fFirstD2HFisSent);
         pHlp->pfnPrintf(pHlp, "PortATAPI=%RTbool\n", pThisPort->fATAPI);
         pHlp->pfnPrintf(pHlp, "PortTasksFinished=%#x\n", pThisPort->u32TasksFinished);