remove unnecessary retry logic from usb mass storage driver.

Signed-off-by: erictian
Reviewed-by: li-elvin


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12476 6f19259b-4bc3-4df7-8a09-765794883524

3 files changed, 48 insertions, 44 deletions

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
index 7fc35606db..e830517dd9 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
@@ -183,6 +183,12 @@ UsbBootExecCmd (
                            Timeout,

                            &CmdResult

                            );

+

+  if (Status == EFI_TIMEOUT) {

+    DEBUG ((EFI_D_ERROR, "UsbBootExecCmd: Timeout to Exec 0x%x Cmd\n", *(UINT8 *)Cmd));

+    return EFI_TIMEOUT;

+  }

+

   //

   // If ExecCommand() returns no error and CmdResult is success,

   // then the commnad transfer is successful.

@@ -191,9 +197,6 @@ UsbBootExecCmd (
     return EFI_SUCCESS;

   }

 

-  DEBUG ((EFI_D_INFO, "UsbBootExecCmd: Fail to Exec 0x%x Cmd /w %r\n",

-          *(UINT8 *)Cmd ,Status));

-

   //

   // If command execution failed, then retrieve error info via sense request.

   //

@@ -235,11 +238,30 @@ UsbBootExecCmdWithRetry (
 {

   EFI_STATUS                  Status;

   UINTN                       Retry;

-  UINT8                       Terminate;

+  EFI_EVENT                   TimeoutEvt;

+

+  Retry  = 0;

+  Status = EFI_SUCCESS;

+  Status = gBS->CreateEvent (

+                  EVT_TIMER,

+                  TPL_CALLBACK,

+                  NULL,

+                  NULL,

+                  &TimeoutEvt

+                  );

+  if (EFI_ERROR (Status)) {

+    return Status;

+  }

 

-  Status  = EFI_SUCCESS;

+  Status = gBS->SetTimer (TimeoutEvt, TimerRelative, EFI_TIMER_PERIOD_SECONDS(60));

+  if (EFI_ERROR (Status)) {

+    goto EXIT;

+  }

 

-  for (Retry = 0, Terminate = 0; Retry < USB_BOOT_COMMAND_RETRY; Retry++) {

+  //

+  // Execute the cmd and retry if it fails.

+  //

+  while (EFI_ERROR (gBS->CheckEvent (TimeoutEvt))) {

     Status = UsbBootExecCmd (

                UsbMass,

                Cmd,

@@ -249,18 +271,29 @@ UsbBootExecCmdWithRetry (
                DataLen,

                Timeout

                );

-    if (Status == EFI_SUCCESS || Status == EFI_MEDIA_CHANGED) {

+    if (Status == EFI_SUCCESS || Status == EFI_MEDIA_CHANGED || Status == EFI_NO_MEDIA) {

       break;

     }

     //

-    // If the device isn't ready, just wait for it without limit on retrial times.

+    // If the sense data shows the drive is not ready, we need execute the cmd again.

+    // We limit the upper boundary to 60 seconds.

+    //

+    if (Status == EFI_NOT_READY) {

+      continue;

+    }

+    //

+    // If the status is other error, then just retry 5 times.

     //

-    if (Status == EFI_NOT_READY  && Terminate < 3) {

-      Retry = 0;

-      Terminate++;

+    if (Retry++ >= USB_BOOT_COMMAND_RETRY) {

+      break;

     }

   }

 

+EXIT:

+  if (TimeoutEvt != NULL) {

+    gBS->CloseEvent (TimeoutEvt);

+  }

+

   return Status;

 }

 

@@ -527,18 +560,9 @@ UsbBootGetParams (
     Media->BlockSize        = 0x0800;

   }

 

-  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);

-  }

+  Status = UsbBootDetectMedia (UsbMass);

 

-  return UsbBootReadCapacity (UsbMass);

+  return Status;

 }

 

 

@@ -569,7 +593,7 @@ UsbBootDetectMedia (
   CmdSet = ((EFI_USB_INTERFACE_DESCRIPTOR *) (UsbMass->Context))->InterfaceSubClass;

 

   Status = UsbBootIsUnitReady (UsbMass);

-  if (EFI_ERROR (Status)) {

+  if (EFI_ERROR (Status) && (Status != EFI_MEDIA_CHANGED)) {

     goto ON_ERROR;

   }

 

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.h b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.h
index a39782cf8f..9961b7a0f5 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.h
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.h
@@ -72,7 +72,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 // Retry mass command times, set by experience

 //

 #define USB_BOOT_COMMAND_RETRY          5

-#define USB_BOOT_INIT_MEDIA_RETRY       5

 

 //

 // Wait for unit ready command, set by experience

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c
index 563c55960f..84cf31abce 100644
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassImpl.c
@@ -336,7 +336,6 @@ UsbMassInitMedia (
 {

   EFI_BLOCK_IO_MEDIA          *Media;

   EFI_STATUS                  Status;

-  UINTN                       Index;

 

   Media = &UsbMass->BlockIoMedia;

 

@@ -351,25 +350,7 @@ UsbMassInitMedia (
   Media->IoAlign          = 0;

   Media->MediaId          = 1;

 

-  //

-  // Some device may spend several seconds before it is ready.

-  // Try several times before giving up. Wait 5s at most.

-  //

-  Status = EFI_SUCCESS;

-

-  for (Index = 0; Index < USB_BOOT_INIT_MEDIA_RETRY; Index++) {

-

-    Status = UsbBootGetParams (UsbMass);

-    if ((Status != EFI_MEDIA_CHANGED) && (Status != EFI_NOT_READY) && (Status != EFI_TIMEOUT)) {

-      break;

-    }

-

-    Status = UsbBootIsUnitReady (UsbMass);

-    if (EFI_ERROR (Status)) {

-      gBS->Stall (USB_BOOT_RETRY_UNIT_READY_STALL * (Index + 1));

-    }

-  }

-

+  Status = UsbBootGetParams (UsbMass);

   return Status;

 }