]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdePkg/Library/UefiScsiLib/UefiScsiLib.c
MdePkg: Replace BSD License with BSD+Patent License
[mirror_edk2.git] / MdePkg / Library / UefiScsiLib / UefiScsiLib.c
index 8fcc3d157dce8684d716443184632d8318109b6f..c7491d1436908f88160302721772b59e16440a79 100644 (file)
@@ -1,14 +1,8 @@
 /** @file\r
   UEFI SCSI Library implementation\r
 \r
-  Copyright (c) 2006 - 2008, Intel Corporation.<BR>\r
-  All rights reserved. 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
-  http://opensource.org/licenses/bsd-license.php                                            \r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
 #include <Library/DebugLib.h>\r
 #include <Library/UefiScsiLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
-  \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
+\r
   //\r
-  // Scsi Command Length six or ten\r
+  // Scsi Command Length\r
   //\r
-#define EFI_SCSI_OP_LENGTH_SIX 0x6\r
-#define EFI_SCSI_OP_LENGTH_TEN 0xa\r
+#define EFI_SCSI_OP_LENGTH_SIX      0x6\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
@@ -52,6 +71,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
@@ -69,7 +91,7 @@
                                     optional and may be NULL.\r
   @param[in, out] SenseDataLength   On input, a pointer to the length in bytes of\r
                                     the SenseData buffer. On output, a pointer to\r
-                                    the number of bytes written to the SenseData buffer. \r
+                                    the number of bytes written to the SenseData buffer.\r
   @param[out]     HostAdapterStatus The status of the SCSI Host Controller that produces\r
                                     the SCSI bus containing the SCSI target specified by\r
                                     ScsiIo when the SCSI Request Packet was executed.\r
                                     by ScsiIo when the SCSI Request Packet was executed\r
                                     on the SCSI Host Controller. See the EFI SCSI I/O\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
+                                    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_INVALID_PARAMETER     The contents of the SCSI Request Packet are invalid.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -116,9 +139,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
@@ -140,11 +160,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
@@ -170,6 +186,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
@@ -185,7 +209,7 @@ ScsiTestUnitReadyCommand (
                                          If SenseDataLength is 0, then this parameter\r
                                          is optional and may be NULL.\r
   @param[in, out] SenseDataLength        On input, the length in bytes of the SenseData buffer.\r
-                                         On output, the number of bytes written to the SenseData buffer. \r
+                                         On output, the number of bytes written to the SenseData buffer.\r
   @param[out]     HostAdapterStatus      The status of the SCSI Host Controller that\r
                                          produces the SCSI bus containing the SCSI\r
                                          target specified by ScsiIo when the SCSI\r
@@ -197,48 +221,51 @@ ScsiTestUnitReadyCommand (
                                          executed on the SCSI Host Controller.\r
                                          See the EFI SCSI I/O Protocol in the UEFI\r
                                          Specification for details on the possible\r
-                                         return values. \r
+                                         return values.\r
   @param[in, out] InquiryDataBuffer      A pointer to inquiry data that was generated\r
                                          by the execution of the SCSI Request Packet.\r
                                          This buffer must be allocated by the caller.\r
                                          If InquiryDataLength is 0, then this parameter\r
-                                         is optional and may be NULL. \r
+                                         is optional and may be NULL.\r
   @param[in, out] InquiryDataLength      On input, a pointer to the length in bytes\r
                                          of the InquiryDataBuffer buffer.\r
                                          On output, a pointer to the number of bytes\r
                                          written to the InquiryDataBuffer buffer.\r
   @param[in]      EnableVitalProductData If TRUE, then the supported vital product\r
-                                         data is returned in InquiryDataBuffer.\r
+                                         data for the PageCode is returned in InquiryDataBuffer.\r
                                          If FALSE, then the standard inquiry data is\r
-                                         returned in InquiryDataBuffer. \r
-\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
+                                         returned in InquiryDataBuffer and PageCode is ignored.\r
+  @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_INVALID_PARAMETER          The contents of the SCSI Request Packet are invalid.\r
 \r
 **/\r
 EFI_STATUS\r
 EFIAPI\r
-ScsiInquiryCommand (\r
+ScsiInquiryCommandEx (\r
   IN     EFI_SCSI_IO_PROTOCOL  *ScsiIo,\r
   IN     UINT64                Timeout,\r
   IN OUT VOID                  *SenseData,  OPTIONAL\r
@@ -247,13 +274,11 @@ ScsiInquiryCommand (
      OUT UINT8                 *TargetStatus,\r
   IN OUT VOID                  *InquiryDataBuffer,    OPTIONAL\r
   IN OUT UINT32                *InquiryDataLength,\r
-  IN     BOOLEAN               EnableVitalProductData\r
+  IN     BOOLEAN               EnableVitalProductData,\r
+  IN     UINT8                 PageCode\r
   )\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
@@ -273,13 +298,10 @@ ScsiInquiryCommand (
   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
   }\r
 \r
   if (*InquiryDataLength > 0xff) {\r
@@ -301,6 +323,121 @@ ScsiInquiryCommand (
 }\r
 \r
 \r
+/**\r
+  Execute Inquiry SCSI command on a specific SCSI target.\r
+\r
+  Executes the Inquiry command on the SCSI target specified by ScsiIo.\r
+  If Timeout is zero, then this function waits indefinitely for the command to complete.\r
+  If Timeout is greater than zero, then the command is executed and will timeout after Timeout 100 ns units.\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 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
+                                         execution of this SCSI Request Packet. A Timeout\r
+                                         value of zero means that this function will wait\r
+                                         indefinitely for the SCSI Request Packet to execute.\r
+                                         If Timeout is greater than zero, then this function\r
+                                         will return EFI_TIMEOUT if the time required to\r
+                                         execute the SCSI Request Packet is greater than Timeout.\r
+  @param[in, out] SenseData              A pointer to sense data that was generated\r
+                                         by the execution of the SCSI Request Packet.\r
+                                         This buffer must be allocated by the caller.\r
+                                         If SenseDataLength is 0, then this parameter\r
+                                         is optional and may be NULL.\r
+  @param[in, out] SenseDataLength        On input, the length in bytes of the SenseData buffer.\r
+                                         On output, the number of bytes written to the SenseData buffer.\r
+  @param[out]     HostAdapterStatus      The status of the SCSI Host Controller that\r
+                                         produces the SCSI bus containing the SCSI\r
+                                         target specified by ScsiIo when the SCSI\r
+                                         Request Packet was executed.  See the EFI\r
+                                         SCSI I/O Protocol in the UEFI Specification\r
+                                         for details on the possible return values.\r
+  @param[out]     TargetStatus           The status returned by the SCSI target specified\r
+                                         by ScsiIo when the SCSI Request Packet was\r
+                                         executed on the SCSI Host Controller.\r
+                                         See the EFI SCSI I/O Protocol in the UEFI\r
+                                         Specification for details on the possible\r
+                                         return values.\r
+  @param[in, out] InquiryDataBuffer      A pointer to inquiry data that was generated\r
+                                         by the execution of the SCSI Request Packet.\r
+                                         This buffer must be allocated by the caller.\r
+                                         If InquiryDataLength is 0, then this parameter\r
+                                         is optional and may be NULL.\r
+  @param[in, out] InquiryDataLength      On input, a pointer to the length in bytes\r
+                                         of the InquiryDataBuffer buffer.\r
+                                         On output, a pointer to the number of bytes\r
+                                         written to the InquiryDataBuffer buffer.\r
+  @param[in]      EnableVitalProductData If TRUE, then the supported vital product\r
+                                         data is returned in InquiryDataBuffer.\r
+                                         If FALSE, then the standard inquiry data is\r
+                                         returned in InquiryDataBuffer.\r
+\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
+EFIAPI\r
+ScsiInquiryCommand (\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                  *InquiryDataBuffer,    OPTIONAL\r
+  IN OUT UINT32                *InquiryDataLength,\r
+  IN     BOOLEAN               EnableVitalProductData\r
+  )\r
+{\r
+  return ScsiInquiryCommandEx (\r
+           ScsiIo,\r
+           Timeout,\r
+           SenseData,\r
+           SenseDataLength,\r
+           HostAdapterStatus,\r
+           TargetStatus,\r
+           InquiryDataBuffer,\r
+           InquiryDataLength,\r
+           EnableVitalProductData,\r
+           0\r
+           );\r
+}\r
+\r
 /**\r
   Execute Mode Sense(10) SCSI command on a specific SCSI target.\r
 \r
@@ -315,6 +452,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
@@ -331,7 +475,7 @@ ScsiInquiryCommand (
                                      If SenseDataLength is 0, then this parameter\r
                                      is optional and may be NULL.\r
   @param[in, out]  SenseDataLength   On input, the length in bytes of the SenseData buffer.\r
-                                     On output, the number of bytes written to the SenseData buffer. \r
+                                     On output, the number of bytes written to the SenseData buffer.\r
   @param[out]     HostAdapterStatus  The status of the SCSI Host Controller that\r
                                      produces the SCSI bus containing the SCSI target\r
                                      specified by ScsiIo when the SCSI Request Packet\r
@@ -347,39 +491,40 @@ ScsiInquiryCommand (
                                      execution of the SCSI Request Packet.  This\r
                                      buffer must be allocated by the caller. If\r
                                      DataLength is 0, then this parameter is optional\r
-                                     and may be NULL. \r
+                                     and may be NULL.\r
   @param[in, out]  DataLength        On input, a pointer to the length in bytes of\r
                                      the DataBuffer buffer.  On output, a pointer\r
                                      to the number of bytes written to the DataBuffer\r
-                                     buffer. \r
+                                     buffer.\r
   @param[in]      DBDField           Specifies the DBD field of the CDB for this SCSI Command.\r
-  @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 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
+  @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 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
@@ -399,9 +544,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
@@ -422,14 +564,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
@@ -463,6 +602,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
@@ -477,6 +620,7 @@ ScsiModeSense10Command (
   @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
@@ -491,9 +635,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
@@ -513,11 +654,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
@@ -547,6 +684,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
@@ -557,16 +702,17 @@ ScsiRequestSenseCommand (
   @param[in, out] DataLength           The length of data buffer.\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_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
@@ -584,9 +730,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
@@ -607,11 +750,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
@@ -649,6 +788,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
@@ -659,16 +806,17 @@ ScsiReadCapacityCommand (
   @param[in, out] DataLength           The length of data buffer.\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_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
@@ -686,12 +834,15 @@ 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
+  ASSERT (SenseDataLength != NULL);\r
+  ASSERT (HostAdapterStatus != NULL);\r
+  ASSERT (TargetStatus != NULL);\r
+  ASSERT (DataLength != NULL);\r
+  ASSERT (ScsiIo != NULL);\r
+\r
   ZeroMem (&CommandPacket, sizeof (EFI_SCSI_IO_SCSI_REQUEST_PACKET));\r
   ZeroMem (Cdb, 16);\r
 \r
@@ -703,9 +854,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
@@ -747,6 +895,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
@@ -757,17 +912,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          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
@@ -786,9 +942,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
@@ -809,17 +962,9 @@ 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
-  Cdb[2]                        = (UINT8) (StartLba >> 24);\r
-  Cdb[3]                        = (UINT8) (StartLba >> 16);\r
-  Cdb[4]                        = (UINT8) (StartLba >> 8);\r
-  Cdb[5]                        = (UINT8) (StartLba & 0xff);\r
-  Cdb[7]                        = (UINT8) (SectorSize >> 8);\r
-  Cdb[8]                        = (UINT8) (SectorSize & 0xff);\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
@@ -850,6 +995,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
@@ -859,17 +1012,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          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
@@ -888,9 +1042,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
@@ -911,17 +1062,9 @@ 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
-  Cdb[2]                        = (UINT8) (StartLba >> 24);\r
-  Cdb[3]                        = (UINT8) (StartLba >> 16);\r
-  Cdb[4]                        = (UINT8) (StartLba >> 8);\r
-  Cdb[5]                        = (UINT8) StartLba;\r
-  Cdb[7]                        = (UINT8) (SectorSize >> 8);\r
-  Cdb[8]                        = (UINT8) SectorSize;\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
@@ -937,3 +1080,982 @@ ScsiWrite10Command (
   return Status;\r
 }\r
 \r
+/**\r
+  Execute Read(16) SCSI command on a specific SCSI target.\r
+\r
+  Executes the SCSI Read(16) command on the SCSI target specified by ScsiIo.\r
+  If Timeout is zero, then this function waits indefinitely for the command to complete.\r
+  If Timeout is greater than zero, then the command is executed and will timeout\r
+  after Timeout 100 ns units.  The StartLba and SectorSize parameters are used to\r
+  construct the CDB for this SCSI command.\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 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
+  @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 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
+EFIAPI\r
+ScsiRead16Command (\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
+  )\r
+{\r
+  EFI_SCSI_IO_SCSI_REQUEST_PACKET CommandPacket;\r
+  EFI_STATUS                      Status;\r
+  UINT8                           Cdb[EFI_SCSI_OP_LENGTH_SIXTEEN];\r
+\r
+  ASSERT (SenseDataLength != NULL);\r
+  ASSERT (HostAdapterStatus != NULL);\r
+  ASSERT (TargetStatus != NULL);\r
+  ASSERT (DataLength != NULL);\r
+  ASSERT (ScsiIo != NULL);\r
+\r
+  ZeroMem (&CommandPacket, sizeof (EFI_SCSI_IO_SCSI_REQUEST_PACKET));\r
+  ZeroMem (Cdb, EFI_SCSI_OP_LENGTH_SIXTEEN);\r
+\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
+  Status                        = ScsiIo->ExecuteScsiCommand (ScsiIo, &CommandPacket, NULL);\r
+\r
+  *HostAdapterStatus            = CommandPacket.HostAdapterStatus;\r
+  *TargetStatus                 = CommandPacket.TargetStatus;\r
+  *SenseDataLength              = CommandPacket.SenseDataLength;\r
+  *DataLength                   = CommandPacket.InTransferLength;\r
+\r
+  return Status;\r
+}\r
+\r
+\r
+/**\r
+  Execute Write(16) SCSI command on a specific SCSI target.\r
+\r
+  Executes the SCSI Write(16) command on the SCSI target specified by ScsiIo.\r
+  If Timeout is zero, then this function waits indefinitely for the command to complete.\r
+  If Timeout is greater than zero, then the command is executed and will timeout after\r
+  Timeout 100 ns units.  The StartLba and SectorSize parameters are used to construct\r
+  the CDB for this SCSI command.\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 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
+  @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 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
+EFIAPI\r
+ScsiWrite16Command (\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
+  )\r
+{\r
+  EFI_SCSI_IO_SCSI_REQUEST_PACKET CommandPacket;\r
+  EFI_STATUS                      Status;\r
+  UINT8                           Cdb[EFI_SCSI_OP_LENGTH_SIXTEEN];\r
+\r
+  ASSERT (SenseDataLength != NULL);\r
+  ASSERT (HostAdapterStatus != NULL);\r
+  ASSERT (TargetStatus != NULL);\r
+  ASSERT (DataLength != NULL);\r
+  ASSERT (ScsiIo != NULL);\r
+\r
+  ZeroMem (&CommandPacket, sizeof (EFI_SCSI_IO_SCSI_REQUEST_PACKET));\r
+  ZeroMem (Cdb, EFI_SCSI_OP_LENGTH_SIXTEEN);\r
+\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
+  Status                        = ScsiIo->ExecuteScsiCommand (ScsiIo, &CommandPacket, NULL);\r
+\r
+  *HostAdapterStatus            = CommandPacket.HostAdapterStatus;\r
+  *TargetStatus                 = CommandPacket.TargetStatus;\r
+  *SenseDataLength              = CommandPacket.SenseDataLength;\r
+  *DataLength                   = CommandPacket.OutTransferLength;\r
+\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_NOTIFY,\r
+                  ScsiLibNotify,\r
+                  Context,\r
+                  &SelfEvent\r
+                  );\r
+  if (EFI_ERROR(Status)) {\r
+    goto ErrorExit;\r
+  }\r
+\r
+  Status = ScsiIo->ExecuteScsiCommand (ScsiIo, CommandPacket, SelfEvent);\r
+  if (EFI_ERROR(Status)) {\r
+    //\r
+    // Since ScsiLibNotify() will not be signaled if ExecuteScsiCommand()\r
+    // returns with error, close the event here.\r
+    //\r
+    gBS->CloseEvent (SelfEvent);\r
+    goto ErrorExit;\r
+  } else {\r
+    return EFI_SUCCESS;\r
+  }\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_NOTIFY,\r
+                  ScsiLibNotify,\r
+                  Context,\r
+                  &SelfEvent\r
+                  );\r
+  if (EFI_ERROR(Status)) {\r
+    goto ErrorExit;\r
+  }\r
+\r
+  Status = ScsiIo->ExecuteScsiCommand (ScsiIo, CommandPacket, SelfEvent);\r
+  if (EFI_ERROR(Status)) {\r
+    //\r
+    // Since ScsiLibNotify() will not be signaled if ExecuteScsiCommand()\r
+    // returns with error, close the event here.\r
+    //\r
+    gBS->CloseEvent (SelfEvent);\r
+    goto ErrorExit;\r
+  } else {\r
+    return EFI_SUCCESS;\r
+  }\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_NOTIFY,\r
+                  ScsiLibNotify,\r
+                  Context,\r
+                  &SelfEvent\r
+                  );\r
+  if (EFI_ERROR(Status)) {\r
+    goto ErrorExit;\r
+  }\r
+\r
+  Status = ScsiIo->ExecuteScsiCommand (ScsiIo, CommandPacket, SelfEvent);\r
+  if (EFI_ERROR(Status)) {\r
+    //\r
+    // Since ScsiLibNotify() will not be signaled if ExecuteScsiCommand()\r
+    // returns with error, close the event here.\r
+    //\r
+    gBS->CloseEvent (SelfEvent);\r
+    goto ErrorExit;\r
+  } else {\r
+    return EFI_SUCCESS;\r
+  }\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_NOTIFY,\r
+                  ScsiLibNotify,\r
+                  Context,\r
+                  &SelfEvent\r
+                  );\r
+  if (EFI_ERROR(Status)) {\r
+    goto ErrorExit;\r
+  }\r
+\r
+  Status = ScsiIo->ExecuteScsiCommand (ScsiIo, CommandPacket, SelfEvent);\r
+  if (EFI_ERROR(Status)) {\r
+    //\r
+    // Since ScsiLibNotify() will not be signaled if ExecuteScsiCommand()\r
+    // returns with error, close the event here.\r
+    //\r
+    gBS->CloseEvent (SelfEvent);\r
+    goto ErrorExit;\r
+  } else {\r
+    return EFI_SUCCESS;\r
+  }\r
+\r
+ErrorExit:\r
+  if (Context != NULL) {\r
+    FreePool (Context);\r
+  }\r
+\r
+  return Status;\r
+}\r