MdeModulePkg: ATA performance tuning.

[mirror_edk2.git] / MdeModulePkg / Bus / Ata / AtaAtapiPassThru / IdeMode.c

diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c
index 17e4d7e13a482c26c0aa5b50f17f332aba5b90ab..0604a9d4c3cbd60774a25615cb2925b9ce90091a 100644 (file)
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c
@@ -17,7 +17,7 @@
 /**\r
   read a one-byte data from a IDE port.\r
 \r
-  @param  PciIo  The PCI IO protocol instance\r
+  @param  PciIo  A pointer to EFI_PCI_IO_PROTOCOL data structure\r
   @param  Port   The IDE Port number \r
 \r
   @return  the one-byte data read from IDE port\r
@@ -51,7 +51,7 @@ IdeReadPortB (
 /**\r
   write a 1-byte data to a specific IDE port.\r
 \r
-  @param  PciIo  The PCI IO protocol instance\r
+  @param  PciIo  A pointer to EFI_PCI_IO_PROTOCOL data structure\r
   @param  Port   The IDE port to be writen\r
   @param  Data   The data to write to the port\r
 **/\r
@@ -81,7 +81,7 @@ IdeWritePortB (
 /**\r
   write a 1-word data to a specific IDE port.\r
 \r
-  @param  PciIo  PCI IO protocol instance\r
+  @param  PciIo  A pointer to EFI_PCI_IO_PROTOCOL data structure\r
   @param  Port   The IDE port to be writen\r
   @param  Data   The data to write to the port\r
 **/\r
@@ -111,7 +111,7 @@ IdeWritePortW (
 /**\r
   write a 2-word data to a specific IDE port.\r
 \r
-  @param  PciIo  PCI IO protocol instance\r
+  @param  PciIo  A pointer to EFI_PCI_IO_PROTOCOL data structure\r
   @param  Port   The IDE port to be writen\r
   @param  Data   The data to write to the port\r
 **/\r
@@ -143,7 +143,7 @@ IdeWritePortDW (
   Call the IO abstraction once to do the complete read,\r
   not one word at a time\r
 \r
-  @param  PciIo      Pointer to the EFI_PCI_IO instance\r
+  @param  PciIo      A pointer to EFI_PCI_IO_PROTOCOL data structure\r
   @param  Port       IO port to read\r
   @param  Count      No. of UINT16's to read\r
   @param  Buffer     Pointer to the data buffer for read\r
@@ -180,7 +180,7 @@ IdeWritePortWMultiple (
   Call the IO abstraction once to do the complete read,\r
   not one word at a time\r
 \r
-  @param  PciIo    Pointer to the EFI_PCI_IO instance\r
+  @param  PciIo    A pointer to EFI_PCI_IO_PROTOCOL data structure\r
   @param  Port     IO port to read\r
   @param  Count    Number of UINT16's to read\r
   @param  Buffer   Pointer to the data buffer for read\r
@@ -217,7 +217,7 @@ IdeReadPortWMultiple (
   some debug information and if there is ERR bit set in the Status\r
   Register, the Error Register's value is also be parsed and print out.\r
 \r
-  @param PciIo            A pointer to ATA_ATAPI_PASS_THRU_INSTANCE data structure.\r
+  @param PciIo            A pointer to EFI_PCI_IO_PROTOCOL data structure.\r
   @param IdeRegisters     A pointer to EFI_IDE_REGISTERS data structure.\r
   @param AtaStatusBlock   A pointer to EFI_ATA_STATUS_BLOCK data structure.\r
 \r
@@ -294,11 +294,10 @@ DumpAllIdeRegisters (
 }\r
 \r
 /**\r
-  This function is used to analyze the Status Register and print out\r
-  some debug information and if there is ERR bit set in the Status\r
-  Register, the Error Register's value is also be parsed and print out.\r
+  This function is used to analyze the Status Register at the condition that BSY is zero.\r
+  if there is ERR bit set in the Status Register, then return error.\r
 \r
-  @param PciIo            A pointer to ATA_ATAPI_PASS_THRU_INSTANCE data structure.\r
+  @param PciIo            A pointer to EFI_PCI_IO_PROTOCOL data structure.\r
   @param IdeRegisters     A pointer to EFI_IDE_REGISTERS data structure.\r
 \r
   @retval EFI_SUCCESS       No err information in the Status Register.\r
@@ -312,7 +311,6 @@ CheckStatusRegister (
   IN  EFI_IDE_REGISTERS        *IdeRegisters\r
   )\r
 {\r
-  EFI_STATUS      Status;\r
   UINT8           StatusRegister;\r
 \r
   ASSERT (PciIo != NULL);\r
@@ -320,13 +318,14 @@ CheckStatusRegister (
 \r
   StatusRegister = IdeReadPortB (PciIo, IdeRegisters->CmdOrStatus);\r
 \r
-  if ((StatusRegister & (ATA_STSREG_ERR | ATA_STSREG_DWF | ATA_STSREG_CORR)) == 0) {\r
-    Status = EFI_SUCCESS;\r
-  } else {\r
-    Status = EFI_DEVICE_ERROR;\r
+  if ((StatusRegister & ATA_STSREG_BSY) == 0) {\r
+    if ((StatusRegister & (ATA_STSREG_ERR | ATA_STSREG_DWF | ATA_STSREG_CORR)) == 0) {\r
+      return EFI_SUCCESS;\r
+    } else {\r
+      return EFI_DEVICE_ERROR;\r
+    }\r
   }\r
-\r
-  return Status;\r
+  return EFI_SUCCESS;\r
 }\r
 \r
 /**\r
@@ -334,9 +333,9 @@ CheckStatusRegister (
   Register. DRQ is cleared when the device is finished transferring data.\r
   So this function is called after data transfer is finished.\r
 \r
-  @param PciIo            A pointer to ATA_ATAPI_PASS_THRU_INSTANCE data structure.\r
+  @param PciIo            A pointer to EFI_PCI_IO_PROTOCOL data structure.\r
   @param IdeRegisters     A pointer to EFI_IDE_REGISTERS data structure.\r
-  @param Timeout          The time to complete the command.\r
+  @param Timeout          The time to complete the command, uses 100ns as a unit.\r
 \r
   @retval EFI_SUCCESS     DRQ bit clear within the time out.\r
 \r
@@ -356,7 +355,6 @@ DRQClear (
 {\r
   UINT32  Delay;\r
   UINT8   StatusRegister;\r
-  UINT8   ErrorRegister;\r
 \r
   ASSERT (PciIo != NULL);\r
   ASSERT (IdeRegisters != NULL);\r
@@ -366,22 +364,18 @@ DRQClear (
     StatusRegister = IdeReadPortB (PciIo, IdeRegisters->CmdOrStatus);\r
 \r
     //\r
-    // wait for BSY == 0 and DRQ == 0\r
+    // Wait for BSY == 0, then judge if DRQ is clear\r
     //\r
-    if ((StatusRegister & (ATA_STSREG_DRQ | ATA_STSREG_BSY)) == 0) {\r
-      break;\r
-    }\r
-\r
-    if ((StatusRegister & (ATA_STSREG_BSY | ATA_STSREG_ERR)) == ATA_STSREG_ERR) {\r
-      ErrorRegister = IdeReadPortB (PciIo, IdeRegisters->ErrOrFeature);\r
-\r
-      if ((ErrorRegister & ATA_ERRREG_ABRT) == ATA_ERRREG_ABRT) {\r
-        return EFI_ABORTED;\r
+    if ((StatusRegister & ATA_STSREG_BSY) == 0) {\r
+      if ((StatusRegister & ATA_STSREG_DRQ) == ATA_STSREG_DRQ) {\r
+        return EFI_DEVICE_ERROR;\r
+      } else {\r
+        return EFI_SUCCESS;\r
       }\r
     }\r
 \r
     //\r
-    //  Stall for 100 microseconds.\r
+    // Stall for 100 microseconds.\r
     //\r
     MicroSecondDelay (100);\r
 \r
@@ -389,11 +383,7 @@ DRQClear (
 \r
   } while (Delay > 0);\r
 \r
-  if (Delay == 0) {\r
-    return EFI_TIMEOUT;\r
-  }\r
-\r
-  return EFI_SUCCESS;\r
+  return EFI_TIMEOUT;\r
 }\r
 /**\r
   This function is used to poll for the DRQ bit clear in the Alternate\r
@@ -401,9 +391,9 @@ DRQClear (
   transferring data. So this function is called after data transfer\r
   is finished.\r
 \r
-  @param PciIo            A pointer to ATA_ATAPI_PASS_THRU_INSTANCE data structure.\r
+  @param PciIo            A pointer to EFI_PCI_IO_PROTOCOL data structure.\r
   @param IdeRegisters     A pointer to EFI_IDE_REGISTERS data structure.\r
-  @param Timeout          The time to complete the command.\r
+  @param Timeout          The time to complete the command, uses 100ns as a unit.\r
 \r
   @retval EFI_SUCCESS     DRQ bit clear within the time out.\r
 \r
@@ -421,7 +411,6 @@ DRQClear2 (
 {\r
   UINT32  Delay;\r
   UINT8   AltRegister;\r
-  UINT8   ErrorRegister;\r
 \r
   ASSERT (PciIo != NULL);\r
   ASSERT (IdeRegisters != NULL);\r
@@ -431,17 +420,13 @@ DRQClear2 (
     AltRegister = IdeReadPortB (PciIo, IdeRegisters->AltOrDev);\r
 \r
     //\r
-    //  wait for BSY == 0 and DRQ == 0\r
+    // Wait for BSY == 0, then judge if DRQ is clear\r
     //\r
-    if ((AltRegister & (ATA_STSREG_DRQ | ATA_STSREG_BSY)) == 0) {\r
-      break;\r
-    }\r
-\r
-    if ((AltRegister & (ATA_STSREG_BSY | ATA_STSREG_ERR)) == ATA_STSREG_ERR) {\r
-      ErrorRegister = IdeReadPortB (PciIo, IdeRegisters->ErrOrFeature);\r
-\r
-      if ((ErrorRegister & ATA_ERRREG_ABRT) == ATA_ERRREG_ABRT) {\r
-        return EFI_ABORTED;\r
+    if ((AltRegister & ATA_STSREG_BSY) == 0) {\r
+      if ((AltRegister & ATA_STSREG_DRQ) == ATA_STSREG_DRQ) {\r
+        return EFI_DEVICE_ERROR;\r
+      } else {\r
+        return EFI_SUCCESS;\r
       }\r
     }\r
 \r
@@ -454,11 +439,7 @@ DRQClear2 (
 \r
   } while (Delay > 0);\r
 \r
-  if (Delay == 0) {\r
-    return EFI_TIMEOUT;\r
-  }\r
-\r
-  return EFI_SUCCESS;\r
+  return EFI_TIMEOUT;\r
 }\r
 \r
 /**\r
@@ -468,9 +449,9 @@ DRQClear2 (
   is called after the command is sent to the device and before required\r
   data is transferred.\r
 \r
-  @param PciIo            A pointer to ATA_ATAPI_PASS_THRU_INSTANCE data structure.\r
+  @param PciIo            A pointer to EFI_PCI_IO_PROTOCOL data structure.\r
   @param IdeRegisters     A pointer to EFI_IDE_REGISTERS data structure.\r
-  @param Timeout          The time to complete the command.\r
+  @param Timeout          The time to complete the command, uses 100ns as a unit.\r
 \r
   @retval EFI_SUCCESS          DRQ bit set within the time out.\r
   @retval EFI_TIMEOUT          DRQ bit not set within the time out.\r
@@ -497,22 +478,27 @@ DRQReady (
   Delay = (UINT32) (DivU64x32(Timeout, 1000) + 1);\r
   do {\r
     //\r
-    //  read Status Register will clear interrupt\r
+    // Read Status Register will clear interrupt\r
     //\r
     StatusRegister = IdeReadPortB (PciIo, IdeRegisters->CmdOrStatus);\r
 \r
     //\r
-    //  BSY==0,DRQ==1\r
+    // Wait for BSY == 0, then judge if DRQ is clear or ERR is set\r
     //\r
-    if ((StatusRegister & (ATA_STSREG_BSY | ATA_STSREG_DRQ)) == ATA_STSREG_DRQ) {\r
-      break;\r
-    }\r
+    if ((StatusRegister & ATA_STSREG_BSY) == 0) {\r
+      if ((StatusRegister & ATA_STSREG_ERR) == ATA_STSREG_ERR) {\r
+        ErrorRegister = IdeReadPortB (PciIo, IdeRegisters->ErrOrFeature);\r
 \r
-    if ((StatusRegister & (ATA_STSREG_BSY | ATA_STSREG_ERR)) == ATA_STSREG_ERR) {\r
-      ErrorRegister = IdeReadPortB (PciIo, IdeRegisters->ErrOrFeature);\r
+        if ((ErrorRegister & ATA_ERRREG_ABRT) == ATA_ERRREG_ABRT) {\r
+          return EFI_ABORTED;\r
+        }\r
+        return EFI_DEVICE_ERROR;\r
+      }\r
 \r
-      if ((ErrorRegister & ATA_ERRREG_ABRT) == ATA_ERRREG_ABRT) {\r
-        return EFI_ABORTED;\r
+      if ((StatusRegister & ATA_STSREG_DRQ) == ATA_STSREG_DRQ) {\r
+        return EFI_SUCCESS;\r
+      } else {\r
+        return EFI_NOT_READY;\r
       }\r
     }\r
 \r
@@ -524,20 +510,16 @@ DRQReady (
     Delay--;\r
   } while (Delay > 0);\r
 \r
-  if (Delay == 0) {\r
-    return EFI_TIMEOUT;\r
-  }\r
-\r
-  return EFI_SUCCESS;\r
+  return EFI_TIMEOUT;\r
 }\r
 /**\r
   This function is used to poll for the DRQ bit set in the Alternate Status Register.\r
   DRQ is set when the device is ready to transfer data. So this function is called after \r
   the command is sent to the device and before required data is transferred.\r
 \r
-  @param PciIo            A pointer to ATA_ATAPI_PASS_THRU_INSTANCE data structure.\r
+  @param PciIo            A pointer to EFI_PCI_IO_PROTOCOL data structure.\r
   @param IdeRegisters     A pointer to EFI_IDE_REGISTERS data structure.\r
-  @param Timeout          The time to complete the command.\r
+  @param Timeout          The time to complete the command, uses 100ns as a unit.\r
 \r
   @retval EFI_SUCCESS           DRQ bit set within the time out.\r
   @retval EFI_TIMEOUT           DRQ bit not set within the time out.\r
@@ -564,21 +546,26 @@ DRQReady2 (
 \r
   do {\r
     //\r
-    //  Read Alternate Status Register will not clear interrupt status\r
+    // Read Alternate Status Register will not clear interrupt status\r
     //\r
     AltRegister = IdeReadPortB (PciIo, IdeRegisters->AltOrDev);\r
     //\r
-    // BSY == 0 , DRQ == 1\r
+    // Wait for BSY == 0, then judge if DRQ is clear or ERR is set\r
     //\r
-    if ((AltRegister & (ATA_STSREG_BSY | ATA_STSREG_DRQ)) == ATA_STSREG_DRQ) {\r
-      break;\r
-    }\r
+    if ((AltRegister & ATA_STSREG_BSY) == 0) {\r
+      if ((AltRegister & ATA_STSREG_ERR) == ATA_STSREG_ERR) {\r
+        ErrorRegister = IdeReadPortB (PciIo, IdeRegisters->ErrOrFeature);\r
 \r
-    if ((AltRegister & (ATA_STSREG_BSY | ATA_STSREG_ERR)) == ATA_STSREG_ERR) {\r
-      ErrorRegister = IdeReadPortB (PciIo, IdeRegisters->ErrOrFeature);\r
+        if ((ErrorRegister & ATA_ERRREG_ABRT) == ATA_ERRREG_ABRT) {\r
+          return EFI_ABORTED;\r
+        }\r
+        return EFI_DEVICE_ERROR;\r
+      }\r
 \r
-      if ((ErrorRegister & ATA_ERRREG_ABRT) == ATA_ERRREG_ABRT) {\r
-        return EFI_ABORTED;\r
+      if ((AltRegister & ATA_STSREG_DRQ) == ATA_STSREG_DRQ) {\r
+        return EFI_SUCCESS;\r
+      } else {\r
+        return EFI_NOT_READY;\r
       }\r
     }\r
 \r
@@ -590,11 +577,7 @@ DRQReady2 (
     Delay--;\r
   } while (Delay > 0);\r
 \r
-  if (Delay == 0) {\r
-    return EFI_TIMEOUT;\r
-  }\r
-\r
-  return EFI_SUCCESS;\r
+  return EFI_TIMEOUT;\r
 }\r
 \r
 /**\r
@@ -602,9 +585,9 @@ DRQReady2 (
   bit is set when the device is ready to accept command. Most ATA commands must be \r
   sent after DRDY set except the ATAPI Packet Command.\r
 \r
-  @param PciIo            A pointer to ATA_ATAPI_PASS_THRU_INSTANCE data structure.\r
+  @param PciIo            A pointer to EFI_PCI_IO_PROTOCOL data structure.\r
   @param IdeRegisters     A pointer to EFI_IDE_REGISTERS data structure.\r
-  @param Timeout          The time to complete the command.\r
+  @param Timeout          The time to complete the command, uses 100ns as a unit.\r
 \r
   @retval EFI_SUCCESS         DRDY bit set within the time out.\r
   @retval EFI_TIMEOUT         DRDY bit not set within the time out.\r
@@ -630,17 +613,22 @@ DRDYReady (
   do {\r
     StatusRegister = IdeReadPortB (PciIo, IdeRegisters->CmdOrStatus);\r
     //\r
-    //  BSY == 0 , DRDY == 1\r
+    // Wait for BSY == 0, then judge if DRDY is set or ERR is set\r
     //\r
-    if ((StatusRegister & (ATA_STSREG_DRDY | ATA_STSREG_BSY)) == ATA_STSREG_DRDY) {\r
-      break;\r
-    }\r
+    if ((StatusRegister & ATA_STSREG_BSY) == 0) {\r
+      if ((StatusRegister & ATA_STSREG_ERR) == ATA_STSREG_ERR) {\r
+        ErrorRegister = IdeReadPortB (PciIo, IdeRegisters->ErrOrFeature);\r
 \r
-    if ((StatusRegister & (ATA_STSREG_BSY | ATA_STSREG_ERR)) == ATA_STSREG_ERR) {\r
-      ErrorRegister = IdeReadPortB (PciIo, IdeRegisters->ErrOrFeature);\r
+        if ((ErrorRegister & ATA_ERRREG_ABRT) == ATA_ERRREG_ABRT) {\r
+          return EFI_ABORTED;\r
+        }\r
+        return EFI_DEVICE_ERROR;\r
+      }\r
 \r
-      if ((ErrorRegister & ATA_ERRREG_ABRT) == ATA_ERRREG_ABRT) {\r
-        return EFI_ABORTED;\r
+      if ((StatusRegister & ATA_STSREG_DRDY) == ATA_STSREG_DRDY) {\r
+        return EFI_SUCCESS;\r
+      } else {\r
+        return EFI_DEVICE_ERROR;\r
       }\r
     }\r
 \r
@@ -652,11 +640,7 @@ DRDYReady (
     Delay--;\r
   } while (Delay > 0);\r
 \r
-  if (Delay == 0) {\r
-    return EFI_TIMEOUT;\r
-  }\r
-\r
-  return EFI_SUCCESS;\r
+  return EFI_TIMEOUT;\r
 }\r
 \r
 /**\r
@@ -664,9 +648,9 @@ DRDYReady (
   DRDY bit is set when the device is ready to accept command. Most ATA commands must \r
   be sent after DRDY set except the ATAPI Packet Command.\r
 \r
-  @param PciIo            A pointer to ATA_ATAPI_PASS_THRU_INSTANCE data structure.\r
+  @param PciIo            A pointer to EFI_PCI_IO_PROTOCOL data structure.\r
   @param IdeRegisters     A pointer to EFI_IDE_REGISTERS data structure.\r
-  @param Timeout          The time to complete the command.\r
+  @param Timeout          The time to complete the command, uses 100ns as a unit.\r
 \r
   @retval EFI_SUCCESS      DRDY bit set within the time out.\r
   @retval EFI_TIMEOUT      DRDY bit not set within the time out.\r
@@ -693,17 +677,22 @@ DRDYReady2 (
   do {\r
     AltRegister = IdeReadPortB (PciIo, IdeRegisters->AltOrDev);\r
     //\r
-    //  BSY == 0 , DRDY == 1\r
+    // Wait for BSY == 0, then judge if DRDY is set or ERR is set\r
     //\r
-    if ((AltRegister & (ATA_STSREG_DRDY | ATA_STSREG_BSY)) == ATA_STSREG_DRDY) {\r
-      break;\r
-    }\r
+    if ((AltRegister & ATA_STSREG_BSY) == 0) {\r
+      if ((AltRegister & ATA_STSREG_ERR) == ATA_STSREG_ERR) {\r
+        ErrorRegister = IdeReadPortB (PciIo, IdeRegisters->ErrOrFeature);\r
 \r
-    if ((AltRegister & (ATA_STSREG_BSY | ATA_STSREG_ERR)) == ATA_STSREG_ERR) {\r
-      ErrorRegister = IdeReadPortB (PciIo, IdeRegisters->ErrOrFeature);\r
+        if ((ErrorRegister & ATA_ERRREG_ABRT) == ATA_ERRREG_ABRT) {\r
+          return EFI_ABORTED;\r
+        }\r
+        return EFI_DEVICE_ERROR;\r
+      }\r
 \r
-      if ((ErrorRegister & ATA_ERRREG_ABRT) == ATA_ERRREG_ABRT) {\r
-        return EFI_ABORTED;\r
+      if ((AltRegister & ATA_STSREG_DRDY) == ATA_STSREG_DRDY) {\r
+        return EFI_SUCCESS;\r
+      } else {\r
+        return EFI_DEVICE_ERROR;\r
       }\r
     }\r
 \r
@@ -715,11 +704,7 @@ DRDYReady2 (
     Delay--;\r
   } while (Delay > 0);\r
 \r
-  if (Delay == 0) {\r
-    return EFI_TIMEOUT;\r
-  }\r
-\r
-  return EFI_SUCCESS;\r
+  return EFI_TIMEOUT;\r
 }\r
 \r
 /**\r
@@ -728,7 +713,7 @@ DRDYReady2 (
 \r
   @param PciIo            A pointer to ATA_ATAPI_PASS_THRU_INSTANCE data structure.\r
   @param IdeRegisters     A pointer to EFI_IDE_REGISTERS data structure.\r
-  @param Timeout          The time to complete the command.\r
+  @param Timeout          The time to complete the command, uses 100ns as a unit.\r
 \r
   @retval EFI_SUCCESS          BSY bit clear within the time out.\r
   @retval EFI_TIMEOUT          BSY bit not clear within the time out.\r
@@ -754,7 +739,7 @@ WaitForBSYClear (
     StatusRegister = IdeReadPortB (PciIo, IdeRegisters->CmdOrStatus);\r
 \r
     if ((StatusRegister & ATA_STSREG_BSY) == 0x00) {\r
-      break;\r
+      return EFI_SUCCESS;\r
     }\r
 \r
     //\r
@@ -766,11 +751,7 @@ WaitForBSYClear (
 \r
   } while (Delay > 0);\r
 \r
-  if (Delay == 0) {\r
-    return EFI_TIMEOUT;\r
-  }\r
-\r
-  return EFI_SUCCESS;\r
+  return EFI_TIMEOUT;\r
 }\r
 \r
 /**\r
@@ -779,7 +760,7 @@ WaitForBSYClear (
 \r
   @param PciIo            A pointer to ATA_ATAPI_PASS_THRU_INSTANCE data structure.\r
   @param IdeRegisters     A pointer to EFI_IDE_REGISTERS data structure.\r
-  @param Timeout          The time to complete the command.\r
+  @param Timeout          The time to complete the command, uses 100ns as a unit.\r
 \r
   @retval EFI_SUCCESS          BSY bit clear within the time out.\r
   @retval EFI_TIMEOUT          BSY bit not clear within the time out.\r
@@ -805,7 +786,7 @@ WaitForBSYClear2 (
     AltStatusRegister = IdeReadPortB (PciIo, IdeRegisters->AltOrDev);\r
 \r
     if ((AltStatusRegister & ATA_STSREG_BSY) == 0x00) {\r
-      break;\r
+      return EFI_SUCCESS;\r
     }\r
 \r
     //\r
@@ -817,11 +798,7 @@ WaitForBSYClear2 (
 \r
   } while (Delay > 0);\r
 \r
-  if (Delay == 0) {\r
-    return EFI_TIMEOUT;\r
-  }\r
-\r
-  return EFI_SUCCESS;\r
+  return EFI_TIMEOUT;\r
 }\r
 \r
 /**\r
@@ -978,7 +955,7 @@ GetIdeRegisterIoAddr (
 \r
   @param PciIo            A pointer to ATA_ATAPI_PASS_THRU_INSTANCE data structure.\r
   @param IdeRegisters     A pointer to EFI_IDE_REGISTERS data structure.\r
-  @param Timeout          The time to complete the command.\r
+  @param Timeout          The time to complete the command, uses 100ns as a unit.\r
 \r
   @retval EFI_SUCCESS       Soft reset completes successfully.\r
   @retval EFI_DEVICE_ERROR  Any step during the reset process is failed.\r
@@ -1038,7 +1015,7 @@ AtaSoftReset (
   @param PciIo            A pointer to ATA_ATAPI_PASS_THRU_INSTANCE data structure.\r
   @param IdeRegisters     A pointer to EFI_IDE_REGISTERS data structure.\r
   @param AtaCommandBlock  A pointer to EFI_ATA_COMMAND_BLOCK data structure.\r
-  @param Timeout          The time to complete the command.\r
+  @param Timeout          The time to complete the command, uses 100ns as a unit.\r
 \r
   @retval  EFI_SUCCESS Reading succeed\r
   @retval  EFI_DEVICE_ERROR Error executing commands on this device.\r
@@ -1134,7 +1111,7 @@ AtaIssueCommand (
                                    from host to device.\r
   @param[in]      AtaCommandBlock  A pointer to EFI_ATA_COMMAND_BLOCK data structure.\r
   @param[in, out] AtaStatusBlock   A pointer to EFI_ATA_STATUS_BLOCK data structure.\r
-  @param[in]      Timeout          The time to complete the command.\r
+  @param[in]      Timeout          The time to complete the command, uses 100ns as a unit.\r
   @param[in]      Task             Optional. Pointer to the ATA_NONBLOCK_TASK\r
                                    used by non-blocking mode.\r
   \r
@@ -1268,7 +1245,7 @@ Exit:
   @param[in]      AtaCommandBlock  A pointer to EFI_ATA_COMMAND_BLOCK data\r
                                    structure.\r
   @param[in, out] AtaStatusBlock   A pointer to EFI_ATA_STATUS_BLOCK data structure.\r
-  @param[in]      Timeout          The time to complete the command.\r
+  @param[in]      Timeout          The time to complete the command, uses 100ns as a unit.\r
   @param[in]      Task             Optional. Pointer to the ATA_NONBLOCK_TASK\r
                                    used by non-blocking mode.\r
 \r
@@ -1334,7 +1311,7 @@ Exit:
   Wait for memory to be set.\r
     \r
   @param[in]  PciIo           The PCI IO protocol instance.\r
-  @param[in]  PortNum         The IDE Port number.\r
+  @param[in]  IdeRegisters    A pointer to EFI_IDE_REGISTERS data structure.\r
 \r
   @retval EFI_DEVICE_ERROR  The memory is not set.\r
   @retval EFI_TIMEOUT       The memory setting is time out.\r
@@ -1344,18 +1321,25 @@ Exit:
 EFI_STATUS\r
 AtaUdmStatusWait (\r
   IN     EFI_PCI_IO_PROTOCOL       *PciIo,\r
-  IN     UINT16                    PortNum\r
+  IN     EFI_IDE_REGISTERS         *IdeRegisters\r
  ) \r
 {\r
   UINT8                         RegisterValue;\r
   EFI_STATUS                    Status;\r
+  UINT16                        IoPortForBmis;\r
   UINT64                        Timeout;\r
 \r
   Timeout = 2000;\r
 \r
   while (TRUE) {\r
-    RegisterValue  = IdeReadPortB (PciIo, PortNum);\r
+    Status = CheckStatusRegister (PciIo, IdeRegisters);\r
+    if (EFI_ERROR (Status)) {\r
+      Status = EFI_DEVICE_ERROR;\r
+      break;\r
+    }\r
 \r
+    IoPortForBmis = (UINT16) (IdeRegisters->BusMasterBaseAddr + BMIS_OFFSET);\r
+    RegisterValue = IdeReadPortB (PciIo, IoPortForBmis);\r
     if (((RegisterValue & BMIS_ERROR) != 0) || (Timeout == 0)) {\r
       DEBUG ((EFI_D_ERROR, "ATA UDMA operation fails\n"));\r
       Status = EFI_DEVICE_ERROR;\r
@@ -1382,7 +1366,7 @@ AtaUdmStatusWait (
   @param[in]  PciIo           The PCI IO protocol instance.\r
   @param[in]  Task            Optional. Pointer to the ATA_NONBLOCK_TASK\r
                               used by non-blocking mode.\r
-  @param[in]  PortForBit      The bit to be checked.\r
+  @param[in]  IdeRegisters    A pointer to EFI_IDE_REGISTERS data structure.\r
 \r
   @retval EFI_DEVICE_ERROR  The memory setting met a issue.\r
   @retval EFI_NOT_READY     The memory is not set.\r
@@ -1394,13 +1378,22 @@ EFI_STATUS
 AtaUdmStatusCheck (\r
   IN     EFI_PCI_IO_PROTOCOL        *PciIo,\r
   IN     ATA_NONBLOCK_TASK          *Task,\r
-  IN     UINT16                     PortForBit\r
+  IN     EFI_IDE_REGISTERS          *IdeRegisters\r
  )\r
 {\r
-  UINT8                         RegisterValue;\r
+  UINT8          RegisterValue;\r
+  UINT16         IoPortForBmis;\r
+  EFI_STATUS     Status;\r
 \r
   Task->RetryTimes--;\r
-  RegisterValue  = IdeReadPortB(PciIo, PortForBit);\r
+\r
+  Status = CheckStatusRegister (PciIo, IdeRegisters);\r
+  if (EFI_ERROR (Status)) {\r
+    return EFI_DEVICE_ERROR;\r
+  }\r
+\r
+  IoPortForBmis = (UINT16) (IdeRegisters->BusMasterBaseAddr + BMIS_OFFSET);\r
+  RegisterValue = IdeReadPortB (PciIo, IoPortForBmis);\r
 \r
   if ((RegisterValue & BMIS_ERROR) != 0) {\r
     DEBUG ((EFI_D_ERROR, "ATA UDMA operation fails\n"));\r
@@ -1435,7 +1428,7 @@ AtaUdmStatusCheck (
   @param[in]      DataLength       The length of  the data.\r
   @param[in]      AtaCommandBlock  A pointer to EFI_ATA_COMMAND_BLOCK data structure.\r
   @param[in, out] AtaStatusBlock   A pointer to EFI_ATA_STATUS_BLOCK data structure.\r
-  @param[in]      Timeout          The time to complete the command.\r
+  @param[in]      Timeout          The time to complete the command, uses 100ns as a unit.\r
   @param[in]      Task             Optional. Pointer to the ATA_NONBLOCK_TASK\r
                                    used by non-blocking mode.\r
 \r
@@ -1482,7 +1475,6 @@ AtaUdmaInOut (
   EFI_PCI_IO_PROTOCOL_OPERATION PciIoOperation;\r
 \r
   UINT8                         DeviceHead;\r
-  UINT8                         AtaCommand;\r
   EFI_PCI_IO_PROTOCOL           *PciIo;\r
   EFI_TPL                       OldTpl;\r
 \r
@@ -1639,7 +1631,6 @@ AtaUdmaInOut (
     // Start to enable the DMA operation\r
     //\r
     DeviceHead = AtaCommandBlock->AtaDeviceHead;\r
-    AtaCommand = AtaCommandBlock->AtaCommand;\r
 \r
     IdeWritePortB (PciIo, IdeRegisters->Head, (UINT8)(0xe0 | DeviceHead));\r
 \r
@@ -1654,7 +1645,7 @@ AtaUdmaInOut (
     //\r
     RegisterValue  = IdeReadPortB(PciIo, IoPortForBmis);\r
     RegisterValue |= (BMIS_INTERRUPT | BMIS_ERROR);\r
-    IdeWritePortB(PciIo, IoPortForBmis, RegisterValue);\r
+    IdeWritePortB (PciIo, IoPortForBmis, RegisterValue);\r
 \r
     //\r
     // Set the base address to BMID register\r
@@ -1682,6 +1673,11 @@ AtaUdmaInOut (
       goto Exit;\r
     }\r
 \r
+    Status = CheckStatusRegister (PciIo, IdeRegisters);\r
+    if (EFI_ERROR (Status)) {\r
+      Status = EFI_DEVICE_ERROR;\r
+      goto Exit;\r
+    }\r
     //\r
     // Set START bit of BMIC register\r
     //\r
@@ -1711,9 +1707,9 @@ AtaUdmaInOut (
   // So set the variable Count to 2000, for about 2 second Timeout time.\r
   //\r
   if (Task != NULL) {\r
-    Status = AtaUdmStatusCheck (PciIo, Task, IoPortForBmis);\r
+    Status = AtaUdmStatusCheck (PciIo, Task, IdeRegisters);\r
   } else {\r
-    Status = AtaUdmStatusWait (PciIo, IoPortForBmis);\r
+    Status = AtaUdmStatusWait (PciIo, IdeRegisters);\r
   }\r
 \r
   //\r
@@ -1831,7 +1827,8 @@ AtaPacketReadPendingData (
   @param Read          Flag used to determine the data transfer direction.\r
                        Read equals 1, means data transferred from device to host;\r
                        Read equals 0, means data transferred from host to device.\r
-  @param Timeout       Timeout value for wait DRQ ready before each data stream's transfer.\r
+  @param Timeout       Timeout value for wait DRQ ready before each data stream's transfer\r
+                       , uses 100ns as a unit.\r
 \r
   @retval EFI_SUCCESS      data is transferred successfully.\r
   @retval EFI_DEVICE_ERROR the device failed to transfer data.\r
@@ -1935,7 +1932,7 @@ AtaPacketReadWrite (
   //\r
   // After data transfer is completed, normally, DRQ bit should clear.\r
   //\r
-  Status = DRQClear2 (PciIo, IdeRegisters, Timeout);\r
+  Status = DRQClear (PciIo, IdeRegisters, Timeout);\r
   if (EFI_ERROR (Status)) {\r
     return EFI_DEVICE_ERROR;\r
   }\r
@@ -1953,7 +1950,7 @@ AtaPacketReadWrite (
   @param[in] Device          The device number of device.\r
   @param[in] SenseData       A pointer to store sense data.\r
   @param[in] SenseDataLength The sense data length.\r
-  @param[in] Timeout         The timeout value to execute this cmd.\r
+  @param[in] Timeout         The timeout value to execute this cmd, uses 100ns as a unit.\r
 \r
   @retval EFI_SUCCESS        Send out the ATAPI packet command successfully.\r
   @retval EFI_DEVICE_ERROR   The device failed to send data.\r
@@ -2209,7 +2206,6 @@ SetDriveParameters (
   IN     UINT8                         Device,\r
   IN     EFI_ATA_DRIVE_PARMS           *DriveParameters,\r
   IN OUT EFI_ATA_STATUS_BLOCK          *AtaStatusBlock\r
-  \r
   )\r
 {\r
   EFI_STATUS              Status;\r
@@ -2797,7 +2793,6 @@ IdeModeInitialization (
   IN  ATA_ATAPI_PASS_THRU_INSTANCE    *Instance\r
   )\r
 {\r
-  BOOLEAN                           EnumAll;\r
   EFI_STATUS                        Status;\r
   EFI_IDE_CONTROLLER_INIT_PROTOCOL  *IdeInit;\r
   EFI_PCI_IO_PROTOCOL               *PciIo;\r
@@ -2808,7 +2803,6 @@ IdeModeInitialization (
 \r
   IdeInit = Instance->IdeControllerInit;\r
   PciIo   = Instance->PciIo;\r
-  EnumAll = IdeInit->EnumAll;\r
   Channel = IdeInit->ChannelCount;\r
 \r
   //\r