X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdeModulePkg%2FBus%2FUsb%2FUsbMassStorageDxe%2FUsbMassBoot.c;fp=MdeModulePkg%2FBus%2FUsb%2FUsbMassStorageDxe%2FUsbMassBoot.c;h=613008bde76837f174b37335c5a7e47d4bdae30f;hp=a8b6a1c5f13c9cca81490650ddb6c0a5ca013fa5;hb=a662afb5b023a187ef638d3cb0e0c313ad39a7fc;hpb=a676a24656546a7fc722868fb75cd178c003056a

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
index a8b6a1c5f1..613008bde7 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
@@ -2,7 +2,7 @@
   Implementation of the command set of USB Mass Storage Specification
   for Bootability, Revision 1.0.
 
-Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -630,8 +630,10 @@ UsbBootGetParams (
 {
   EFI_BLOCK_IO_MEDIA          *Media;
   EFI_STATUS                  Status;
+  UINT8                       CmdSet;
 
   Media  = &(UsbMass->BlockIoMedia);
+  CmdSet = ((EFI_USB_INTERFACE_DESCRIPTOR *) (UsbMass->Context))->InterfaceSubClass;
 
   Status = UsbBootInquiry (UsbMass);
   if (EFI_ERROR (Status)) {
@@ -666,9 +668,18 @@ UsbBootGetParams (
     Media->BlockSize        = 0x0800;
   }
 
-  Status = UsbBootDetectMedia (UsbMass);
+  if ((UsbMass->Pdt != USB_PDT_CDROM) && (CmdSet == USB_MASS_STORE_SCSI)) {
+    //
+    // ModeSense is required for the device with PDT of 0x00/0x07/0x0E,
+    // which is from [MassStorageBootabilitySpec-Page7].
+    // ModeSense(10) is useless here, while ModeSense(6) defined in SCSI
+    // could get the information of WriteProtected.
+    // Since not all device support this command, so skip if fail.
+    //
+    UsbScsiModeSense (UsbMass);
+  }
 
-  return Status;
+  return UsbBootReadCapacity (UsbMass);
 }
 
 
@@ -699,7 +710,7 @@ UsbBootDetectMedia (
   CmdSet = ((EFI_USB_INTERFACE_DESCRIPTOR *) (UsbMass->Context))->InterfaceSubClass;
 
   Status = UsbBootIsUnitReady (UsbMass);
-  if (EFI_ERROR (Status) && (Status != EFI_MEDIA_CHANGED)) {
+  if (EFI_ERROR (Status)) {
     goto ON_ERROR;
   }