diff options
| author | Feng Tian <feng.tian@intel.com> | 2016-11-07 15:46:16 +0800 |
|---|---|---|
| committer | Feng Tian <feng.tian@intel.com> | 2016-11-14 14:10:30 +0800 |
| commit | b17d5507cfdfd10c4f1f5911ffe75fdc49fafa37 (patch) | |
| tree | 6e274bdc66c6d704785023702ebc0f13aef0609f | |
| parent | f56ae7bf82bf32dd0ec9cafb9f632511813c823e (diff) | |
| download | edk2-platforms-b17d5507cfdfd10c4f1f5911ffe75fdc49fafa37.tar.xz | |
MdeModulePkg/UsbMass: Revert changes of removing retry logic
This patch is used to revert changes done in commit 17f3e942
bc527fbd75068d2d5752b6af54917487 - "MdeModulePkg/UsbMass: Not
retry if usb bot transfer execution fail"
It's because Usb Floppy will report DEVICE_ERROR for the first
several cmds when it need spin up. so retry logic makes sense.
Cc: Star Zeng <star.zeng@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Feng Tian <feng.tian@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
| -rw-r--r-- | MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c | 7 | ||||
| -rw-r--r-- | MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c | 8 |
2 files changed, 3 insertions, 12 deletions
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c index d5de1ac7d1..0c46f888eb 100644 --- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c +++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c @@ -189,11 +189,6 @@ UsbBootExecCmd ( return EFI_TIMEOUT;
}
- if (Status == EFI_DEVICE_ERROR) {
- DEBUG ((EFI_D_ERROR, "UsbBootExecCmd: Device Error to Exec 0x%x Cmd\n", *(UINT8 *)Cmd));
- return EFI_DEVICE_ERROR;
- }
-
//
// If ExecCommand() returns no error and CmdResult is success,
// then the commnad transfer is successful.
@@ -276,7 +271,7 @@ UsbBootExecCmdWithRetry ( DataLen,
Timeout
);
- if (Status == EFI_SUCCESS || Status == EFI_MEDIA_CHANGED || Status == EFI_NO_MEDIA || Status == EFI_DEVICE_ERROR) {
+ if (Status == EFI_SUCCESS || Status == EFI_MEDIA_CHANGED || Status == EFI_NO_MEDIA) {
break;
}
//
diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c index 4c29b61121..4bb7222b89 100644 --- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c +++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c @@ -2,7 +2,7 @@ Implementation of the USB mass storage Bulk-Only Transport protocol,
according to USB Mass Storage Class Bulk-Only Transport, Revision 1.0.
-Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2011, 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
@@ -432,11 +432,7 @@ UsbBotExecCommand ( // whether it succeeds or fails.
//
TransLen = (UINTN) DataLen;
- Status = UsbBotDataTransfer (UsbBot, DataDir, Data, &TransLen, Timeout);
- if (Status == EFI_DEVICE_ERROR) {
- DEBUG ((EFI_D_ERROR, "UsbBotExecCommand: UsbBotDataTransfer (%r)\n", Status));
- return Status;
- }
+ UsbBotDataTransfer (UsbBot, DataDir, Data, &TransLen, Timeout);
//
// Get the status, if that succeeds, interpret the result
|