MdeModulePkg/ScsiDisk: Using back-off algorithm to dynamically adjust transfer length...

[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 b9d16140b80f3bff0fcfddc12f233a8b9860da6d..5f362d1e1513357e5ec10133e36ef8e8f58e40b4 100644 (file)
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c
@@ -1,7 +1,7 @@
 /** @file\r
   Header file for AHCI mode of ATA host controller.\r
 \r
-  Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -1941,56 +1941,6 @@ AtaPacketReadWrite (
   return Status;\r
 }\r
 \r
-/**\r
-  Sumbit ATAPI request sense command.\r
-\r
-  @param[in] PciIo           Pointer to the EFI_PCI_IO_PROTOCOL instance\r
-  @param[in] IdeRegisters    Pointer to EFI_IDE_REGISTERS which is used to\r
-                             store the IDE i/o port registers' base addresses\r
-  @param[in] Channel         The channel number of device.\r
-  @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, 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
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-AtaPacketRequestSense (\r
-  IN  EFI_PCI_IO_PROTOCOL               *PciIo,\r
-  IN  EFI_IDE_REGISTERS                 *IdeRegisters,\r
-  IN  UINT8                             Channel,\r
-  IN  UINT8                             Device,\r
-  IN  VOID                              *SenseData,\r
-  IN  UINT8                             SenseDataLength,\r
-  IN  UINT64                            Timeout\r
-  )\r
-{\r
-  EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  Packet;\r
-  UINT8                                       Cdb[12];\r
-  EFI_STATUS                                  Status;\r
-\r
-  ZeroMem (&Packet, sizeof (EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET));\r
-  ZeroMem (Cdb, 12);\r
-\r
-  Cdb[0] = ATA_CMD_REQUEST_SENSE;\r
-  Cdb[4] = SenseDataLength;\r
-\r
-  Packet.Timeout          = Timeout;\r
-  Packet.Cdb              = Cdb;\r
-  Packet.CdbLength        = 12;\r
-  Packet.DataDirection    = EFI_EXT_SCSI_DATA_DIRECTION_READ;\r
-  Packet.InDataBuffer     = SenseData;\r
-  Packet.InTransferLength = SenseDataLength;\r
-\r
-  Status = AtaPacketCommandExecute (PciIo, IdeRegisters, Channel, Device, &Packet);\r
-\r
-  return Status;\r
-}\r
-\r
 /**\r
   This function is used to send out ATAPI commands conforms to the Packet Command\r
   with PIO Data In Protocol.\r
@@ -2017,7 +1967,6 @@ AtaPacketCommandExecute (
   IN  EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET    *Packet\r
   )\r
 {\r
-  EFI_STATUS                  PacketCommandStatus;\r
   EFI_ATA_COMMAND_BLOCK       AtaCommandBlock;\r
   EFI_STATUS                  Status;\r
   UINT8                       Count;\r
@@ -2083,56 +2032,26 @@ AtaPacketCommandExecute (
   // Read/Write the data of ATAPI Command\r
   //\r
   if (Packet->DataDirection == EFI_EXT_SCSI_DATA_DIRECTION_READ) {\r
-    PacketCommandStatus = AtaPacketReadWrite (\r
-                            PciIo,\r
-                            IdeRegisters,\r
-                            Packet->InDataBuffer,\r
-                            Packet->InTransferLength,\r
-                            TRUE,\r
-                            Packet->Timeout\r
-                            );\r
+    Status = AtaPacketReadWrite (\r
+               PciIo,\r
+               IdeRegisters,\r
+               Packet->InDataBuffer,\r
+               Packet->InTransferLength,\r
+               TRUE,\r
+               Packet->Timeout\r
+               );\r
   } else {\r
-    PacketCommandStatus = AtaPacketReadWrite (\r
-                            PciIo,\r
-                            IdeRegisters,\r
-                            Packet->OutDataBuffer,\r
-                            Packet->OutTransferLength,\r
-                            FALSE,\r
-                            Packet->Timeout\r
-                            );\r
-  }\r
-\r
-  if (!EFI_ERROR (PacketCommandStatus)) {\r
-    return PacketCommandStatus;\r
+    Status = AtaPacketReadWrite (\r
+               PciIo,\r
+               IdeRegisters,\r
+               Packet->OutDataBuffer,\r
+               Packet->OutTransferLength,\r
+               FALSE,\r
+               Packet->Timeout\r
+               );\r
   }\r
 \r
-  //\r
-  // Return SenseData if PacketCommandStatus matches\r
-  // the following return codes.\r
-  //\r
-  if ((PacketCommandStatus == EFI_BAD_BUFFER_SIZE) ||\r
-      (PacketCommandStatus == EFI_DEVICE_ERROR) ||\r
-      (PacketCommandStatus == EFI_TIMEOUT)) {\r
-\r
-    //\r
-    // avoid submit request sense command continuously.\r
-    //\r
-    if ((Packet->SenseData == NULL) || (((UINT8 *)Packet->Cdb)[0] == ATA_CMD_REQUEST_SENSE)) {\r
-      return PacketCommandStatus;\r
-    }\r
-\r
-    AtaPacketRequestSense (\r
-      PciIo,\r
-      IdeRegisters,\r
-      Channel,\r
-      Device,\r
-      Packet->SenseData,\r
-      Packet->SenseDataLength,\r
-      Packet->Timeout\r
-      );\r
-  }\r
-\r
-  return PacketCommandStatus;\r
+  return Status;\r
 }\r
 \r
 \r