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

Timestamp:

Oct 25, 2018 2:33:23 PM (6 years ago)

Author:

vboxsync

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

126128

Message:

DevATA: Made RECALIBRATE and INITIALIZE DEVICE PARAMETERS commands asynchronous so that they could be slowed down. See bugref:5869

File:

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

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

@@ -686 +686 @@
 static bool ataR3TrimSS(ATADevState *);
 static bool ataR3PacketSS(ATADevState *);
+static bool ataR3InitDevParmSS(ATADevState *);
+static bool ataR3RecalibrateSS(ATADevState *);
 static bool atapiR3GetConfigurationSS(ATADevState *);
 static bool atapiR3GetEventStatusNotificationSS(ATADevState *);
@@ -746 +748 @@
     ATAFN_SS_TRIM,
     ATAFN_SS_PACKET,
+    ATAFN_SS_INITIALIZE_DEVICE_PARAMETERS,
+    ATAFN_SS_RECALIBRATE,
     ATAFN_SS_ATAPI_GET_CONFIGURATION,
     ATAFN_SS_ATAPI_GET_EVENT_STATUS_NOTIFICATION,
@@ -781 +785 @@
     ataR3TrimSS,
     ataR3PacketSS,
+    ataR3InitDevParmSS,
+    ataR3RecalibrateSS,
     atapiR3GetConfigurationSS,
     atapiR3GetEventStatusNotificationSS,
@@ -3897 +3903 @@
 
 
+static bool ataR3InitDevParmSS(ATADevState *s)
+{
+    PATACONTROLLER pCtl = ATADEVSTATE_2_CONTROLLER(s);
+
+    LogFlowFunc(("\n"));
+    LogRel(("ATA: LUN#%d: INITIALIZE DEVICE PARAMETERS: %u logical sectors, %u heads\n",
+            s->iLUN, s->uATARegNSector, s->uATARegSelect & 0x0f));
+    ataR3LockLeave(pCtl);
+    RTThreadSleep(pCtl->DelayIRQMillies);
+    ataR3LockEnter(pCtl);
+    ataR3CmdOK(s, ATA_STAT_SEEK);
+    ataHCSetIRQ(s);
+    return false;
+}
+
+
+static bool ataR3RecalibrateSS(ATADevState *s)
+{
+    PATACONTROLLER pCtl = ATADEVSTATE_2_CONTROLLER(s);
+
+    LogFlowFunc(("\n"));
+    ataR3LockLeave(pCtl);
+    RTThreadSleep(pCtl->DelayIRQMillies);
+    ataR3LockEnter(pCtl);
+    ataR3CmdOK(s, ATA_STAT_SEEK);
+    ataHCSetIRQ(s);
+    return false;
+}
+
+
 static int ataR3TrimSectors(ATADevState *s, uint64_t u64Sector, uint32_t cSectors,
                             bool *pfRedo)
@@ -4009 +4045 @@
             if (s->fATAPI)
                 goto abort_cmd;
-            RT_FALL_THRU();
+            ataR3StartTransfer(s, 0, PDMMEDIATXDIR_NONE, ATAFN_BT_NULL, ATAFN_SS_RECALIBRATE, false);
+            break;
         case ATA_INITIALIZE_DEVICE_PARAMETERS:
-            ataR3CmdOK(s, ATA_STAT_SEEK);
-            ataHCSetIRQ(s); /* Shortcut, do not use AIO thread. */
+            if (s->fATAPI)
+                goto abort_cmd;
+            ataR3StartTransfer(s, 0, PDMMEDIATXDIR_NONE, ATAFN_BT_NULL, ATAFN_SS_INITIALIZE_DEVICE_PARAMETERS, false);
             break;
         case ATA_SET_MULTIPLE_MODE: