]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdePkg/Library/UefiScsiLib/UefiScsiLib.c
MdePkg UefiScsiLib: Add non-blocking support for SCSI Read/Write command
[mirror_edk2.git] / MdePkg / Library / UefiScsiLib / UefiScsiLib.c
index ff4d8da507813ab88fbe6f5624161af953815e4b..d8babcee406a6232a3ee6e10c3119c51d047591d 100644 (file)
@@ -1,7 +1,7 @@
 /** @file\r
   UEFI SCSI Library implementation\r
 \r
-  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2015, 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
 #include <Library/DebugLib.h>\r
 #include <Library/UefiScsiLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
+#include <Library/MemoryAllocationLib.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r
   \r
 #include <IndustryStandard/Scsi.h>\r
   \r
   \r
-  //\r
-  // Max bytes needed to represent ID of a SCSI device\r
-  //\r
-#define EFI_SCSI_TARGET_MAX_BYTES (0x10)\r
-  \r
-  //\r
-  // bit5..7 are for Logical unit number\r
-  // 11100000b (0xe0)\r
-  //\r
-#define EFI_SCSI_LOGICAL_UNIT_NUMBER_MASK 0xe0\r
-  \r
   //\r
   // Scsi Command Length\r
   //\r
 #define EFI_SCSI_OP_LENGTH_TEN      0xa\r
 #define EFI_SCSI_OP_LENGTH_SIXTEEN  0x10\r
 \r
+//\r
+// The context structure used when non-blocking SCSI read/write operation\r
+// completes.\r
+//\r
+typedef struct {\r
+  ///\r
+  /// The SCSI request packet to send to the SCSI controller specified by\r
+  /// the device handle.\r
+  ///\r
+  EFI_SCSI_IO_SCSI_REQUEST_PACKET      CommandPacket;\r
+  ///\r
+  /// The length of the output sense data.\r
+  ///\r
+  UINT8                                *SenseDataLength;\r
+  ///\r
+  /// The status of the SCSI host adapter.\r
+  ///\r
+  UINT8                                *HostAdapterStatus;\r
+  ///\r
+  /// The status of the target SCSI device.\r
+  ///\r
+  UINT8                                *TargetStatus;\r
+  ///\r
+  /// The length of the data buffer for the SCSI read/write command.\r
+  ///\r
+  UINT32                               *DataLength;\r
+  ///\r
+  /// The caller event to be signaled when the SCSI read/write command\r
+  /// completes.\r
+  ///\r
+  EFI_EVENT                            CallerEvent;\r
+} EFI_SCSI_LIB_ASYNC_CONTEXT;\r
+\r
 \r
 \r
 /**\r
@@ -53,6 +77,9 @@
   If HostAdapterStatus is NULL, then ASSERT().\r
   If TargetStatus is NULL, then ASSERT().\r
 \r
+  If SenseDataLength is non-zero and SenseData is not NULL, SenseData must meet buffer\r
+  alignment requirement defined in EFI_SCSI_IO_PROTOCOL. Otherwise EFI_INVALID_PARAMETER\r
+  gets returned.\r
 \r
   @param[in]     ScsiIo             A pointer to the SCSI I/O Protocol instance\r
                                     for the specific SCSI target.\r
                                     Protocol in the UEFI Specification for details on\r
                                     the possible return values. \r
 \r
-  @retval EFI_SUCCESS          The command was executed successfully.\r
-                               See HostAdapterStatus, TargetStatus, SenseDataLength,\r
-                               and SenseData in that order for additional status\r
-                               information.\r
-  @retval EFI_NOT_READY        The SCSI Request Packet could not be sent because\r
-                               there are too many SCSI Command Packets already\r
-                               queued. The SCSI Request Packet was not sent, so\r
-                               no additional status information is available.\r
-                               The caller may retry again later.\r
-  @retval EFI_DEVICE_ERROR     A device error occurred while attempting to send\r
-                               SCSI Request Packet.  See HostAdapterStatus,\r
-                               TargetStatus, SenseDataLength, and SenseData in that\r
-                               order for additional status information.\r
-  @retval EFI_UNSUPPORTED      The command described by the SCSI Request Packet\r
-                               is not supported by the SCSI initiator(i.e., SCSI\r
-                               Host Controller). The SCSI Request Packet was not\r
-                               sent, so no additional status information is available.\r
-  @retval EFI_TIMEOUT          A timeout occurred while waiting for the SCSI Request\r
-                               Packet to execute.  See HostAdapterStatus, TargetStatus,\r
-                               SenseDataLength, and SenseData in that order for\r
-                               additional status information.\r
+  @retval EFI_SUCCESS               The command was executed successfully.\r
+                                    See HostAdapterStatus, TargetStatus, SenseDataLength,\r
+                                    and SenseData in that order for additional status\r
+                                    information.\r
+  @retval EFI_NOT_READY             The SCSI Request Packet could not be sent because\r
+                                    there are too many SCSI Command Packets already\r
+                                    queued. The SCSI Request Packet was not sent, so\r
+                                    no additional status information is available.\r
+                                    The caller may retry again later.\r
+  @retval EFI_DEVICE_ERROR          A device error occurred while attempting to send\r
+                                    SCSI Request Packet.  See HostAdapterStatus,\r
+                                    TargetStatus, SenseDataLength, and SenseData in that\r
+                                    order for additional status information.\r
+  @retval EFI_UNSUPPORTED           The command described by the SCSI Request Packet\r
+                                    is not supported by the SCSI initiator(i.e., SCSI\r
+                                    Host Controller). The SCSI Request Packet was not\r
+                                    sent, so no additional status information is available.\r
+  @retval EFI_TIMEOUT               A timeout occurred while waiting for the SCSI Request\r
+                                    Packet to execute.  See HostAdapterStatus, TargetStatus,\r
+                                    SenseDataLength, and SenseData in that order for\r
+                                    additional status information.\r
+  @retval EFI_INVALID_PARAMETER     The contents of the SCSI Request Packet are invalid.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -117,9 +145,6 @@ ScsiTestUnitReadyCommand (
   )\r
 {\r
   EFI_SCSI_IO_SCSI_REQUEST_PACKET CommandPacket;\r
-  UINT64                          Lun;\r
-  UINT8                           *Target;\r
-  UINT8                           TargetArray[EFI_SCSI_TARGET_MAX_BYTES];\r
   EFI_STATUS                      Status;\r
   UINT8                           Cdb[EFI_SCSI_OP_LENGTH_SIX];\r
 \r
@@ -141,11 +166,7 @@ ScsiTestUnitReadyCommand (
   //\r
   // Fill Cdb for Test Unit Ready Command\r
   //\r
-  Target = &TargetArray[0];\r
-  ScsiIo->GetDeviceLocation (ScsiIo, &Target, &Lun);\r
-\r
   Cdb[0]                        = EFI_SCSI_OP_TEST_UNIT_READY;\r
-  Cdb[1]                        = (UINT8) (LShiftU64 (Lun, 5) & EFI_SCSI_LOGICAL_UNIT_NUMBER_MASK);\r
   CommandPacket.CdbLength       = (UINT8) EFI_SCSI_OP_LENGTH_SIX;\r
   CommandPacket.SenseDataLength = *SenseDataLength;\r
 \r
@@ -171,6 +192,14 @@ ScsiTestUnitReadyCommand (
   If TargetStatus is NULL, then ASSERT().\r
   If InquiryDataLength is NULL, then ASSERT().\r
 \r
+  If SenseDataLength is non-zero and SenseData is not NULL, SenseData must meet buffer\r
+  alignment requirement defined in EFI_SCSI_IO_PROTOCOL. Otherwise EFI_INVALID_PARAMETER\r
+  gets returned.\r
+\r
+  If InquiryDataLength is non-zero and InquiryDataBuffer is not NULL, InquiryDataBuffer\r
+  must meet buffer alignment requirement defined in EFI_SCSI_IO_PROTOCOL. Otherwise\r
+  EFI_INVALID_PARAMETER gets returned.\r
+\r
   @param[in]      ScsiIo                 A pointer to the SCSI I/O Protocol instance\r
                                          for the specific SCSI target.\r
   @param[in]      Timeout                The timeout in 100 ns units to use for the\r
@@ -215,28 +244,29 @@ ScsiTestUnitReadyCommand (
   @param[in]      PageCode               The page code of the vital product data.\r
                                          It's ignored if EnableVitalProductData is FALSE.\r
 \r
-  @retval EFI_SUCCESS          The command executed successfully. See HostAdapterStatus,\r
-                               TargetStatus, SenseDataLength, and SenseData in that order\r
-                               for additional status information.\r
-  @retval EFI_BAD_BUFFER_SIZE  The SCSI Request Packet was executed, but the entire\r
-                               InquiryDataBuffer could not be transferred. The actual\r
-                               number of bytes transferred is returned in InquiryDataLength.\r
-  @retval EFI_NOT_READY        The SCSI Request Packet could not be sent because there\r
-                               are too many SCSI Command Packets already queued.\r
-                               The SCSI Request Packet was not sent, so no additional\r
-                               status information is available. The caller may retry again later.\r
-  @retval EFI_DEVICE_ERROR     A device error occurred while attempting to send SCSI\r
-                               Request Packet.  See HostAdapterStatus, TargetStatus,\r
-                               SenseDataLength, and SenseData in that order for additional\r
-                               status information.\r
-  @retval EFI_UNSUPPORTED      The command described by the SCSI Request Packet is not\r
-                               supported by the SCSI initiator(i.e., SCSI  Host Controller).\r
-                               The SCSI Request Packet was not sent, so no additional\r
-                               status information is available.\r
-  @retval EFI_TIMEOUT          A timeout occurred while waiting for the SCSI Request\r
-                               Packet to execute.  See HostAdapterStatus, TargetStatus,\r
-                               SenseDataLength, and SenseData in that order for\r
-                               additional status information.\r
+  @retval EFI_SUCCESS                    The command executed successfully. See HostAdapterStatus,\r
+                                         TargetStatus, SenseDataLength, and SenseData in that order\r
+                                         for additional status information.\r
+  @retval EFI_BAD_BUFFER_SIZE            The SCSI Request Packet was executed, but the entire\r
+                                         InquiryDataBuffer could not be transferred. The actual\r
+                                         number of bytes transferred is returned in InquiryDataLength.\r
+  @retval EFI_NOT_READY                  The SCSI Request Packet could not be sent because there\r
+                                         are too many SCSI Command Packets already queued.\r
+                                         The SCSI Request Packet was not sent, so no additional\r
+                                         status information is available. The caller may retry again later.\r
+  @retval EFI_DEVICE_ERROR               A device error occurred while attempting to send SCSI\r
+                                         Request Packet.  See HostAdapterStatus, TargetStatus,\r
+                                         SenseDataLength, and SenseData in that order for additional\r
+                                         status information.\r
+  @retval EFI_UNSUPPORTED                The command described by the SCSI Request Packet is not\r
+                                         supported by the SCSI initiator(i.e., SCSI  Host Controller).\r
+                                         The SCSI Request Packet was not sent, so no additional\r
+                                         status information is available.\r
+  @retval EFI_TIMEOUT                    A timeout occurred while waiting for the SCSI Request\r
+                                         Packet to execute.  See HostAdapterStatus, TargetStatus,\r
+                                         SenseDataLength, and SenseData in that order for\r
+                                         additional status information.\r
+  @retval EFI_INVALID_PARAMETER          The contents of the SCSI Request Packet are invalid.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -255,9 +285,6 @@ ScsiInquiryCommandEx (
   )\r
 {\r
   EFI_SCSI_IO_SCSI_REQUEST_PACKET CommandPacket;\r
-  UINT64                          Lun;\r
-  UINT8                           *Target;\r
-  UINT8                           TargetArray[EFI_SCSI_TARGET_MAX_BYTES];\r
   EFI_STATUS                      Status;\r
   UINT8                           Cdb[EFI_SCSI_OP_LENGTH_SIX];\r
 \r
@@ -277,11 +304,7 @@ ScsiInquiryCommandEx (
   CommandPacket.SenseDataLength = *SenseDataLength;\r
   CommandPacket.Cdb             = Cdb;\r
 \r
-  Target = &TargetArray[0];\r
-  ScsiIo->GetDeviceLocation (ScsiIo, &Target, &Lun);\r
-\r
   Cdb[0]  = EFI_SCSI_OP_INQUIRY;\r
-  Cdb[1]  = (UINT8) (LShiftU64 (Lun, 5) & EFI_SCSI_LOGICAL_UNIT_NUMBER_MASK);\r
   if (EnableVitalProductData) {\r
     Cdb[1] |= 0x01;\r
     Cdb[2]  = PageCode;\r
@@ -318,6 +341,14 @@ ScsiInquiryCommandEx (
   If TargetStatus is NULL, then ASSERT().\r
   If InquiryDataLength is NULL, then ASSERT().\r
 \r
+  If SenseDataLength is non-zero and SenseData is not NULL, SenseData must meet buffer\r
+  alignment requirement defined in EFI_SCSI_IO_PROTOCOL. Otherwise EFI_INVALID_PARAMETER\r
+  gets returned.\r
+\r
+  If InquiryDataLength is non-zero and InquiryDataBuffer is not NULL, InquiryDataBuffer\r
+  must meet buffer alignment requirement defined in EFI_SCSI_IO_PROTOCOL. Otherwise\r
+  EFI_INVALID_PARAMETER gets returned.\r
+\r
   @param[in]      ScsiIo                 A pointer to the SCSI I/O Protocol instance\r
                                          for the specific SCSI target.\r
   @param[in]      Timeout                The timeout in 100 ns units to use for the\r
@@ -360,28 +391,29 @@ ScsiInquiryCommandEx (
                                          If FALSE, then the standard inquiry data is\r
                                          returned in InquiryDataBuffer. \r
 \r
-  @retval EFI_SUCCESS          The command executed successfully. See HostAdapterStatus,\r
-                               TargetStatus, SenseDataLength, and SenseData in that order\r
-                               for additional status information.\r
-  @retval EFI_BAD_BUFFER_SIZE  The SCSI Request Packet was executed, but the entire\r
-                               InquiryDataBuffer could not be transferred. The actual\r
-                               number of bytes transferred is returned in InquiryDataLength.\r
-  @retval EFI_NOT_READY        The SCSI Request Packet could not be sent because there\r
-                               are too many SCSI Command Packets already queued.\r
-                               The SCSI Request Packet was not sent, so no additional\r
-                               status information is available. The caller may retry again later.\r
-  @retval EFI_DEVICE_ERROR     A device error occurred while attempting to send SCSI\r
-                               Request Packet.  See HostAdapterStatus, TargetStatus,\r
-                               SenseDataLength, and SenseData in that order for additional\r
-                               status information.\r
-  @retval EFI_UNSUPPORTED      The command described by the SCSI Request Packet is not\r
-                               supported by the SCSI initiator(i.e., SCSI  Host Controller).\r
-                               The SCSI Request Packet was not sent, so no additional\r
-                               status information is available.\r
-  @retval EFI_TIMEOUT          A timeout occurred while waiting for the SCSI Request\r
-                               Packet to execute.  See HostAdapterStatus, TargetStatus,\r
-                               SenseDataLength, and SenseData in that order for\r
-                               additional status information.\r
+  @retval EFI_SUCCESS                    The command was executed successfully. See HostAdapterStatus,\r
+                                         TargetStatus, SenseDataLength, and SenseData in that order\r
+                                         for additional status information.\r
+  @retval EFI_BAD_BUFFER_SIZE            The SCSI Request Packet was executed, but the entire\r
+                                         InquiryDataBuffer could not be transferred. The actual\r
+                                         number of bytes transferred is returned in InquiryDataLength.\r
+  @retval EFI_NOT_READY                  The SCSI Request Packet could not be sent because there\r
+                                         are too many SCSI Command Packets already queued.\r
+                                         The SCSI Request Packet was not sent, so no additional\r
+                                         status information is available. The caller may retry again later.\r
+  @retval EFI_DEVICE_ERROR               A device error occurred while attempting to send SCSI\r
+                                         Request Packet.  See HostAdapterStatus, TargetStatus,\r
+                                         SenseDataLength, and SenseData in that order for additional\r
+                                         status information.\r
+  @retval EFI_UNSUPPORTED                The command described by the SCSI Request Packet is not\r
+                                         supported by the SCSI initiator(i.e., SCSI  Host Controller).\r
+                                         The SCSI Request Packet was not sent, so no additional\r
+                                         status information is available.\r
+  @retval EFI_TIMEOUT                    A timeout occurred while waiting for the SCSI Request\r
+                                         Packet to execute.  See HostAdapterStatus, TargetStatus,\r
+                                         SenseDataLength, and SenseData in that order for\r
+                                         additional status information.\r
+  @retval EFI_INVALID_PARAMETER          The contents of the SCSI Request Packet are invalid.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -426,6 +458,13 @@ ScsiInquiryCommand (
   If TargetStatus is NULL, then ASSERT().\r
   If DataLength is NULL, then ASSERT().\r
 \r
+  If SenseDataLength is non-zero and SenseData is not NULL, SenseData must meet buffer\r
+  alignment requirement defined in EFI_SCSI_IO_PROTOCOL. Otherwise EFI_INVALID_PARAMETER\r
+  gets returned.\r
+\r
+  If DataLength is non-zero and DataBuffer is not NULL, DataBuffer must meet buffer\r
+  alignment requirement defined in EFI_SCSI_IO_PROTOCOL. Otherwise EFI_INVALID_PARAMETER\r
+  gets returned.\r
 \r
   @param[in]      ScsiIo             A pointer to the SCSI I/O Protocol instance\r
                                      for the specific SCSI target.\r
@@ -467,30 +506,31 @@ ScsiInquiryCommand (
   @param[in]      PageControl        Specifies the PC field of the CDB for this SCSI Command. \r
   @param[in]      PageCode           Specifies the Page Control field of the CDB for this SCSI Command. \r
 \r
-  @retval EFI_SUCCESS               The command executed successfully.\r
-                                    See HostAdapterStatus, TargetStatus, SenseDataLength,\r
-                                    and SenseData in that order for additional status information.\r
-  @retval EFI_BAD_BUFFER_SIZE       The SCSI Request Packet was executed, but the\r
-                                    entire DataBuffer could not be transferred.\r
-                                    The actual number of bytes transferred is returned\r
-                                    in DataLength.\r
-  @retval EFI_NOT_READY             The SCSI Request Packet could not be sent because\r
-                                    there are too many SCSI Command Packets already queued.\r
-                                    The SCSI Request Packet was not sent, so no additional\r
-                                    status information is available.  The caller may retry\r
-                                    again later.\r
-  @retval EFI_DEVICE_ERROR          A device error occurred while attempting to send\r
-                                    SCSI Request Packet.  See HostAdapterStatus, TargetStatus,\r
-                                    SenseDataLength, and SenseData in that order for\r
-                                    additional status information.\r
-  @retval EFI_UNSUPPORTED           The command described by the SCSI Request Packet\r
-                                    is not supported by the SCSI initiator(i.e., SCSI\r
-                                    Host Controller). The SCSI Request Packet was not\r
-                                    sent, so no additional status information is available.\r
-  @retval EFI_TIMEOUT               A timeout occurred while waiting for the SCSI\r
-                                    Request Packet to execute.  See HostAdapterStatus,\r
-                                    TargetStatus, SenseDataLength, and SenseData in that\r
-                                    order for additional status information.\r
+  @retval EFI_SUCCESS                The command was executed successfully.\r
+                                     See HostAdapterStatus, TargetStatus, SenseDataLength,\r
+                                     and SenseData in that order for additional status information.\r
+  @retval EFI_BAD_BUFFER_SIZE        The SCSI Request Packet was executed, but the\r
+                                     entire DataBuffer could not be transferred.\r
+                                     The actual number of bytes transferred is returned\r
+                                     in DataLength.\r
+  @retval EFI_NOT_READY              The SCSI Request Packet could not be sent because\r
+                                     there are too many SCSI Command Packets already queued.\r
+                                     The SCSI Request Packet was not sent, so no additional\r
+                                     status information is available.  The caller may retry\r
+                                     again later.\r
+  @retval EFI_DEVICE_ERROR           A device error occurred while attempting to send\r
+                                     SCSI Request Packet.  See HostAdapterStatus, TargetStatus,\r
+                                     SenseDataLength, and SenseData in that order for\r
+                                     additional status information.\r
+  @retval EFI_UNSUPPORTED            The command described by the SCSI Request Packet\r
+                                     is not supported by the SCSI initiator(i.e., SCSI\r
+                                     Host Controller). The SCSI Request Packet was not\r
+                                     sent, so no additional status information is available.\r
+  @retval EFI_TIMEOUT                A timeout occurred while waiting for the SCSI\r
+                                     Request Packet to execute.  See HostAdapterStatus,\r
+                                     TargetStatus, SenseDataLength, and SenseData in that\r
+                                     order for additional status information.\r
+  @retval EFI_INVALID_PARAMETER      The contents of the SCSI Request Packet are invalid.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -510,9 +550,6 @@ ScsiModeSense10Command (
   )\r
 {\r
   EFI_SCSI_IO_SCSI_REQUEST_PACKET CommandPacket;\r
-  UINT64                          Lun;\r
-  UINT8                           *Target;\r
-  UINT8                           TargetArray[EFI_SCSI_TARGET_MAX_BYTES];\r
   EFI_STATUS                      Status;\r
   UINT8                           Cdb[EFI_SCSI_OP_LENGTH_TEN];\r
 \r
@@ -533,14 +570,11 @@ ScsiModeSense10Command (
   //\r
   // Fill Cdb for Mode Sense (10) Command\r
   //\r
-  Target = &TargetArray[0];\r
-  ScsiIo->GetDeviceLocation (ScsiIo, &Target, &Lun);\r
-\r
   Cdb[0]                        = EFI_SCSI_OP_MODE_SEN10;\r
   //\r
   // DBDField is in Cdb[1] bit3 of (bit7..0)\r
   //\r
-  Cdb[1]                        = (UINT8) ((LShiftU64 (Lun, 5) & EFI_SCSI_LOGICAL_UNIT_NUMBER_MASK) + ((DBDField << 3) & 0x08));\r
+  Cdb[1]                        = (UINT8) ((DBDField << 3) & 0x08);\r
   //\r
   // PageControl is in Cdb[2] bit7..6, PageCode is in Cdb[2] bit5..0\r
   //\r
@@ -574,6 +608,10 @@ ScsiModeSense10Command (
   If HostAdapterStatus is NULL, then ASSERT().\r
   If TargetStatus is NULL, then ASSERT().\r
 \r
+  If SenseDataLength is non-zero and SenseData is not NULL, SenseData must meet buffer\r
+  alignment requirement defined in EFI_SCSI_IO_PROTOCOL. Otherwise EFI_INVALID_PARAMETER\r
+  gets returned.\r
+\r
   @param[in]       ScsiIo               A pointer to SCSI IO protocol.\r
   @param[in]       Timeout              The length of timeout period.\r
   @param[in, out]  SenseData            A pointer to output sense data.\r
@@ -581,13 +619,14 @@ ScsiModeSense10Command (
   @param[out]      HostAdapterStatus    The status of Host Adapter.\r
   @param[out]      TargetStatus         The status of the target.\r
 \r
-  @retval EFI_SUCCESS                   The command executed successfully.\r
+  @retval EFI_SUCCESS                   Command is executed successfully.\r
   @retval EFI_NOT_READY                 The SCSI Request Packet could not be sent because there are\r
                                         too many SCSI Command Packets already queued.\r
   @retval EFI_DEVICE_ERROR              A device error occurred while attempting to send SCSI Request Packet.\r
   @retval EFI_UNSUPPORTED               The command described by the SCSI Request Packet is not supported by\r
                                         the SCSI initiator(i.e., SCSI  Host Controller)\r
   @retval EFI_TIMEOUT                   A timeout occurred while waiting for the SCSI Request Packet to execute.\r
+  @retval EFI_INVALID_PARAMETER         The contents of the SCSI Request Packet are invalid.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -602,9 +641,6 @@ ScsiRequestSenseCommand (
   )\r
 {\r
   EFI_SCSI_IO_SCSI_REQUEST_PACKET CommandPacket;\r
-  UINT64                          Lun;\r
-  UINT8                           *Target;\r
-  UINT8                           TargetArray[EFI_SCSI_TARGET_MAX_BYTES];\r
   EFI_STATUS                      Status;\r
   UINT8                           Cdb[EFI_SCSI_OP_LENGTH_SIX];\r
 \r
@@ -624,11 +660,7 @@ ScsiRequestSenseCommand (
   //\r
   // Fill Cdb for Request Sense Command\r
   //\r
-  Target = &TargetArray[0];\r
-  ScsiIo->GetDeviceLocation (ScsiIo, &Target, &Lun);\r
-\r
   Cdb[0]                        = EFI_SCSI_OP_REQUEST_SENSE;\r
-  Cdb[1]                        = (UINT8) (LShiftU64 (Lun, 5) & EFI_SCSI_LOGICAL_UNIT_NUMBER_MASK);\r
   Cdb[4]                        = (UINT8) (*SenseDataLength);\r
 \r
   CommandPacket.CdbLength       = (UINT8) EFI_SCSI_OP_LENGTH_SIX;\r
@@ -658,6 +690,14 @@ ScsiRequestSenseCommand (
   If TargetStatus is NULL, then ASSERT().\r
   If DataLength is NULL, then ASSERT().\r
 \r
+  If SenseDataLength is non-zero and SenseData is not NULL, SenseData must meet buffer\r
+  alignment requirement defined in EFI_SCSI_IO_PROTOCOL. Otherwise EFI_INVALID_PARAMETER\r
+  gets returned.\r
+\r
+  If DataLength is non-zero and DataBuffer is not NULL, DataBuffer must meet buffer\r
+  alignment requirement defined in EFI_SCSI_IO_PROTOCOL. Otherwise EFI_INVALID_PARAMETER\r
+  gets returned.\r
+\r
   @param[in]      ScsiIo               A pointer to SCSI IO protocol.\r
   @param[in]      Timeout              The length of timeout period.\r
   @param[in, out] SenseData            A pointer to output sense data.\r
@@ -666,18 +706,19 @@ ScsiRequestSenseCommand (
   @param[out]     TargetStatus         The status of the target.\r
   @param[in, out] DataBuffer           A pointer to a data buffer.\r
   @param[in, out] DataLength           The length of data buffer.\r
-  @param[in]      Pmi                  A partial medium indicator.\r
-\r
-  @retval  EFI_SUCCESS           The command executed successfully.\r
-  @retval  EFI_BAD_BUFFER_SIZE   The SCSI Request Packet was executed, but the entire\r
-                                 DataBuffer could not be transferred. The actual\r
-                                 number of bytes transferred is returned in DataLength.\r
-  @retval  EFI_NOT_READY         The SCSI Request Packet could not be sent because\r
-                                 there are too many SCSI Command Packets already queued.\r
-  @retval  EFI_DEVICE_ERROR      A device error occurred while attempting to send SCSI Request Packet.\r
-  @retval  EFI_UNSUPPORTED       The command described by the SCSI Request Packet\r
-                                 is not supported by the SCSI initiator(i.e., SCSI  Host Controller)\r
-  @retval  EFI_TIMEOUT           A timeout occurred while waiting for the SCSI Request Packet to execute.\r
+  @param[in]      Pmi                  Partial medium indicator.\r
+\r
+  @retval  EFI_SUCCESS                 Command is executed successfully.\r
+  @retval  EFI_BAD_BUFFER_SIZE         The SCSI Request Packet was executed, but the entire\r
+                                       DataBuffer could not be transferred. The actual\r
+                                       number of bytes transferred is returned in DataLength.\r
+  @retval  EFI_NOT_READY               The SCSI Request Packet could not be sent because\r
+                                       there are too many SCSI Command Packets already queued.\r
+  @retval  EFI_DEVICE_ERROR            A device error occurred while attempting to send SCSI Request Packet.\r
+  @retval  EFI_UNSUPPORTED             The command described by the SCSI Request Packet\r
+                                       is not supported by the SCSI initiator(i.e., SCSI  Host Controller)\r
+  @retval  EFI_TIMEOUT                 A timeout occurred while waiting for the SCSI Request Packet to execute.\r
+  @retval  EFI_INVALID_PARAMETER       The contents of the SCSI Request Packet are invalid.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -695,9 +736,6 @@ ScsiReadCapacityCommand (
   )\r
 {\r
   EFI_SCSI_IO_SCSI_REQUEST_PACKET CommandPacket;\r
-  UINT64                          Lun;\r
-  UINT8                           *Target;\r
-  UINT8                           TargetArray[EFI_SCSI_TARGET_MAX_BYTES];\r
   EFI_STATUS                      Status;\r
   UINT8                           Cdb[EFI_SCSI_OP_LENGTH_TEN];\r
 \r
@@ -718,11 +756,7 @@ ScsiReadCapacityCommand (
   //\r
   // Fill Cdb for Read Capacity Command\r
   //\r
-  Target = &TargetArray[0];\r
-  ScsiIo->GetDeviceLocation (ScsiIo, &Target, &Lun);\r
-\r
   Cdb[0]  = EFI_SCSI_OP_READ_CAPACITY;\r
-  Cdb[1]  = (UINT8) (LShiftU64 (Lun, 5) & EFI_SCSI_LOGICAL_UNIT_NUMBER_MASK);\r
   if (!Pmi) {\r
     //\r
     // Partial medium indicator,if Pmi is FALSE, the Cdb.2 ~ Cdb.5 MUST BE ZERO.\r
@@ -760,6 +794,14 @@ ScsiReadCapacityCommand (
   If TargetStatus is NULL, then ASSERT().\r
   If DataLength is NULL, then ASSERT().\r
 \r
+  If SenseDataLength is non-zero and SenseData is not NULL, SenseData must meet buffer\r
+  alignment requirement defined in EFI_SCSI_IO_PROTOCOL. Otherwise EFI_INVALID_PARAMETER\r
+  gets returned.\r
+\r
+  If DataLength is non-zero and DataBuffer is not NULL, DataBuffer must meet buffer\r
+  alignment requirement defined in EFI_SCSI_IO_PROTOCOL. Otherwise EFI_INVALID_PARAMETER\r
+  gets returned.\r
+\r
   @param[in]      ScsiIo               A pointer to SCSI IO protocol.\r
   @param[in]      Timeout              The length of timeout period.\r
   @param[in, out] SenseData            A pointer to output sense data.\r
@@ -770,16 +812,17 @@ ScsiReadCapacityCommand (
   @param[in, out] DataLength           The length of data buffer.\r
   @param[in]      Pmi                  Partial medium indicator.\r
 \r
-  @retval  EFI_SUCCESS           The command executed successfully.\r
-  @retval  EFI_BAD_BUFFER_SIZE   The SCSI Request Packet was executed, but the entire\r
-                                 DataBuffer could not be transferred. The actual\r
-                                 number of bytes transferred is returned in DataLength.\r
-  @retval  EFI_NOT_READY         The SCSI Request Packet could not be sent because\r
-                                 there are too many SCSI Command Packets already queued.\r
-  @retval  EFI_DEVICE_ERROR      A device error occurred while attempting to send SCSI Request Packet.\r
-  @retval  EFI_UNSUPPORTED       The command described by the SCSI Request Packet\r
-                                 is not supported by the SCSI initiator(i.e., SCSI  Host Controller)\r
-  @retval  EFI_TIMEOUT           A timeout occurred while waiting for the SCSI Request Packet to execute.\r
+  @retval  EFI_SUCCESS                 Command is executed successfully.\r
+  @retval  EFI_BAD_BUFFER_SIZE         The SCSI Request Packet was executed, but the entire\r
+                                       DataBuffer could not be transferred. The actual\r
+                                       number of bytes transferred is returned in DataLength.\r
+  @retval  EFI_NOT_READY               The SCSI Request Packet could not be sent because\r
+                                       there are too many SCSI Command Packets already queued.\r
+  @retval  EFI_DEVICE_ERROR            A device error occurred while attempting to send SCSI Request Packet.\r
+  @retval  EFI_UNSUPPORTED             The command described by the SCSI Request Packet\r
+                                       is not supported by the SCSI initiator(i.e., SCSI  Host Controller)\r
+  @retval  EFI_TIMEOUT                 A timeout occurred while waiting for the SCSI Request Packet to execute.\r
+  @retval  EFI_INVALID_PARAMETER       The contents of the SCSI Request Packet are invalid.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -797,9 +840,6 @@ ScsiReadCapacity16Command (
   )\r
 {\r
   EFI_SCSI_IO_SCSI_REQUEST_PACKET CommandPacket;\r
-  UINT64                          Lun;\r
-  UINT8                           *Target;\r
-  UINT8                           TargetArray[EFI_SCSI_TARGET_MAX_BYTES];\r
   EFI_STATUS                      Status;\r
   UINT8                           Cdb[16];\r
 \r
@@ -820,9 +860,6 @@ ScsiReadCapacity16Command (
   //\r
   // Fill Cdb for Read Capacity Command\r
   //\r
-  Target = &TargetArray[0];\r
-  ScsiIo->GetDeviceLocation (ScsiIo, &Target, &Lun);\r
-\r
   Cdb[0]  = EFI_SCSI_OP_READ_CAPACITY16;\r
   Cdb[1]  = 0x10;\r
   if (!Pmi) {\r
@@ -864,6 +901,13 @@ ScsiReadCapacity16Command (
   If TargetStatus is NULL, then ASSERT().\r
   If DataLength is NULL, then ASSERT().\r
 \r
+  If SenseDataLength is non-zero and SenseData is not NULL, SenseData must meet buffer\r
+  alignment requirement defined in EFI_SCSI_IO_PROTOCOL. Otherwise EFI_INVALID_PARAMETER\r
+  gets returned.\r
+\r
+  If DataLength is non-zero and DataBuffer is not NULL, DataBuffer must meet buffer\r
+  alignment requirement defined in EFI_SCSI_IO_PROTOCOL. Otherwise EFI_INVALID_PARAMETER\r
+  gets returned.\r
 \r
   @param[in]      ScsiIo               A pointer to SCSI IO protocol.\r
   @param[in]      Timeout              The length of timeout period.\r
@@ -874,17 +918,18 @@ ScsiReadCapacity16Command (
   @param[in, out] DataBuffer           Read 10 command data.\r
   @param[in, out] DataLength           The length of data buffer.\r
   @param[in]      StartLba             The start address of LBA.\r
-  @param[in]      SectorSize           The sector size.\r
-\r
-  @retval  EFI_SUCCESS          The command is executed successfully.\r
-  @retval  EFI_BAD_BUFFER_SIZE  The SCSI Request Packet was executed, but the entire DataBuffer could\r
-                                not be transferred. The actual number of bytes transferred is returned in DataLength.\r
-  @retval  EFI_NOT_READY        The SCSI Request Packet could not be sent because there are too many \r
-                                SCSI Command Packets already queued.\r
-  @retval  EFI_DEVICE_ERROR     A device error occurred while attempting to send SCSI Request Packet.\r
-  @retval  EFI_UNSUPPORTED      The command described by the SCSI Request Packet is not supported by \r
-                                the SCSI initiator(i.e., SCSI  Host Controller)\r
-  @retval  EFI_TIMEOUT          A timeout occurred while waiting for the SCSI Request Packet to execute.\r
+  @param[in]      SectorSize           The number of contiguous logical blocks of data that shall be transferred.\r
+\r
+  @retval  EFI_SUCCESS                 Command is executed successfully.\r
+  @retval  EFI_BAD_BUFFER_SIZE         The SCSI Request Packet was executed, but the entire DataBuffer could\r
+                                       not be transferred. The actual number of bytes transferred is returned in DataLength.\r
+  @retval  EFI_NOT_READY               The SCSI Request Packet could not be sent because there are too many\r
+                                       SCSI Command Packets already queued.\r
+  @retval  EFI_DEVICE_ERROR            A device error occurred while attempting to send SCSI Request Packet.\r
+  @retval  EFI_UNSUPPORTED             The command described by the SCSI Request Packet is not supported by\r
+                                       the SCSI initiator(i.e., SCSI  Host Controller)\r
+  @retval  EFI_TIMEOUT                 A timeout occurred while waiting for the SCSI Request Packet to execute.\r
+  @retval  EFI_INVALID_PARAMETER       The contents of the SCSI Request Packet are invalid.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -903,9 +948,6 @@ ScsiRead10Command (
   )\r
 {\r
   EFI_SCSI_IO_SCSI_REQUEST_PACKET CommandPacket;\r
-  UINT64                          Lun;\r
-  UINT8                           *Target;\r
-  UINT8                           TargetArray[EFI_SCSI_TARGET_MAX_BYTES];\r
   EFI_STATUS                      Status;\r
   UINT8                           Cdb[EFI_SCSI_OP_LENGTH_TEN];\r
 \r
@@ -926,11 +968,7 @@ ScsiRead10Command (
   //\r
   // Fill Cdb for Read (10) Command\r
   //\r
-  Target = &TargetArray[0];\r
-  ScsiIo->GetDeviceLocation (ScsiIo, &Target, &Lun);\r
-\r
   Cdb[0]                        = EFI_SCSI_OP_READ10;\r
-  Cdb[1]                        = (UINT8) (LShiftU64 (Lun, 5) & EFI_SCSI_LOGICAL_UNIT_NUMBER_MASK);\r
   WriteUnaligned32 ((UINT32 *)&Cdb[2], SwapBytes32 (StartLba));\r
   WriteUnaligned16 ((UINT16 *)&Cdb[7], SwapBytes16 ((UINT16) SectorSize));\r
 \r
@@ -963,6 +1001,14 @@ ScsiRead10Command (
   If TargetStatus is NULL, then ASSERT().\r
   If DataLength is NULL, then ASSERT().\r
 \r
+  If SenseDataLength is non-zero and SenseData is not NULL, SenseData must meet buffer\r
+  alignment requirement defined in EFI_SCSI_IO_PROTOCOL. Otherwise EFI_INVALID_PARAMETER\r
+  gets returned.\r
+\r
+  If DataLength is non-zero and DataBuffer is not NULL, DataBuffer must meet buffer\r
+  alignment requirement defined in EFI_SCSI_IO_PROTOCOL. Otherwise EFI_INVALID_PARAMETER\r
+  gets returned.\r
+\r
   @param[in]      ScsiIo               SCSI IO Protocol to use\r
   @param[in]      Timeout              The length of timeout period.\r
   @param[in, out] SenseData            A pointer to output sense data.\r
@@ -972,17 +1018,18 @@ ScsiRead10Command (
   @param[in, out] DataBuffer           A pointer to a data buffer.\r
   @param[in, out] DataLength           The length of data buffer.\r
   @param[in]      StartLba             The start address of LBA.\r
-  @param[in]      SectorSize           The sector size.\r
-\r
-  @retval  EFI_SUCCESS          The command executed successfully.\r
-  @retval  EFI_BAD_BUFFER_SIZE  The SCSI Request Packet was executed, but the entire DataBuffer could\r
-                                not be transferred. The actual number of bytes transferred is returned in DataLength.\r
-  @retval  EFI_NOT_READY        The SCSI Request Packet could not be sent because there are too many \r
-                                SCSI Command Packets already queued.\r
-  @retval  EFI_DEVICE_ERROR     A device error occurred while attempting to send SCSI Request Packet.\r
-  @retval  EFI_UNSUPPORTED      The command described by the SCSI Request Packet is not supported by \r
-                                the SCSI initiator(i.e., SCSI  Host Controller)\r
-  @retval  EFI_TIMEOUT          A timeout occurred while waiting for the SCSI Request Packet to execute.\r
+  @param[in]      SectorSize           The number of contiguous logical blocks of data that shall be transferred.\r
+\r
+  @retval  EFI_SUCCESS                 Command is executed successfully.\r
+  @retval  EFI_BAD_BUFFER_SIZE         The SCSI Request Packet was executed, but the entire DataBuffer could\r
+                                       not be transferred. The actual number of bytes transferred is returned in DataLength.\r
+  @retval  EFI_NOT_READY               The SCSI Request Packet could not be sent because there are too many\r
+                                       SCSI Command Packets already queued.\r
+  @retval  EFI_DEVICE_ERROR            A device error occurred while attempting to send SCSI Request Packet.\r
+  @retval  EFI_UNSUPPORTED             The command described by the SCSI Request Packet is not supported by\r
+                                       the SCSI initiator(i.e., SCSI  Host Controller)\r
+  @retval  EFI_TIMEOUT                 A timeout occurred while waiting for the SCSI Request Packet to execute.\r
+  @retval  EFI_INVALID_PARAMETER       The contents of the SCSI Request Packet are invalid.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -1001,9 +1048,6 @@ ScsiWrite10Command (
   )\r
 {\r
   EFI_SCSI_IO_SCSI_REQUEST_PACKET CommandPacket;\r
-  UINT64                          Lun;\r
-  UINT8                           *Target;\r
-  UINT8                           TargetArray[EFI_SCSI_TARGET_MAX_BYTES];\r
   EFI_STATUS                      Status;\r
   UINT8                           Cdb[EFI_SCSI_OP_LENGTH_TEN];\r
 \r
@@ -1024,11 +1068,7 @@ ScsiWrite10Command (
   //\r
   // Fill Cdb for Write (10) Command\r
   //\r
-  Target = &TargetArray[0];\r
-  ScsiIo->GetDeviceLocation (ScsiIo, &Target, &Lun);\r
-\r
   Cdb[0]                        = EFI_SCSI_OP_WRITE10;\r
-  Cdb[1]                        = (UINT8) (LShiftU64 (Lun, 5) & EFI_SCSI_LOGICAL_UNIT_NUMBER_MASK);\r
   WriteUnaligned32 ((UINT32 *)&Cdb[2], SwapBytes32 (StartLba));\r
   WriteUnaligned16 ((UINT16 *)&Cdb[7], SwapBytes16 ((UINT16) SectorSize));\r
 \r
@@ -1060,6 +1100,13 @@ ScsiWrite10Command (
   If TargetStatus is NULL, then ASSERT().\r
   If DataLength is NULL, then ASSERT().\r
 \r
+  If SenseDataLength is non-zero and SenseData is not NULL, SenseData must meet buffer\r
+  alignment requirement defined in EFI_SCSI_IO_PROTOCOL. Otherwise EFI_INVALID_PARAMETER\r
+  gets returned.\r
+\r
+  If DataLength is non-zero and DataBuffer is not NULL, DataBuffer must meet buffer\r
+  alignment requirement defined in EFI_SCSI_IO_PROTOCOL. Otherwise EFI_INVALID_PARAMETER\r
+  gets returned.\r
 \r
   @param[in]      ScsiIo               A pointer to SCSI IO protocol.\r
   @param[in]      Timeout              The length of timeout period.\r
@@ -1070,17 +1117,18 @@ ScsiWrite10Command (
   @param[in, out] DataBuffer           Read 16 command data.\r
   @param[in, out] DataLength           The length of data buffer.\r
   @param[in]      StartLba             The start address of LBA.\r
-  @param[in]      SectorSize           The sector size.\r
-\r
-  @retval  EFI_SUCCESS          The command executed successfully.\r
-  @retval  EFI_BAD_BUFFER_SIZE  The SCSI Request Packet was executed, but the entire DataBuffer could\r
-                                not be transferred. The actual number of bytes transferred is returned in DataLength.\r
-  @retval  EFI_NOT_READY        The SCSI Request Packet could not be sent because there are too many \r
-                                SCSI Command Packets already queued.\r
-  @retval  EFI_DEVICE_ERROR     A device error occurred while attempting to send SCSI Request Packet.\r
-  @retval  EFI_UNSUPPORTED      The command described by the SCSI Request Packet is not supported by \r
-                                the SCSI initiator(i.e., SCSI  Host Controller)\r
-  @retval  EFI_TIMEOUT          A timeout occurred while waiting for the SCSI Request Packet to execute.\r
+  @param[in]      SectorSize           The number of contiguous logical blocks of data that shall be transferred.\r
+\r
+  @retval  EFI_SUCCESS                 Command is executed successfully.\r
+  @retval  EFI_BAD_BUFFER_SIZE         The SCSI Request Packet was executed, but the entire DataBuffer could\r
+                                       not be transferred. The actual number of bytes transferred is returned in DataLength.\r
+  @retval  EFI_NOT_READY               The SCSI Request Packet could not be sent because there are too many\r
+                                       SCSI Command Packets already queued.\r
+  @retval  EFI_DEVICE_ERROR            A device error occurred while attempting to send SCSI Request Packet.\r
+  @retval  EFI_UNSUPPORTED             The command described by the SCSI Request Packet is not supported by\r
+                                       the SCSI initiator(i.e., SCSI  Host Controller)\r
+  @retval  EFI_TIMEOUT                 A timeout occurred while waiting for the SCSI Request Packet to execute.\r
+  @retval  EFI_INVALID_PARAMETER       The contents of the SCSI Request Packet are invalid.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -1099,9 +1147,6 @@ ScsiRead16Command (
   )\r
 {\r
   EFI_SCSI_IO_SCSI_REQUEST_PACKET CommandPacket;\r
-  UINT64                          Lun;\r
-  UINT8                           *Target;\r
-  UINT8                           TargetArray[EFI_SCSI_TARGET_MAX_BYTES];\r
   EFI_STATUS                      Status;\r
   UINT8                           Cdb[EFI_SCSI_OP_LENGTH_SIXTEEN];\r
 \r
@@ -1122,11 +1167,7 @@ ScsiRead16Command (
   //\r
   // Fill Cdb for Read (16) Command\r
   //\r
-  Target = &TargetArray[0];\r
-  ScsiIo->GetDeviceLocation (ScsiIo, &Target, &Lun);\r
-\r
   Cdb[0]                        = EFI_SCSI_OP_READ16;\r
-  Cdb[1]                        = (UINT8) (LShiftU64 (Lun, 5) & EFI_SCSI_LOGICAL_UNIT_NUMBER_MASK);\r
   WriteUnaligned64 ((UINT64 *)&Cdb[2], SwapBytes64 (StartLba));\r
   WriteUnaligned32 ((UINT32 *)&Cdb[10], SwapBytes32 (SectorSize));\r
 \r
@@ -1159,6 +1200,14 @@ ScsiRead16Command (
   If TargetStatus is NULL, then ASSERT().\r
   If DataLength is NULL, then ASSERT().\r
 \r
+  If SenseDataLength is non-zero and SenseData is not NULL, SenseData must meet buffer\r
+  alignment requirement defined in EFI_SCSI_IO_PROTOCOL. Otherwise EFI_INVALID_PARAMETER\r
+  gets returned.\r
+\r
+  If DataLength is non-zero and DataBuffer is not NULL, DataBuffer must meet buffer\r
+  alignment requirement defined in EFI_SCSI_IO_PROTOCOL. Otherwise EFI_INVALID_PARAMETER\r
+  gets returned.\r
+\r
   @param[in]      ScsiIo               SCSI IO Protocol to use\r
   @param[in]      Timeout              The length of timeout period.\r
   @param[in, out] SenseData            A pointer to output sense data.\r
@@ -1168,17 +1217,18 @@ ScsiRead16Command (
   @param[in, out] DataBuffer           A pointer to a data buffer.\r
   @param[in, out] DataLength           The length of data buffer.\r
   @param[in]      StartLba             The start address of LBA.\r
-  @param[in]      SectorSize           The sector size.\r
-\r
-  @retval  EFI_SUCCESS          The command is executed successfully.\r
-  @retval  EFI_BAD_BUFFER_SIZE  The SCSI Request Packet was executed, but the entire DataBuffer could\r
-                                not be transferred. The actual number of bytes transferred is returned in DataLength.\r
-  @retval  EFI_NOT_READY        The SCSI Request Packet could not be sent because there are too many \r
-                                SCSI Command Packets already queued.\r
-  @retval  EFI_DEVICE_ERROR     A device error occurred while attempting to send SCSI Request Packet.\r
-  @retval  EFI_UNSUPPORTED      The command described by the SCSI Request Packet is not supported by \r
-                                the SCSI initiator(i.e., SCSI  Host Controller)\r
-  @retval  EFI_TIMEOUT          A timeout occurred while waiting for the SCSI Request Packet to execute.\r
+  @param[in]      SectorSize           The number of contiguous logical blocks of data that shall be transferred.\r
+\r
+  @retval  EFI_SUCCESS                 Command is executed successfully.\r
+  @retval  EFI_BAD_BUFFER_SIZE         The SCSI Request Packet was executed, but the entire DataBuffer could\r
+                                       not be transferred. The actual number of bytes transferred is returned in DataLength.\r
+  @retval  EFI_NOT_READY               The SCSI Request Packet could not be sent because there are too many\r
+                                       SCSI Command Packets already queued.\r
+  @retval  EFI_DEVICE_ERROR            A device error occurred while attempting to send SCSI Request Packet.\r
+  @retval  EFI_UNSUPPORTED             The command described by the SCSI Request Packet is not supported by\r
+                                       the SCSI initiator(i.e., SCSI  Host Controller)\r
+  @retval  EFI_TIMEOUT                 A timeout occurred while waiting for the SCSI Request Packet to execute.\r
+  @retval  EFI_INVALID_PARAMETER       The contents of the SCSI Request Packet are invalid.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -1197,9 +1247,6 @@ ScsiWrite16Command (
   )\r
 {\r
   EFI_SCSI_IO_SCSI_REQUEST_PACKET CommandPacket;\r
-  UINT64                          Lun;\r
-  UINT8                           *Target;\r
-  UINT8                           TargetArray[EFI_SCSI_TARGET_MAX_BYTES];\r
   EFI_STATUS                      Status;\r
   UINT8                           Cdb[EFI_SCSI_OP_LENGTH_SIXTEEN];\r
 \r
@@ -1220,11 +1267,7 @@ ScsiWrite16Command (
   //\r
   // Fill Cdb for Write (16) Command\r
   //\r
-  Target = &TargetArray[0];\r
-  ScsiIo->GetDeviceLocation (ScsiIo, &Target, &Lun);\r
-\r
   Cdb[0]                        = EFI_SCSI_OP_WRITE16;\r
-  Cdb[1]                        = (UINT8) (LShiftU64 (Lun, 5) & EFI_SCSI_LOGICAL_UNIT_NUMBER_MASK);\r
   WriteUnaligned64 ((UINT64 *)&Cdb[2], SwapBytes64 (StartLba));\r
   WriteUnaligned32 ((UINT32 *)&Cdb[10], SwapBytes32 (SectorSize));\r
 \r
@@ -1241,3 +1284,744 @@ ScsiWrite16Command (
 \r
   return Status;\r
 }\r
+\r
+\r
+/**\r
+  Internal helper notify function in which update the result of the\r
+  non-blocking SCSI Read/Write commands and signal caller event.\r
+\r
+  @param  Event    The instance of EFI_EVENT.\r
+  @param  Context  The parameter passed in.\r
+\r
+**/\r
+VOID\r
+EFIAPI\r
+ScsiLibNotify (\r
+  IN  EFI_EVENT  Event,\r
+  IN  VOID       *Context\r
+  )\r
+{\r
+  EFI_SCSI_LIB_ASYNC_CONTEXT      *LibContext;\r
+  EFI_SCSI_IO_SCSI_REQUEST_PACKET *CommandPacket;\r
+  EFI_EVENT                       CallerEvent;\r
+\r
+  LibContext    = (EFI_SCSI_LIB_ASYNC_CONTEXT *) Context;\r
+  CommandPacket = &LibContext->CommandPacket;\r
+  CallerEvent  = LibContext->CallerEvent;\r
+\r
+  //\r
+  // Update SCSI Read/Write operation results\r
+  //\r
+  *LibContext->SenseDataLength    = CommandPacket->SenseDataLength;\r
+  *LibContext->HostAdapterStatus  = CommandPacket->HostAdapterStatus;\r
+  *LibContext->TargetStatus       = CommandPacket->TargetStatus;\r
+  if (CommandPacket->InDataBuffer != NULL) {\r
+    *LibContext->DataLength       = CommandPacket->InTransferLength;\r
+  } else {\r
+    *LibContext->DataLength       = CommandPacket->OutTransferLength;\r
+  }\r
+\r
+  if (CommandPacket->Cdb != NULL) {\r
+    FreePool (CommandPacket->Cdb);\r
+  }\r
+  FreePool (Context);\r
+\r
+  gBS->CloseEvent (Event);\r
+  gBS->SignalEvent (CallerEvent);\r
+}\r
+\r
+\r
+/**\r
+  Execute blocking/non-blocking Read(10) SCSI command on a specific SCSI\r
+  target.\r
+\r
+  Executes the SCSI Read(10) command on the SCSI target specified by ScsiIo.\r
+  When Event is NULL, blocking command will be executed. Otherwise non-blocking\r
+  command will be executed.\r
+  For blocking I/O, if Timeout is zero, this function will wait indefinitely\r
+  for the command to complete. If Timeout is greater than zero, then the\r
+  command is executed and will timeout after Timeout 100 ns units.\r
+  For non-blocking I/O, if Timeout is zero, Event will be signaled only after\r
+  the command to completes. If Timeout is greater than zero, Event will also be\r
+  signaled after Timeout 100 ns units.\r
+  The StartLba and SectorSize parameters are used to construct the CDB for this\r
+  SCSI command.\r
+\r
+  If ScsiIo is NULL, then ASSERT().\r
+  If SenseDataLength is NULL, then ASSERT().\r
+  If HostAdapterStatus is NULL, then ASSERT().\r
+  If TargetStatus is NULL, then ASSERT().\r
+  If DataLength is NULL, then ASSERT().\r
+\r
+  If SenseDataLength is non-zero and SenseData is not NULL, SenseData must meet\r
+  buffer alignment requirement defined in EFI_SCSI_IO_PROTOCOL. Otherwise\r
+  EFI_INVALID_PARAMETER gets returned.\r
+\r
+  If DataLength is non-zero and DataBuffer is not NULL, DataBuffer must meet\r
+  buffer alignment requirement defined in EFI_SCSI_IO_PROTOCOL. Otherwise\r
+  EFI_INVALID_PARAMETER gets returned.\r
+\r
+  @param[in]      ScsiIo               A pointer to SCSI IO protocol.\r
+  @param[in]      Timeout              The length of timeout period.\r
+  @param[in, out] SenseData            A pointer to output sense data.\r
+  @param[in, out] SenseDataLength      The length of output sense data.\r
+  @param[out]     HostAdapterStatus    The status of Host Adapter.\r
+  @param[out]     TargetStatus         The status of the target.\r
+  @param[in, out] DataBuffer           Read 16 command data.\r
+  @param[in, out] DataLength           The length of data buffer.\r
+  @param[in]      StartLba             The start address of LBA.\r
+  @param[in]      SectorSize           The number of contiguous logical blocks\r
+                                       of data that shall be transferred.\r
+  @param[in]      Event                If the SCSI target does not support\r
+                                       non-blocking I/O, then Event is ignored,\r
+                                       and blocking I/O is performed. If Event\r
+                                       is NULL, then blocking I/O is performed.\r
+                                       If Event is not NULL and non-blocking\r
+                                       I/O is supported, then non-blocking I/O\r
+                                       is performed, and Event will be signaled\r
+                                       when the SCSI Read(10) command\r
+                                       completes.\r
+\r
+  @retval  EFI_SUCCESS                 Command is executed successfully.\r
+  @retval  EFI_BAD_BUFFER_SIZE         The SCSI Request Packet was executed,\r
+                                       but the entire DataBuffer could not be\r
+                                       transferred. The actual number of bytes\r
+                                       transferred is returned in DataLength.\r
+  @retval  EFI_NOT_READY               The SCSI Request Packet could not be\r
+                                       sent because there are too many SCSI\r
+                                       Command Packets already queued.\r
+  @retval  EFI_DEVICE_ERROR            A device error occurred while attempting\r
+                                       to send SCSI Request Packet.\r
+  @retval  EFI_UNSUPPORTED             The command described by the SCSI\r
+                                       Request Packet is not supported by the\r
+                                       SCSI initiator(i.e., SCSI  Host\r
+                                       Controller)\r
+  @retval  EFI_TIMEOUT                 A timeout occurred while waiting for the\r
+                                       SCSI Request Packet to execute.\r
+  @retval  EFI_INVALID_PARAMETER       The contents of the SCSI Request Packet\r
+                                       are invalid.\r
+  @retval  EFI_OUT_OF_RESOURCES        The request could not be completed due\r
+                                       to a lack of resources.\r
+\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+ScsiRead10CommandEx (\r
+  IN     EFI_SCSI_IO_PROTOCOL  *ScsiIo,\r
+  IN     UINT64                Timeout,\r
+  IN OUT VOID                  *SenseData,   OPTIONAL\r
+  IN OUT UINT8                 *SenseDataLength,\r
+     OUT UINT8                 *HostAdapterStatus,\r
+     OUT UINT8                 *TargetStatus,\r
+  IN OUT VOID                  *DataBuffer,  OPTIONAL\r
+  IN OUT UINT32                *DataLength,\r
+  IN     UINT32                StartLba,\r
+  IN     UINT32                SectorSize,\r
+  IN     EFI_EVENT             Event         OPTIONAL\r
+  )\r
+{\r
+  EFI_SCSI_LIB_ASYNC_CONTEXT      *Context;\r
+  EFI_SCSI_IO_SCSI_REQUEST_PACKET *CommandPacket;\r
+  EFI_STATUS                      Status;\r
+  UINT8                           *Cdb;\r
+  EFI_EVENT                       SelfEvent;\r
+\r
+  if (Event == NULL) {\r
+    return ScsiRead10Command (\r
+             ScsiIo,\r
+             Timeout,\r
+             SenseData,\r
+             SenseDataLength,\r
+             HostAdapterStatus,\r
+             TargetStatus,\r
+             DataBuffer,\r
+             DataLength,\r
+             StartLba,\r
+             SectorSize\r
+             );\r
+  }\r
+\r
+  ASSERT (SenseDataLength != NULL);\r
+  ASSERT (HostAdapterStatus != NULL);\r
+  ASSERT (TargetStatus != NULL);\r
+  ASSERT (DataLength != NULL);\r
+  ASSERT (ScsiIo != NULL);\r
+\r
+  Context = AllocateZeroPool (sizeof (EFI_SCSI_LIB_ASYNC_CONTEXT));\r
+  if (Context == NULL) {\r
+    return EFI_OUT_OF_RESOURCES;\r
+  }\r
+\r
+  Cdb = AllocateZeroPool (EFI_SCSI_OP_LENGTH_TEN);\r
+  if (Cdb == NULL) {\r
+    Status = EFI_OUT_OF_RESOURCES;\r
+    goto ErrorExit;\r
+  }\r
+\r
+  Context->SenseDataLength        = SenseDataLength;\r
+  Context->HostAdapterStatus      = HostAdapterStatus;\r
+  Context->TargetStatus           = TargetStatus;\r
+  Context->CallerEvent            = Event;\r
+\r
+  CommandPacket                   = &Context->CommandPacket;\r
+  CommandPacket->Timeout          = Timeout;\r
+  CommandPacket->InDataBuffer     = DataBuffer;\r
+  CommandPacket->SenseData        = SenseData;\r
+  CommandPacket->InTransferLength = *DataLength;\r
+  CommandPacket->Cdb              = Cdb;\r
+  //\r
+  // Fill Cdb for Read (10) Command\r
+  //\r
+  Cdb[0]                          = EFI_SCSI_OP_READ10;\r
+  WriteUnaligned32 ((UINT32 *)&Cdb[2], SwapBytes32 (StartLba));\r
+  WriteUnaligned16 ((UINT16 *)&Cdb[7], SwapBytes16 ((UINT16) SectorSize));\r
+\r
+  CommandPacket->CdbLength        = EFI_SCSI_OP_LENGTH_TEN;\r
+  CommandPacket->DataDirection    = EFI_SCSI_DATA_IN;\r
+  CommandPacket->SenseDataLength  = *SenseDataLength;\r
+\r
+  //\r
+  // Create Event\r
+  //\r
+  Status = gBS->CreateEvent (\r
+                  EVT_NOTIFY_SIGNAL,\r
+                  TPL_CALLBACK,\r
+                  ScsiLibNotify,\r
+                  Context,\r
+                  &SelfEvent\r
+                  );\r
+  if (EFI_ERROR(Status)) {\r
+    goto ErrorExit;\r
+  }\r
+\r
+  return ScsiIo->ExecuteScsiCommand (ScsiIo, CommandPacket, SelfEvent);\r
+\r
+ErrorExit:\r
+  if (Context != NULL) {\r
+    FreePool (Context);\r
+  }\r
+\r
+  return Status;\r
+}\r
+\r
+\r
+/**\r
+  Execute blocking/non-blocking Write(10) SCSI command on a specific SCSI\r
+  target.\r
+\r
+  Executes the SCSI Write(10) command on the SCSI target specified by ScsiIo.\r
+  When Event is NULL, blocking command will be executed. Otherwise non-blocking\r
+  command will be executed.\r
+  For blocking I/O, if Timeout is zero, this function will wait indefinitely\r
+  for the command to complete. If Timeout is greater than zero, then the\r
+  command is executed and will timeout after Timeout 100 ns units.\r
+  For non-blocking I/O, if Timeout is zero, Event will be signaled only after\r
+  the command to completes. If Timeout is greater than zero, Event will also be\r
+  signaled after Timeout 100 ns units.\r
+  The StartLba and SectorSize parameters are used to construct the CDB for this\r
+  SCSI command.\r
+\r
+  If ScsiIo is NULL, then ASSERT().\r
+  If SenseDataLength is NULL, then ASSERT().\r
+  If HostAdapterStatus is NULL, then ASSERT().\r
+  If TargetStatus is NULL, then ASSERT().\r
+  If DataLength is NULL, then ASSERT().\r
+\r
+  If SenseDataLength is non-zero and SenseData is not NULL, SenseData must meet\r
+  buffer alignment requirement defined in EFI_SCSI_IO_PROTOCOL. Otherwise\r
+  EFI_INVALID_PARAMETER gets returned.\r
+\r
+  If DataLength is non-zero and DataBuffer is not NULL, DataBuffer must meet\r
+  buffer alignment requirement defined in EFI_SCSI_IO_PROTOCOL. Otherwise\r
+  EFI_INVALID_PARAMETER gets returned.\r
+\r
+  @param[in]      ScsiIo               SCSI IO Protocol to use\r
+  @param[in]      Timeout              The length of timeout period.\r
+  @param[in, out] SenseData            A pointer to output sense data.\r
+  @param[in, out] SenseDataLength      The length of output sense data.\r
+  @param[out]     HostAdapterStatus    The status of Host Adapter.\r
+  @param[out]     TargetStatus         The status of the target.\r
+  @param[in, out] DataBuffer           A pointer to a data buffer.\r
+  @param[in, out] DataLength           The length of data buffer.\r
+  @param[in]      StartLba             The start address of LBA.\r
+  @param[in]      SectorSize           The number of contiguous logical blocks\r
+                                       of data that shall be transferred.\r
+  @param[in]      Event                If the SCSI target does not support\r
+                                       non-blocking I/O, then Event is ignored,\r
+                                       and blocking I/O is performed. If Event\r
+                                       is NULL, then blocking I/O is performed.\r
+                                       If Event is not NULL and non-blocking\r
+                                       I/O is supported, then non-blocking I/O\r
+                                       is performed, and Event will be signaled\r
+                                       when the SCSI Write(10) command\r
+                                       completes.\r
+\r
+  @retval  EFI_SUCCESS                 Command is executed successfully.\r
+  @retval  EFI_BAD_BUFFER_SIZE         The SCSI Request Packet was executed,\r
+                                       but the entire DataBuffer could not be\r
+                                       transferred. The actual number of bytes\r
+                                       transferred is returned in DataLength.\r
+  @retval  EFI_NOT_READY               The SCSI Request Packet could not be\r
+                                       sent because there are too many SCSI\r
+                                       Command Packets already queued.\r
+  @retval  EFI_DEVICE_ERROR            A device error occurred while attempting\r
+                                       to send SCSI Request Packet.\r
+  @retval  EFI_UNSUPPORTED             The command described by the SCSI\r
+                                       Request Packet is not supported by the\r
+                                       SCSI initiator(i.e., SCSI  Host\r
+                                       Controller)\r
+  @retval  EFI_TIMEOUT                 A timeout occurred while waiting for the\r
+                                       SCSI Request Packet to execute.\r
+  @retval  EFI_INVALID_PARAMETER       The contents of the SCSI Request Packet\r
+                                       are invalid.\r
+  @retval  EFI_OUT_OF_RESOURCES        The request could not be completed due\r
+                                       to a lack of resources.\r
+\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+ScsiWrite10CommandEx (\r
+  IN     EFI_SCSI_IO_PROTOCOL  *ScsiIo,\r
+  IN     UINT64                Timeout,\r
+  IN OUT VOID                  *SenseData,   OPTIONAL\r
+  IN OUT UINT8                 *SenseDataLength,\r
+     OUT UINT8                 *HostAdapterStatus,\r
+     OUT UINT8                 *TargetStatus,\r
+  IN OUT VOID                  *DataBuffer,  OPTIONAL\r
+  IN OUT UINT32                *DataLength,\r
+  IN     UINT32                StartLba,\r
+  IN     UINT32                SectorSize,\r
+  IN     EFI_EVENT             Event         OPTIONAL\r
+  )\r
+{\r
+  EFI_SCSI_LIB_ASYNC_CONTEXT      *Context;\r
+  EFI_SCSI_IO_SCSI_REQUEST_PACKET *CommandPacket;\r
+  EFI_STATUS                      Status;\r
+  UINT8                           *Cdb;\r
+  EFI_EVENT                       SelfEvent;\r
+\r
+  if (Event == NULL) {\r
+    return ScsiWrite10Command (\r
+             ScsiIo,\r
+             Timeout,\r
+             SenseData,\r
+             SenseDataLength,\r
+             HostAdapterStatus,\r
+             TargetStatus,\r
+             DataBuffer,\r
+             DataLength,\r
+             StartLba,\r
+             SectorSize\r
+             );\r
+  }\r
+\r
+  ASSERT (SenseDataLength != NULL);\r
+  ASSERT (HostAdapterStatus != NULL);\r
+  ASSERT (TargetStatus != NULL);\r
+  ASSERT (DataLength != NULL);\r
+  ASSERT (ScsiIo != NULL);\r
+\r
+  Context = AllocateZeroPool (sizeof (EFI_SCSI_LIB_ASYNC_CONTEXT));\r
+  if (Context == NULL) {\r
+    return EFI_OUT_OF_RESOURCES;\r
+  }\r
+\r
+  Cdb = AllocateZeroPool (EFI_SCSI_OP_LENGTH_TEN);\r
+  if (Cdb == NULL) {\r
+    Status = EFI_OUT_OF_RESOURCES;\r
+    goto ErrorExit;\r
+  }\r
+\r
+  Context->SenseDataLength         = SenseDataLength;\r
+  Context->HostAdapterStatus       = HostAdapterStatus;\r
+  Context->TargetStatus            = TargetStatus;\r
+  Context->CallerEvent             = Event;\r
+\r
+  CommandPacket                    = &Context->CommandPacket;\r
+  CommandPacket->Timeout           = Timeout;\r
+  CommandPacket->OutDataBuffer     = DataBuffer;\r
+  CommandPacket->SenseData         = SenseData;\r
+  CommandPacket->OutTransferLength = *DataLength;\r
+  CommandPacket->Cdb               = Cdb;\r
+  //\r
+  // Fill Cdb for Write (10) Command\r
+  //\r
+  Cdb[0]                           = EFI_SCSI_OP_WRITE10;\r
+  WriteUnaligned32 ((UINT32 *)&Cdb[2], SwapBytes32 (StartLba));\r
+  WriteUnaligned16 ((UINT16 *)&Cdb[7], SwapBytes16 ((UINT16) SectorSize));\r
+\r
+  CommandPacket->CdbLength         = EFI_SCSI_OP_LENGTH_TEN;\r
+  CommandPacket->DataDirection     = EFI_SCSI_DATA_OUT;\r
+  CommandPacket->SenseDataLength   = *SenseDataLength;\r
+\r
+  //\r
+  // Create Event\r
+  //\r
+  Status = gBS->CreateEvent (\r
+                  EVT_NOTIFY_SIGNAL,\r
+                  TPL_CALLBACK,\r
+                  ScsiLibNotify,\r
+                  Context,\r
+                  &SelfEvent\r
+                  );\r
+  if (EFI_ERROR(Status)) {\r
+    goto ErrorExit;\r
+  }\r
+\r
+  return ScsiIo->ExecuteScsiCommand (ScsiIo, CommandPacket, Event);\r
+\r
+ErrorExit:\r
+  if (Context != NULL) {\r
+    FreePool (Context);\r
+  }\r
+\r
+  return Status;\r
+}\r
+\r
+\r
+/**\r
+  Execute blocking/non-blocking Read(16) SCSI command on a specific SCSI\r
+  target.\r
+\r
+  Executes the SCSI Read(16) command on the SCSI target specified by ScsiIo.\r
+  When Event is NULL, blocking command will be executed. Otherwise non-blocking\r
+  command will be executed.\r
+  For blocking I/O, if Timeout is zero, this function will wait indefinitely\r
+  for the command to complete. If Timeout is greater than zero, then the\r
+  command is executed and will timeout after Timeout 100 ns units.\r
+  For non-blocking I/O, if Timeout is zero, Event will be signaled only after\r
+  the command to completes. If Timeout is greater than zero, Event will also be\r
+  signaled after Timeout 100 ns units.\r
+  The StartLba and SectorSize parameters are used to construct the CDB for this\r
+  SCSI command.\r
+\r
+  If ScsiIo is NULL, then ASSERT().\r
+  If SenseDataLength is NULL, then ASSERT().\r
+  If HostAdapterStatus is NULL, then ASSERT().\r
+  If TargetStatus is NULL, then ASSERT().\r
+  If DataLength is NULL, then ASSERT().\r
+\r
+  If SenseDataLength is non-zero and SenseData is not NULL, SenseData must meet\r
+  buffer alignment requirement defined in EFI_SCSI_IO_PROTOCOL. Otherwise\r
+  EFI_INVALID_PARAMETER gets returned.\r
+\r
+  If DataLength is non-zero and DataBuffer is not NULL, DataBuffer must meet\r
+  buffer alignment requirement defined in EFI_SCSI_IO_PROTOCOL. Otherwise\r
+  EFI_INVALID_PARAMETER gets returned.\r
+\r
+  @param[in]      ScsiIo               A pointer to SCSI IO protocol.\r
+  @param[in]      Timeout              The length of timeout period.\r
+  @param[in, out] SenseData            A pointer to output sense data.\r
+  @param[in, out] SenseDataLength      The length of output sense data.\r
+  @param[out]     HostAdapterStatus    The status of Host Adapter.\r
+  @param[out]     TargetStatus         The status of the target.\r
+  @param[in, out] DataBuffer           Read 16 command data.\r
+  @param[in, out] DataLength           The length of data buffer.\r
+  @param[in]      StartLba             The start address of LBA.\r
+  @param[in]      SectorSize           The number of contiguous logical blocks\r
+                                       of data that shall be transferred.\r
+  @param[in]      Event                If the SCSI target does not support\r
+                                       non-blocking I/O, then Event is ignored,\r
+                                       and blocking I/O is performed. If Event\r
+                                       is NULL, then blocking I/O is performed.\r
+                                       If Event is not NULL and non-blocking\r
+                                       I/O is supported, then non-blocking I/O\r
+                                       is performed, and Event will be signaled\r
+                                       when the SCSI Read(16) command\r
+                                       completes.\r
+\r
+  @retval  EFI_SUCCESS                 Command is executed successfully.\r
+  @retval  EFI_BAD_BUFFER_SIZE         The SCSI Request Packet was executed,\r
+                                       but the entire DataBuffer could not be\r
+                                       transferred. The actual number of bytes\r
+                                       transferred is returned in DataLength.\r
+  @retval  EFI_NOT_READY               The SCSI Request Packet could not be\r
+                                       sent because there are too many SCSI\r
+                                       Command Packets already queued.\r
+  @retval  EFI_DEVICE_ERROR            A device error occurred while attempting\r
+                                       to send SCSI Request Packet.\r
+  @retval  EFI_UNSUPPORTED             The command described by the SCSI\r
+                                       Request Packet is not supported by the\r
+                                       SCSI initiator(i.e., SCSI  Host\r
+                                       Controller)\r
+  @retval  EFI_TIMEOUT                 A timeout occurred while waiting for the\r
+                                       SCSI Request Packet to execute.\r
+  @retval  EFI_INVALID_PARAMETER       The contents of the SCSI Request Packet\r
+                                       are invalid.\r
+  @retval  EFI_OUT_OF_RESOURCES        The request could not be completed due\r
+                                       to a lack of resources.\r
+\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+ScsiRead16CommandEx (\r
+  IN     EFI_SCSI_IO_PROTOCOL  *ScsiIo,\r
+  IN     UINT64                Timeout,\r
+  IN OUT VOID                  *SenseData,   OPTIONAL\r
+  IN OUT UINT8                 *SenseDataLength,\r
+     OUT UINT8                 *HostAdapterStatus,\r
+     OUT UINT8                 *TargetStatus,\r
+  IN OUT VOID                  *DataBuffer,  OPTIONAL\r
+  IN OUT UINT32                *DataLength,\r
+  IN     UINT64                StartLba,\r
+  IN     UINT32                SectorSize,\r
+  IN     EFI_EVENT             Event         OPTIONAL\r
+  )\r
+{\r
+  EFI_SCSI_LIB_ASYNC_CONTEXT      *Context;\r
+  EFI_SCSI_IO_SCSI_REQUEST_PACKET *CommandPacket;\r
+  EFI_STATUS                      Status;\r
+  UINT8                           *Cdb;\r
+  EFI_EVENT                       SelfEvent;\r
+\r
+  if (Event == NULL) {\r
+    return ScsiRead16Command (\r
+             ScsiIo,\r
+             Timeout,\r
+             SenseData,\r
+             SenseDataLength,\r
+             HostAdapterStatus,\r
+             TargetStatus,\r
+             DataBuffer,\r
+             DataLength,\r
+             StartLba,\r
+             SectorSize\r
+             );\r
+  }\r
+\r
+  ASSERT (SenseDataLength != NULL);\r
+  ASSERT (HostAdapterStatus != NULL);\r
+  ASSERT (TargetStatus != NULL);\r
+  ASSERT (DataLength != NULL);\r
+  ASSERT (ScsiIo != NULL);\r
+\r
+  Context = AllocateZeroPool (sizeof (EFI_SCSI_LIB_ASYNC_CONTEXT));\r
+  if (Context == NULL) {\r
+    return EFI_OUT_OF_RESOURCES;\r
+  }\r
+\r
+  Cdb = AllocateZeroPool (EFI_SCSI_OP_LENGTH_SIXTEEN);\r
+  if (Cdb == NULL) {\r
+    Status = EFI_OUT_OF_RESOURCES;\r
+    goto ErrorExit;\r
+  }\r
+\r
+  Context->SenseDataLength        = SenseDataLength;\r
+  Context->HostAdapterStatus      = HostAdapterStatus;\r
+  Context->TargetStatus           = TargetStatus;\r
+  Context->CallerEvent            = Event;\r
+\r
+  CommandPacket                   = &Context->CommandPacket;\r
+  CommandPacket->Timeout          = Timeout;\r
+  CommandPacket->InDataBuffer     = DataBuffer;\r
+  CommandPacket->SenseData        = SenseData;\r
+  CommandPacket->InTransferLength = *DataLength;\r
+  CommandPacket->Cdb              = Cdb;\r
+  //\r
+  // Fill Cdb for Read (16) Command\r
+  //\r
+  Cdb[0]                          = EFI_SCSI_OP_READ16;\r
+  WriteUnaligned64 ((UINT64 *)&Cdb[2], SwapBytes64 (StartLba));\r
+  WriteUnaligned32 ((UINT32 *)&Cdb[10], SwapBytes32 (SectorSize));\r
+\r
+  CommandPacket->CdbLength        = EFI_SCSI_OP_LENGTH_SIXTEEN;\r
+  CommandPacket->DataDirection    = EFI_SCSI_DATA_IN;\r
+  CommandPacket->SenseDataLength  = *SenseDataLength;\r
+\r
+  //\r
+  // Create Event\r
+  //\r
+  Status = gBS->CreateEvent (\r
+                  EVT_NOTIFY_SIGNAL,\r
+                  TPL_CALLBACK,\r
+                  ScsiLibNotify,\r
+                  Context,\r
+                  &SelfEvent\r
+                  );\r
+  if (EFI_ERROR(Status)) {\r
+    goto ErrorExit;\r
+  }\r
+\r
+  return ScsiIo->ExecuteScsiCommand (ScsiIo, CommandPacket, Event);\r
+\r
+ErrorExit:\r
+  if (Context != NULL) {\r
+    FreePool (Context);\r
+  }\r
+\r
+  return Status;\r
+}\r
+\r
+\r
+/**\r
+  Execute blocking/non-blocking Write(16) SCSI command on a specific SCSI\r
+  target.\r
+\r
+  Executes the SCSI Write(16) command on the SCSI target specified by ScsiIo.\r
+  When Event is NULL, blocking command will be executed. Otherwise non-blocking\r
+  command will be executed.\r
+  For blocking I/O, if Timeout is zero, this function will wait indefinitely\r
+  for the command to complete. If Timeout is greater than zero, then the\r
+  command is executed and will timeout after Timeout 100 ns units.\r
+  For non-blocking I/O, if Timeout is zero, Event will be signaled only after\r
+  the command to completes. If Timeout is greater than zero, Event will also be\r
+  signaled after Timeout 100 ns units.\r
+  The StartLba and SectorSize parameters are used to construct the CDB for this\r
+  SCSI command.\r
+\r
+  If ScsiIo is NULL, then ASSERT().\r
+  If SenseDataLength is NULL, then ASSERT().\r
+  If HostAdapterStatus is NULL, then ASSERT().\r
+  If TargetStatus is NULL, then ASSERT().\r
+  If DataLength is NULL, then ASSERT().\r
+\r
+  If SenseDataLength is non-zero and SenseData is not NULL, SenseData must meet\r
+  buffer alignment requirement defined in EFI_SCSI_IO_PROTOCOL. Otherwise\r
+  EFI_INVALID_PARAMETER gets returned.\r
+\r
+  If DataLength is non-zero and DataBuffer is not NULL, DataBuffer must meet\r
+  buffer alignment requirement defined in EFI_SCSI_IO_PROTOCOL. Otherwise\r
+  EFI_INVALID_PARAMETER gets returned.\r
+\r
+  @param[in]      ScsiIo               SCSI IO Protocol to use\r
+  @param[in]      Timeout              The length of timeout period.\r
+  @param[in, out] SenseData            A pointer to output sense data.\r
+  @param[in, out] SenseDataLength      The length of output sense data.\r
+  @param[out]     HostAdapterStatus    The status of Host Adapter.\r
+  @param[out]     TargetStatus         The status of the target.\r
+  @param[in, out] DataBuffer           A pointer to a data buffer.\r
+  @param[in, out] DataLength           The length of data buffer.\r
+  @param[in]      StartLba             The start address of LBA.\r
+  @param[in]      SectorSize           The number of contiguous logical blocks\r
+                                       of data that shall be transferred.\r
+  @param[in]      Event                If the SCSI target does not support\r
+                                       non-blocking I/O, then Event is ignored,\r
+                                       and blocking I/O is performed. If Event\r
+                                       is NULL, then blocking I/O is performed.\r
+                                       If Event is not NULL and non-blocking\r
+                                       I/O is supported, then non-blocking I/O\r
+                                       is performed, and Event will be signaled\r
+                                       when the SCSI Write(16) command\r
+                                       completes.\r
+\r
+  @retval  EFI_SUCCESS                 Command is executed successfully.\r
+  @retval  EFI_BAD_BUFFER_SIZE         The SCSI Request Packet was executed,\r
+                                       but the entire DataBuffer could not be\r
+                                       transferred. The actual number of bytes\r
+                                       transferred is returned in DataLength.\r
+  @retval  EFI_NOT_READY               The SCSI Request Packet could not be\r
+                                       sent because there are too many SCSI\r
+                                       Command Packets already queued.\r
+  @retval  EFI_DEVICE_ERROR            A device error occurred while attempting\r
+                                       to send SCSI Request Packet.\r
+  @retval  EFI_UNSUPPORTED             The command described by the SCSI\r
+                                       Request Packet is not supported by the\r
+                                       SCSI initiator(i.e., SCSI  Host\r
+                                       Controller)\r
+  @retval  EFI_TIMEOUT                 A timeout occurred while waiting for the\r
+                                       SCSI Request Packet to execute.\r
+  @retval  EFI_INVALID_PARAMETER       The contents of the SCSI Request Packet\r
+                                       are invalid.\r
+  @retval  EFI_OUT_OF_RESOURCES        The request could not be completed due\r
+                                       to a lack of resources.\r
+\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+ScsiWrite16CommandEx (\r
+  IN     EFI_SCSI_IO_PROTOCOL  *ScsiIo,\r
+  IN     UINT64                Timeout,\r
+  IN OUT VOID                  *SenseData,   OPTIONAL\r
+  IN OUT UINT8                 *SenseDataLength,\r
+     OUT UINT8                 *HostAdapterStatus,\r
+     OUT UINT8                 *TargetStatus,\r
+  IN OUT VOID                  *DataBuffer,  OPTIONAL\r
+  IN OUT UINT32                *DataLength,\r
+  IN     UINT64                StartLba,\r
+  IN     UINT32                SectorSize,\r
+  IN     EFI_EVENT             Event         OPTIONAL\r
+  )\r
+{\r
+  EFI_SCSI_LIB_ASYNC_CONTEXT      *Context;\r
+  EFI_SCSI_IO_SCSI_REQUEST_PACKET *CommandPacket;\r
+  EFI_STATUS                      Status;\r
+  UINT8                           *Cdb;\r
+  EFI_EVENT                       SelfEvent;\r
+\r
+  if (Event == NULL) {\r
+    return ScsiWrite16Command (\r
+             ScsiIo,\r
+             Timeout,\r
+             SenseData,\r
+             SenseDataLength,\r
+             HostAdapterStatus,\r
+             TargetStatus,\r
+             DataBuffer,\r
+             DataLength,\r
+             StartLba,\r
+             SectorSize\r
+             );\r
+  }\r
+\r
+  ASSERT (SenseDataLength != NULL);\r
+  ASSERT (HostAdapterStatus != NULL);\r
+  ASSERT (TargetStatus != NULL);\r
+  ASSERT (DataLength != NULL);\r
+  ASSERT (ScsiIo != NULL);\r
+\r
+  Context = AllocateZeroPool (sizeof (EFI_SCSI_LIB_ASYNC_CONTEXT));\r
+  if (Context == NULL) {\r
+    return EFI_OUT_OF_RESOURCES;\r
+  }\r
+\r
+  Cdb = AllocateZeroPool (EFI_SCSI_OP_LENGTH_SIXTEEN);\r
+  if (Cdb == NULL) {\r
+    Status = EFI_OUT_OF_RESOURCES;\r
+    goto ErrorExit;\r
+  }\r
+\r
+  Context->SenseDataLength         = SenseDataLength;\r
+  Context->HostAdapterStatus       = HostAdapterStatus;\r
+  Context->TargetStatus            = TargetStatus;\r
+  Context->CallerEvent             = Event;\r
+\r
+  CommandPacket                    = &Context->CommandPacket;\r
+  CommandPacket->Timeout           = Timeout;\r
+  CommandPacket->OutDataBuffer     = DataBuffer;\r
+  CommandPacket->SenseData         = SenseData;\r
+  CommandPacket->OutTransferLength = *DataLength;\r
+  CommandPacket->Cdb               = Cdb;\r
+  //\r
+  // Fill Cdb for Write (16) Command\r
+  //\r
+  Cdb[0]                           = EFI_SCSI_OP_WRITE16;\r
+  WriteUnaligned64 ((UINT64 *)&Cdb[2], SwapBytes64 (StartLba));\r
+  WriteUnaligned32 ((UINT32 *)&Cdb[10], SwapBytes32 (SectorSize));\r
+\r
+  CommandPacket->CdbLength         = EFI_SCSI_OP_LENGTH_SIXTEEN;\r
+  CommandPacket->DataDirection     = EFI_SCSI_DATA_OUT;\r
+  CommandPacket->SenseDataLength   = *SenseDataLength;\r
+\r
+  //\r
+  // Create Event\r
+  //\r
+  Status = gBS->CreateEvent (\r
+                  EVT_NOTIFY_SIGNAL,\r
+                  TPL_CALLBACK,\r
+                  ScsiLibNotify,\r
+                  Context,\r
+                  &SelfEvent\r
+                  );\r
+  if (EFI_ERROR(Status)) {\r
+    goto ErrorExit;\r
+  }\r
+\r
+  return ScsiIo->ExecuteScsiCommand (ScsiIo, CommandPacket, Event);\r
+\r
+ErrorExit:\r
+  if (Context != NULL) {\r
+    FreePool (Context);\r
+  }\r
+\r
+  return Status;\r
+}\r