diff options
| author | Hao Wu <hao.a.wu@intel.com> | 2015-12-23 01:37:22 +0000 |
|---|---|---|
| committer | hwu1225 <hwu1225@Edk2> | 2015-12-23 01:37:22 +0000 |
| commit | 8a3c29386ac147670dda1a2d772a3d90cfad70ef (patch) | |
| tree | 60b2bf2ace4c1f8269fe26e01a337d686c5629b8 | |
| parent | 5feebcef70a383b3fd50416cd968409b62bbbb6d (diff) | |
| download | edk2-platforms-8a3c29386ac147670dda1a2d772a3d90cfad70ef.tar.xz | |
MdeModulePkg ScsiDiskDxe: Add retry scheme for async SCSI I/O command
Some SCSI devices will return EFI_DEVICE_ERROR or EFI_TIMEOUT when the
data length of a SCSI I/O command is too large.
This commit will repeatedly retry sending the SCSI command with a data
length half of its previous value.
(Sync patch r19451 from main trunk.)
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/branches/UDK2015@19472 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c | 66 |
1 files changed, 58 insertions, 8 deletions
diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c index 70d1306ef3..1a8d83ecaf 100644 --- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c +++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c @@ -2674,15 +2674,40 @@ ScsiDiskAsyncReadSectors ( }
if (EFI_ERROR (Status)) {
//
- // Free the SCSI_BLKIO2_REQUEST structure only when the first SCSI
- // command fails. Otherwise, it will be freed in the callback function
- // ScsiDiskNotify().
+ // Some devices will return EFI_DEVICE_ERROR or EFI_TIMEOUT when the data
+ // length of a SCSI I/O command is too large.
+ // In this case, we retry sending the SCSI command with a data length
+ // half of its previous value.
//
+ if ((Status == EFI_DEVICE_ERROR) || (Status == EFI_TIMEOUT)) {
+ if ((MaxBlock > 1) && (SectorCount > 1)) {
+ MaxBlock = MIN (MaxBlock, SectorCount) >> 1;
+ continue;
+ }
+ }
+
if (IsListEmpty (&BlkIo2Req->ScsiRWQueue)) {
+ //
+ // Free the SCSI_BLKIO2_REQUEST structure only when there is no other
+ // SCSI sub-task running. Otherwise, it will be freed in the callback
+ // function ScsiDiskNotify().
+ //
RemoveEntryList (&BlkIo2Req->Link);
FreePool (BlkIo2Req);
+
+ //
+ // It is safe to return error status to the caller, since there is no
+ // previous SCSI sub-task executing.
+ //
+ return EFI_DEVICE_ERROR;
+ } else {
+ //
+ // There are previous SCSI commands still running, EFI_SUCCESS should
+ // be returned to make sure that the caller does not free resources
+ // still using by these SCSI commands.
+ //
+ return EFI_SUCCESS;
}
- return EFI_DEVICE_ERROR;
}
//
@@ -2837,15 +2862,40 @@ ScsiDiskAsyncWriteSectors ( }
if (EFI_ERROR (Status)) {
//
- // Free the SCSI_BLKIO2_REQUEST structure only when the first SCSI
- // command fails. Otherwise, it will be freed in the callback function
- // ScsiDiskNotify().
+ // Some devices will return EFI_DEVICE_ERROR or EFI_TIMEOUT when the data
+ // length of a SCSI I/O command is too large.
+ // In this case, we retry sending the SCSI command with a data length
+ // half of its previous value.
//
+ if ((Status == EFI_DEVICE_ERROR) || (Status == EFI_TIMEOUT)) {
+ if ((MaxBlock > 1) && (SectorCount > 1)) {
+ MaxBlock = MIN (MaxBlock, SectorCount) >> 1;
+ continue;
+ }
+ }
+
if (IsListEmpty (&BlkIo2Req->ScsiRWQueue)) {
+ //
+ // Free the SCSI_BLKIO2_REQUEST structure only when there is no other
+ // SCSI sub-task running. Otherwise, it will be freed in the callback
+ // function ScsiDiskNotify().
+ //
RemoveEntryList (&BlkIo2Req->Link);
FreePool (BlkIo2Req);
+
+ //
+ // It is safe to return error status to the caller, since there is no
+ // previous SCSI sub-task executing.
+ //
+ return EFI_DEVICE_ERROR;
+ } else {
+ //
+ // There are previous SCSI commands still running, EFI_SUCCESS should
+ // be returned to make sure that the caller does not free resources
+ // still using by these SCSI commands.
+ //
+ return EFI_SUCCESS;
}
- return EFI_DEVICE_ERROR;
}
//
|