]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
Change Partition/ScsiDxe driver to produce Block IO revision 3.
[mirror_edk2.git] / MdeModulePkg / Bus / Scsi / ScsiDiskDxe / ScsiDisk.c
index 1edff92c8e1018088eb8dc5b521f8fbea0fb8607..f0e10997daa885ea9c39099ae5ae5c7d9bdd27b9 100644 (file)
@@ -1,7 +1,7 @@
 /** @file\r
   SCSI disk driver that layers on every SCSI IO protocol in the system.\r
 \r
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -187,6 +187,7 @@ ScsiDiskDriverBindingStart (
 \r
   ScsiDiskDevice->Signature         = SCSI_DISK_DEV_SIGNATURE;\r
   ScsiDiskDevice->ScsiIo            = ScsiIo;\r
+  ScsiDiskDevice->BlkIo.Revision    = EFI_BLOCK_IO_PROTOCOL_REVISION3;\r
   ScsiDiskDevice->BlkIo.Media       = &ScsiDiskDevice->BlkIoMedia;\r
   ScsiDiskDevice->BlkIo.Reset       = ScsiDiskReset;\r
   ScsiDiskDevice->BlkIo.ReadBlocks  = ScsiDiskReadBlocks;\r
@@ -398,12 +399,22 @@ ScsiDiskReset (
 \r
   Status          = ScsiDiskDevice->ScsiIo->ResetDevice (ScsiDiskDevice->ScsiIo);\r
 \r
+  if (EFI_ERROR (Status)) {\r
+    Status = EFI_DEVICE_ERROR;\r
+    goto Done;\r
+  }\r
+\r
   if (!ExtendedVerification) {\r
     goto Done;\r
   }\r
 \r
   Status = ScsiDiskDevice->ScsiIo->ResetBus (ScsiDiskDevice->ScsiIo);\r
 \r
+  if (EFI_ERROR (Status)) {\r
+    Status = EFI_DEVICE_ERROR;\r
+    goto Done;\r
+  }\r
+\r
 Done:\r
   gBS->RestoreTPL (OldTpl);\r
   return Status;\r
@@ -444,17 +455,8 @@ ScsiDiskReadBlocks (
   BOOLEAN             MediaChange;\r
   EFI_TPL             OldTpl;\r
 \r
-  MediaChange = FALSE;\r
-  if (Buffer == NULL) {\r
-    return EFI_INVALID_PARAMETER;\r
-  }\r
-\r
-  if (BufferSize == 0) {\r
-    return EFI_SUCCESS;\r
-  }\r
-\r
-  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
-\r
+  MediaChange    = FALSE;\r
+  OldTpl         = gBS->RaiseTPL (TPL_CALLBACK);\r
   ScsiDiskDevice = SCSI_DISK_DEV_FROM_THIS (This);\r
 \r
   if (!IS_DEVICE_FIXED(ScsiDiskDevice)) {\r
@@ -492,6 +494,16 @@ ScsiDiskReadBlocks (
     goto Done;\r
   }\r
 \r
+  if (Buffer == NULL) {\r
+    Status = EFI_INVALID_PARAMETER;\r
+    goto Done;\r
+  }\r
+\r
+  if (BufferSize == 0) {\r
+    Status = EFI_SUCCESS;\r
+    goto Done;\r
+  }\r
+\r
   if (BufferSize % BlockSize != 0) {\r
     Status = EFI_BAD_BUFFER_SIZE;\r
     goto Done;\r
@@ -559,17 +571,8 @@ ScsiDiskWriteBlocks (
   BOOLEAN             MediaChange;\r
   EFI_TPL             OldTpl;\r
 \r
-  MediaChange = FALSE;\r
-  if (Buffer == NULL) {\r
-    return EFI_INVALID_PARAMETER;\r
-  }\r
-\r
-  if (BufferSize == 0) {\r
-    return EFI_SUCCESS;\r
-  }\r
-\r
-  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
-\r
+  MediaChange    = FALSE;\r
+  OldTpl         = gBS->RaiseTPL (TPL_CALLBACK);\r
   ScsiDiskDevice = SCSI_DISK_DEV_FROM_THIS (This);\r
 \r
   if (!IS_DEVICE_FIXED(ScsiDiskDevice)) {\r
@@ -607,6 +610,16 @@ ScsiDiskWriteBlocks (
     goto Done;\r
   }\r
 \r
+  if (BufferSize == 0) {\r
+    Status = EFI_SUCCESS;\r
+    goto Done;\r
+  }\r
+\r
+  if (Buffer == NULL) {\r
+    Status = EFI_INVALID_PARAMETER;\r
+    goto Done;\r
+  }\r
+\r
   if (BufferSize % BlockSize != 0) {\r
     Status = EFI_BAD_BUFFER_SIZE;\r
     goto Done;\r
@@ -863,15 +876,18 @@ ScsiDiskInquiryDevice (
      OUT  BOOLEAN         *NeedRetry\r
   )\r
 {\r
-  UINT32              InquiryDataLength;\r
-  UINT8               SenseDataLength;\r
-  UINT8               HostAdapterStatus;\r
-  UINT8               TargetStatus;\r
-  EFI_SCSI_SENSE_DATA *SenseDataArray;\r
-  UINTN               NumberOfSenseKeys;\r
-  EFI_STATUS          Status;\r
-  UINT8               MaxRetry;\r
-  UINT8               Index;\r
+  UINT32                                InquiryDataLength;\r
+  UINT8                                 SenseDataLength;\r
+  UINT8                                 HostAdapterStatus;\r
+  UINT8                                 TargetStatus;\r
+  EFI_SCSI_SENSE_DATA                   *SenseDataArray;\r
+  UINTN                                 NumberOfSenseKeys;\r
+  EFI_STATUS                            Status;\r
+  UINT8                                 MaxRetry;\r
+  UINT8                                 Index;\r
+  EFI_SCSI_SUPPORTED_VPD_PAGES_VPD_PAGE SupportedVpdPages;\r
+  EFI_SCSI_BLOCK_LIMITS_VPD_PAGE        BlockLimits;\r
+  UINTN                                 PageLength;\r
 \r
   InquiryDataLength = sizeof (EFI_SCSI_INQUIRY_DATA);\r
   SenseDataLength   = 0;\r
@@ -891,27 +907,86 @@ ScsiDiskInquiryDevice (
     // no need to check HostAdapterStatus and TargetStatus\r
     //\r
   if ((Status == EFI_SUCCESS) || (Status == EFI_WARN_BUFFER_TOO_SMALL)) {\r
-     ParseInquiryData (ScsiDiskDevice);\r
-     return EFI_SUCCESS;\r
\r
-   } else if (Status == EFI_NOT_READY) {\r
-     *NeedRetry = TRUE;\r
-     return EFI_DEVICE_ERROR;\r
\r
-   } else if ((Status == EFI_INVALID_PARAMETER) || (Status == EFI_UNSUPPORTED)) {\r
-     *NeedRetry = FALSE;\r
-     return EFI_DEVICE_ERROR;\r
-   }\r
-   //\r
-   // go ahead to check HostAdapterStatus and TargetStatus\r
-   // (EFI_TIMEOUT, EFI_DEVICE_ERROR)\r
-   //\r
+    ParseInquiryData (ScsiDiskDevice);\r
+\r
+    if (ScsiDiskDevice->DeviceType == EFI_SCSI_TYPE_DISK) {\r
+      //\r
+      // Check whether the device supports Block Limits VPD page (0xB0)\r
+      //\r
+      ZeroMem (&SupportedVpdPages, sizeof (SupportedVpdPages));\r
+      InquiryDataLength = sizeof (SupportedVpdPages);\r
+      SenseDataLength   = 0;\r
+      Status = ScsiInquiryCommandEx (\r
+                 ScsiDiskDevice->ScsiIo,\r
+                 EFI_TIMER_PERIOD_SECONDS (1),\r
+                 NULL,\r
+                 &SenseDataLength,\r
+                 &HostAdapterStatus,\r
+                 &TargetStatus,\r
+                 (VOID *) &SupportedVpdPages,\r
+                 &InquiryDataLength,\r
+                 TRUE,\r
+                 EFI_SCSI_PAGE_CODE_SUPPORTED_VPD\r
+                 );\r
+      if (!EFI_ERROR (Status)) {\r
+        PageLength = (SupportedVpdPages.PageLength2 << 8)\r
+                   |  SupportedVpdPages.PageLength1;\r
+        for (Index = 0; Index < PageLength; Index++) {\r
+          if (SupportedVpdPages.SupportedVpdPageList[Index] == EFI_SCSI_PAGE_CODE_BLOCK_LIMITS_VPD) {\r
+            break;\r
+          }\r
+        }\r
+\r
+        //\r
+        // Query the Block Limits VPD page\r
+        //\r
+        if (Index < PageLength) {\r
+          ZeroMem (&BlockLimits, sizeof (BlockLimits));\r
+          InquiryDataLength = sizeof (BlockLimits);\r
+          SenseDataLength   = 0;\r
+          Status = ScsiInquiryCommandEx (\r
+                     ScsiDiskDevice->ScsiIo,\r
+                     EFI_TIMER_PERIOD_SECONDS (1),\r
+                     NULL,\r
+                     &SenseDataLength,\r
+                     &HostAdapterStatus,\r
+                     &TargetStatus,\r
+                     (VOID *) &BlockLimits,\r
+                     &InquiryDataLength,\r
+                     TRUE,\r
+                     EFI_SCSI_PAGE_CODE_BLOCK_LIMITS_VPD\r
+                     );\r
+          if (!EFI_ERROR (Status)) {\r
+            ScsiDiskDevice->BlkIo.Media->OptimalTransferLengthGranularity = \r
+              (BlockLimits.OptimalTransferLengthGranularity2 << 8) |\r
+               BlockLimits.OptimalTransferLengthGranularity1;\r
+          }\r
+        }\r
+      }\r
+    }\r
+  }\r
+\r
+  if (!EFI_ERROR (Status)) {\r
+    return EFI_SUCCESS;\r
+\r
+  } else if (Status == EFI_NOT_READY) {\r
+    *NeedRetry = TRUE;\r
+    return EFI_DEVICE_ERROR;\r
  \r
-   Status = CheckHostAdapterStatus (HostAdapterStatus);\r
-   if ((Status == EFI_TIMEOUT) || (Status == EFI_NOT_READY)) {\r
-     *NeedRetry = TRUE;\r
-     return EFI_DEVICE_ERROR;\r
-   } else if (Status == EFI_DEVICE_ERROR) {\r
+  } else if ((Status == EFI_INVALID_PARAMETER) || (Status == EFI_UNSUPPORTED)) {\r
+    *NeedRetry = FALSE;\r
+    return EFI_DEVICE_ERROR;\r
+  }\r
+  //\r
+  // go ahead to check HostAdapterStatus and TargetStatus\r
+  // (EFI_TIMEOUT, EFI_DEVICE_ERROR)\r
+  //\r
+\r
+  Status = CheckHostAdapterStatus (HostAdapterStatus);\r
+  if ((Status == EFI_TIMEOUT) || (Status == EFI_NOT_READY)) {\r
+    *NeedRetry = TRUE;\r
+    return EFI_DEVICE_ERROR;\r
+  } else if (Status == EFI_DEVICE_ERROR) {\r
       //\r
       // reset the scsi channel\r
       //\r
@@ -1180,7 +1255,6 @@ ScsiDiskReadCapacity (
   UINT8                         Index;\r
   UINT8                         MaxRetry;\r
   UINT8                         SenseDataLength;\r
-  UINT8                         ScsiVersion;\r
   UINT32                        DataLength10;\r
   UINT32                        DataLength16;\r
   EFI_SCSI_DISK_CAPACITY_DATA   CapacityData10;\r
@@ -1195,40 +1269,47 @@ ScsiDiskReadCapacity (
 \r
   *NumberOfSenseKeys  = 0;\r
   *NeedRetry          = FALSE;\r
-  ScsiVersion         = (UINT8)(ScsiDiskDevice->InquiryData.Version & 0x03);\r
 \r
-  if (ScsiVersion < SCSI_COMMAND_VERSION_3) {\r
+  //\r
+  // submit Read Capacity(10) Command. If it returns capacity of FFFFFFFFh, \r
+  // 16 byte command should be used to access large hard disk >2TB\r
+  //\r
+  CommandStatus = ScsiReadCapacityCommand (\r
+                    ScsiDiskDevice->ScsiIo,\r
+                    EFI_TIMER_PERIOD_SECONDS(1),\r
+                    NULL,\r
+                    &SenseDataLength,\r
+                    &HostAdapterStatus,\r
+                    &TargetStatus,\r
+                    (VOID *) &CapacityData10,\r
+                    &DataLength10,\r
+                    FALSE\r
+                    );\r
+\r
+  ScsiDiskDevice->Cdb16Byte = FALSE;\r
+  if ((!EFI_ERROR (CommandStatus)) && (CapacityData10.LastLba3 == 0xff) && (CapacityData10.LastLba2 == 0xff) &&\r
+      (CapacityData10.LastLba1 == 0xff) && (CapacityData10.LastLba0 == 0xff)) {\r
+    //\r
+    // use Read Capacity (16), Read (16) and Write (16) next when hard disk size > 2TB\r
     //\r
-    // submit Read Capacity(10) Command. in this call,not request sense data\r
+    ScsiDiskDevice->Cdb16Byte = TRUE;\r
     //\r
-    CommandStatus = ScsiReadCapacityCommand (\r
+    // submit Read Capacity(16) Command to get parameter LogicalBlocksPerPhysicalBlock\r
+    // and LowestAlignedLba\r
+    //\r
+    CommandStatus = ScsiReadCapacity16Command (\r
                       ScsiDiskDevice->ScsiIo,\r
-                      EFI_TIMER_PERIOD_SECONDS(1),\r
+                      EFI_TIMER_PERIOD_SECONDS (1),\r
                       NULL,\r
                       &SenseDataLength,\r
                       &HostAdapterStatus,\r
                       &TargetStatus,\r
-                      (VOID *) &CapacityData10,\r
-                      &DataLength10,\r
+                      (VOID *) &CapacityData16,\r
+                      &DataLength16,\r
                       FALSE\r
                       );\r
-    } else {\r
-      //\r
-      // submit Read Capacity(16) Command to get parameter LogicalBlocksPerPhysicalBlock\r
-      // and LowestAlignedLba\r
-      //\r
-      CommandStatus = ScsiReadCapacity16Command (\r
-                        ScsiDiskDevice->ScsiIo,\r
-                        EFI_TIMER_PERIOD_SECONDS (1),\r
-                        NULL,\r
-                        &SenseDataLength,\r
-                        &HostAdapterStatus,\r
-                        &TargetStatus,\r
-                        (VOID *) &CapacityData16,\r
-                        &DataLength16,\r
-                        FALSE\r
-                        );\r
-    }\r
+  }\r
+\r
     //\r
     // no need to check HostAdapterStatus and TargetStatus\r
     //\r
@@ -1423,7 +1504,7 @@ ScsiDiskRequestSenseKeys (
   UINT8               TargetStatus;\r
 \r
   FallStatus      = EFI_SUCCESS;\r
-  SenseDataLength = sizeof (EFI_SCSI_SENSE_DATA);\r
+  SenseDataLength = (UINT8) sizeof (EFI_SCSI_SENSE_DATA);\r
 \r
   ZeroMem (\r
     ScsiDiskDevice->SenseData,\r
@@ -1502,15 +1583,9 @@ GetMediaInfo (
   IN     EFI_SCSI_DISK_CAPACITY_DATA16  *Capacity16\r
   )\r
 {\r
-  UINT8       ScsiVersion;\r
   UINT8       *Ptr;\r
 \r
-  ScsiVersion    = (UINT8)(ScsiDiskDevice->InquiryData.Version & 0x03);\r
-  ScsiDiskDevice->BlkIo.Media->LowestAlignedLba               = 0;\r
-  ScsiDiskDevice->BlkIo.Media->LogicalBlocksPerPhysicalBlock  = 1;\r
-  \r
-\r
-  if (ScsiVersion < SCSI_COMMAND_VERSION_3) {\r
+  if (!ScsiDiskDevice->Cdb16Byte) {\r
     ScsiDiskDevice->BlkIo.Media->LastBlock =  (Capacity10->LastLba3 << 24) |\r
                                               (Capacity10->LastLba2 << 16) |\r
                                               (Capacity10->LastLba1 << 8)  |\r
@@ -1520,9 +1595,9 @@ GetMediaInfo (
                                              (Capacity10->BlockSize2 << 16) | \r
                                              (Capacity10->BlockSize1 << 8)  |\r
                                               Capacity10->BlockSize0;\r
-    ScsiDiskDevice->BlkIo.Revision = EFI_BLOCK_IO_PROTOCOL_REVISION;      \r
+    ScsiDiskDevice->BlkIo.Media->LowestAlignedLba               = 0;\r
+    ScsiDiskDevice->BlkIo.Media->LogicalBlocksPerPhysicalBlock  = 0;\r
   } else {\r
-\r
     Ptr = (UINT8*)&ScsiDiskDevice->BlkIo.Media->LastBlock;\r
     *Ptr++ = Capacity16->LastLba0;\r
     *Ptr++ = Capacity16->LastLba1;\r
@@ -1532,18 +1607,17 @@ GetMediaInfo (
     *Ptr++ = Capacity16->LastLba5;\r
     *Ptr++ = Capacity16->LastLba6;\r
     *Ptr   = Capacity16->LastLba7;\r
-  \r
+\r
     ScsiDiskDevice->BlkIo.Media->BlockSize = (Capacity16->BlockSize3 << 24) |\r
                                              (Capacity16->BlockSize2 << 16) | \r
                                              (Capacity16->BlockSize1 << 8)  |\r
                                               Capacity16->BlockSize0;\r
 \r
-    ScsiDiskDevice->BlkIo.Media->LowestAlignedLba = (Capacity16->LowestAlignLogic2 << 8)|(Capacity16->LowestAlignLogic1);\r
-    ScsiDiskDevice->BlkIo.Media->LogicalBlocksPerPhysicalBlock  = Capacity16->LogicPerPhysical;\r
-    ScsiDiskDevice->BlkIo.Revision = EFI_BLOCK_IO_PROTOCOL_REVISION2;  \r
+    ScsiDiskDevice->BlkIo.Media->LowestAlignedLba = (Capacity16->LowestAlignLogic2 << 8) |\r
+                                                     Capacity16->LowestAlignLogic1;\r
+    ScsiDiskDevice->BlkIo.Media->LogicalBlocksPerPhysicalBlock  = (1 << Capacity16->LogicPerPhysical);\r
   }\r
 \r
-\r
   ScsiDiskDevice->BlkIo.Media->MediaPresent = TRUE;\r
   \r
   if (ScsiDiskDevice->DeviceType == EFI_SCSI_TYPE_DISK) {\r
@@ -1603,7 +1677,6 @@ ScsiDiskReadSectors (
   BOOLEAN             NeedRetry;\r
   EFI_SCSI_SENSE_DATA *SenseData;\r
   UINTN               NumberOfSenseKeys;\r
-  UINT8               ScsiVersion;\r
 \r
   SenseData         = NULL;\r
   NumberOfSenseKeys = 0;\r
@@ -1612,12 +1685,11 @@ ScsiDiskReadSectors (
 \r
   BlocksRemaining   = NumberOfBlocks;\r
   BlockSize         = ScsiDiskDevice->BlkIo.Media->BlockSize;\r
-  ScsiVersion       = (UINT8)(ScsiDiskDevice->InquiryData.Version & 0x03);\r
   \r
   //\r
   // limit the data bytes that can be transferred by one Read(10) or Read(16) Command\r
   //\r
-  if (ScsiVersion < SCSI_COMMAND_VERSION_3) {\r
+  if (!ScsiDiskDevice->Cdb16Byte) {\r
     MaxBlock         = 0xFFFF;\r
   } else {\r
     MaxBlock         = 0xFFFFFFFF;\r
@@ -1628,7 +1700,7 @@ ScsiDiskReadSectors (
   while (BlocksRemaining > 0) {\r
 \r
     if (BlocksRemaining <= MaxBlock) {\r
-      if (ScsiVersion < SCSI_COMMAND_VERSION_3) {\r
+      if (!ScsiDiskDevice->Cdb16Byte) {\r
         SectorCount = (UINT16) BlocksRemaining;\r
       } else {\r
         SectorCount = (UINT32) BlocksRemaining;\r
@@ -1642,8 +1714,8 @@ ScsiDiskReadSectors (
 \r
     MaxRetry  = 2;\r
     for (Index = 0; Index < MaxRetry; Index++) {\r
-      if (ScsiVersion >= SCSI_COMMAND_VERSION_3) {\r
-        Status = ScsiDiskRead16 (\r
+      if (!ScsiDiskDevice->Cdb16Byte) {\r
+        Status = ScsiDiskRead10 (\r
                   ScsiDiskDevice,\r
                   &NeedRetry,\r
                   &SenseData,\r
@@ -1651,11 +1723,11 @@ ScsiDiskReadSectors (
                   Timeout,\r
                   PtrBuffer,\r
                   &ByteCount,\r
-                  Lba,\r
+                  (UINT32) Lba,\r
                   SectorCount\r
                   );\r
       } else {\r
-        Status = ScsiDiskRead10 (\r
+        Status = ScsiDiskRead16 (\r
                   ScsiDiskDevice,\r
                   &NeedRetry,\r
                   &SenseData,\r
@@ -1663,7 +1735,7 @@ ScsiDiskReadSectors (
                   Timeout,\r
                   PtrBuffer,\r
                   &ByteCount,\r
-                  (UINT32) Lba,\r
+                  Lba,\r
                   SectorCount\r
                   );\r
       }\r
@@ -1727,7 +1799,6 @@ ScsiDiskWriteSectors (
   BOOLEAN             NeedRetry;\r
   EFI_SCSI_SENSE_DATA *SenseData;\r
   UINTN               NumberOfSenseKeys;\r
-  UINT8               ScsiVersion;\r
 \r
   SenseData         = NULL;\r
   NumberOfSenseKeys = 0;\r
@@ -1736,12 +1807,11 @@ ScsiDiskWriteSectors (
 \r
   BlocksRemaining   = NumberOfBlocks;\r
   BlockSize         = ScsiDiskDevice->BlkIo.Media->BlockSize;\r
-  ScsiVersion       = (UINT8)(ScsiDiskDevice->InquiryData.Version & 0x03);\r
 \r
   //\r
   // limit the data bytes that can be transferred by one Read(10) or Read(16) Command\r
   //\r
-  if (ScsiVersion < SCSI_COMMAND_VERSION_3) {\r
+  if (!ScsiDiskDevice->Cdb16Byte) {\r
     MaxBlock         = 0xFFFF;\r
   } else {\r
     MaxBlock         = 0xFFFFFFFF;\r
@@ -1752,7 +1822,7 @@ ScsiDiskWriteSectors (
   while (BlocksRemaining > 0) {\r
 \r
     if (BlocksRemaining <= MaxBlock) {\r
-      if (ScsiVersion < SCSI_COMMAND_VERSION_3) {\r
+      if (!ScsiDiskDevice->Cdb16Byte) {\r
         SectorCount = (UINT16) BlocksRemaining;\r
       } else {\r
         SectorCount = (UINT32) BlocksRemaining;\r
@@ -1765,8 +1835,8 @@ ScsiDiskWriteSectors (
     Timeout   = EFI_TIMER_PERIOD_SECONDS (2);\r
     MaxRetry  = 2;\r
     for (Index = 0; Index < MaxRetry; Index++) {\r
-      if (ScsiVersion >= SCSI_COMMAND_VERSION_3) {\r
-        Status = ScsiDiskWrite16 (\r
+      if (!ScsiDiskDevice->Cdb16Byte) {\r
+        Status = ScsiDiskWrite10 (\r
                   ScsiDiskDevice,\r
                   &NeedRetry,\r
                   &SenseData,\r
@@ -1774,11 +1844,11 @@ ScsiDiskWriteSectors (
                   Timeout,\r
                   PtrBuffer,\r
                   &ByteCount,\r
-                  Lba,\r
+                  (UINT32) Lba,\r
                   SectorCount\r
-                  );        \r
+                  );\r
       } else {\r
-        Status = ScsiDiskWrite10 (\r
+        Status = ScsiDiskWrite16 (\r
                   ScsiDiskDevice,\r
                   &NeedRetry,\r
                   &SenseData,\r
@@ -1786,9 +1856,9 @@ ScsiDiskWriteSectors (
                   Timeout,\r
                   PtrBuffer,\r
                   &ByteCount,\r
-                  (UINT32) Lba,\r
+                  Lba,\r
                   SectorCount\r
-                  );\r
+                  );         \r
         }\r
       if (!EFI_ERROR (Status)) {\r
         break;\r
@@ -2694,7 +2764,7 @@ AtapiIdentifyDevice (
   Cdb[0] = ATA_CMD_IDENTIFY_DEVICE;\r
   CommandPacket.Timeout = EFI_TIMER_PERIOD_SECONDS (1);\r
   CommandPacket.Cdb = Cdb;\r
-  CommandPacket.CdbLength = sizeof (Cdb);\r
+  CommandPacket.CdbLength = (UINT8) sizeof (Cdb);\r
   CommandPacket.InDataBuffer = &ScsiDiskDevice->IdentifyData;\r
   CommandPacket.InTransferLength = sizeof (ScsiDiskDevice->IdentifyData);\r
 \r