MdeModulePkg/ScsiDisk:If the SCSI device target status is in CHECK_CONDITION, then...

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Tian, Feng <feng.tian@intel.com>
Reviewed-by: Fu, Siyuan <siyuan.fu@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15215 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
index 223dd4c475861e13aa47a211179a0b93d4e415e9..0eb1036e46335d8c2fbb127d9645754bedba324d 100644 (file)
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
@@ -1,7 +1,7 @@
 /** @file\r
   SCSI disk driver that layers on every SCSI IO protocol in the system.\r
 \r
-Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2014, 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
@@ -2085,25 +2085,81 @@ ScsiDiskRead10 (
 {\r
   UINT8       SenseDataLength;\r
   EFI_STATUS  Status;\r
+  EFI_STATUS  ReturnStatus;\r
   UINT8       HostAdapterStatus;\r
   UINT8       TargetStatus;\r
+  UINTN       Action;\r
 \r
   *NeedRetry          = FALSE;\r
   *NumberOfSenseKeys  = 0;\r
-  SenseDataLength     = 0;\r
-  Status = ScsiRead10Command (\r
-            ScsiDiskDevice->ScsiIo,\r
-            Timeout,\r
-            NULL,\r
-            &SenseDataLength,\r
-            &HostAdapterStatus,\r
-            &TargetStatus,\r
-            DataBuffer,\r
-            DataLength,\r
-            StartLba,\r
-            SectorSize\r
-            );\r
-  return Status;\r
+  Action              = ACTION_NO_ACTION;\r
+  SenseDataLength     = (UINT8) (ScsiDiskDevice->SenseDataNumber * sizeof (EFI_SCSI_SENSE_DATA));\r
+  ReturnStatus = ScsiRead10Command (\r
+                   ScsiDiskDevice->ScsiIo,\r
+                   Timeout,\r
+                   ScsiDiskDevice->SenseData,\r
+                   &SenseDataLength,\r
+                   &HostAdapterStatus,\r
+                   &TargetStatus,\r
+                   DataBuffer,\r
+                   DataLength,\r
+                   StartLba,\r
+                   SectorSize\r
+                   );\r
+\r
+  if (ReturnStatus == EFI_NOT_READY) {\r
+    *NeedRetry = TRUE;\r
+    return EFI_DEVICE_ERROR;\r
+  } else if ((ReturnStatus == EFI_INVALID_PARAMETER) || (ReturnStatus == EFI_UNSUPPORTED)) {\r
+    *NeedRetry = FALSE;\r
+    return ReturnStatus;\r
+  }\r
+\r
+  //\r
+  // go ahead to check HostAdapterStatus and TargetStatus\r
+  // (EFI_TIMEOUT, EFI_DEVICE_ERROR, EFI_WARN_BUFFER_TOO_SMALL)\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
+    ScsiDiskDevice->ScsiIo->ResetBus (ScsiDiskDevice->ScsiIo);\r
+    *NeedRetry = FALSE;\r
+    return EFI_DEVICE_ERROR;\r
+  }\r
+\r
+  Status = CheckTargetStatus (TargetStatus);\r
+  if (Status == EFI_NOT_READY) {\r
+    //\r
+    // reset the scsi device\r
+    //\r
+    ScsiDiskDevice->ScsiIo->ResetDevice (ScsiDiskDevice->ScsiIo);\r
+    *NeedRetry = TRUE;\r
+    return EFI_DEVICE_ERROR;\r
+  } else if (Status == EFI_DEVICE_ERROR) {\r
+    *NeedRetry = FALSE;\r
+    return EFI_DEVICE_ERROR;\r
+  }\r
+\r
+  if (TargetStatus == EFI_EXT_SCSI_STATUS_TARGET_CHECK_CONDITION) {\r
+    DEBUG ((EFI_D_VERBOSE, "ScsiDiskRead10: Check Condition happened!\n"));\r
+    Status = DetectMediaParsingSenseKeys (ScsiDiskDevice, ScsiDiskDevice->SenseData, SenseDataLength / sizeof (EFI_SCSI_SENSE_DATA), &Action);\r
+    if (EFI_ERROR (Status)) {\r
+      return Status;\r
+    } else if (Action == ACTION_RETRY_COMMAND_LATER) {\r
+      *NeedRetry = TRUE;\r
+      return EFI_DEVICE_ERROR;\r
+    } else {\r
+      *NeedRetry = FALSE;\r
+      return EFI_DEVICE_ERROR;\r
+    }\r
+  }\r
+\r
+  return ReturnStatus;\r
 }\r
 \r
 \r
@@ -2137,26 +2193,81 @@ ScsiDiskWrite10 (
   )\r
 {\r
   EFI_STATUS  Status;\r
+  EFI_STATUS  ReturnStatus;\r
   UINT8       SenseDataLength;\r
   UINT8       HostAdapterStatus;\r
   UINT8       TargetStatus;\r
+  UINTN       Action;\r
 \r
   *NeedRetry          = FALSE;\r
   *NumberOfSenseKeys  = 0;\r
-  SenseDataLength     = 0;\r
-  Status = ScsiWrite10Command (\r
-            ScsiDiskDevice->ScsiIo,\r
-            Timeout,\r
-            NULL,\r
-            &SenseDataLength,\r
-            &HostAdapterStatus,\r
-            &TargetStatus,\r
-            DataBuffer,\r
-            DataLength,\r
-            StartLba,\r
-            SectorSize\r
-            );\r
-  return Status;\r
+  Action              = ACTION_NO_ACTION;\r
+  SenseDataLength     = (UINT8) (ScsiDiskDevice->SenseDataNumber * sizeof (EFI_SCSI_SENSE_DATA));\r
+  ReturnStatus = ScsiWrite10Command (\r
+                   ScsiDiskDevice->ScsiIo,\r
+                   Timeout,\r
+                   ScsiDiskDevice->SenseData,\r
+                   &SenseDataLength,\r
+                   &HostAdapterStatus,\r
+                   &TargetStatus,\r
+                   DataBuffer,\r
+                   DataLength,\r
+                   StartLba,\r
+                   SectorSize\r
+                   );\r
+  if (ReturnStatus == EFI_NOT_READY) {\r
+    *NeedRetry = TRUE;\r
+    return EFI_DEVICE_ERROR;\r
+  } else if ((ReturnStatus == EFI_INVALID_PARAMETER) || (ReturnStatus == EFI_UNSUPPORTED)) {\r
+    *NeedRetry = FALSE;\r
+    return ReturnStatus;\r
+  }\r
+\r
+  //\r
+  // go ahead to check HostAdapterStatus and TargetStatus\r
+  // (EFI_TIMEOUT, EFI_DEVICE_ERROR, EFI_WARN_BUFFER_TOO_SMALL)\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
+    ScsiDiskDevice->ScsiIo->ResetBus (ScsiDiskDevice->ScsiIo);\r
+    *NeedRetry = FALSE;\r
+    return EFI_DEVICE_ERROR;\r
+  }\r
+\r
+  Status = CheckTargetStatus (TargetStatus);\r
+  if (Status == EFI_NOT_READY) {\r
+    //\r
+    // reset the scsi device\r
+    //\r
+    ScsiDiskDevice->ScsiIo->ResetDevice (ScsiDiskDevice->ScsiIo);\r
+    *NeedRetry = TRUE;\r
+    return EFI_DEVICE_ERROR;\r
+  } else if (Status == EFI_DEVICE_ERROR) {\r
+    *NeedRetry = FALSE;\r
+    return EFI_DEVICE_ERROR;\r
+  }\r
+\r
+  if (TargetStatus == EFI_EXT_SCSI_STATUS_TARGET_CHECK_CONDITION) {\r
+    DEBUG ((EFI_D_VERBOSE, "ScsiDiskWrite10: Check Condition happened!\n"));\r
+    Status = DetectMediaParsingSenseKeys (ScsiDiskDevice, ScsiDiskDevice->SenseData, SenseDataLength / sizeof (EFI_SCSI_SENSE_DATA), &Action);\r
+    if (EFI_ERROR (Status)) {\r
+      return Status;\r
+    } else if (Action == ACTION_RETRY_COMMAND_LATER) {\r
+      *NeedRetry = TRUE;\r
+      return EFI_DEVICE_ERROR;\r
+    } else {\r
+      *NeedRetry = FALSE;\r
+      return EFI_DEVICE_ERROR;\r
+    }\r
+  }\r
+\r
+  return ReturnStatus;\r
 }\r
 \r
 \r
@@ -2190,25 +2301,80 @@ ScsiDiskRead16 (
 {\r
   UINT8       SenseDataLength;\r
   EFI_STATUS  Status;\r
+  EFI_STATUS  ReturnStatus;\r
   UINT8       HostAdapterStatus;\r
   UINT8       TargetStatus;\r
+  UINTN       Action;\r
 \r
   *NeedRetry          = FALSE;\r
   *NumberOfSenseKeys  = 0;\r
-  SenseDataLength     = 0;\r
-  Status = ScsiRead16Command (\r
-            ScsiDiskDevice->ScsiIo,\r
-            Timeout,\r
-            NULL,\r
-            &SenseDataLength,\r
-            &HostAdapterStatus,\r
-            &TargetStatus,\r
-            DataBuffer,\r
-            DataLength,\r
-            StartLba,\r
-            SectorSize\r
-            );\r
-  return Status;\r
+  Action              = ACTION_NO_ACTION;\r
+  SenseDataLength     = (UINT8) (ScsiDiskDevice->SenseDataNumber * sizeof (EFI_SCSI_SENSE_DATA));\r
+  ReturnStatus = ScsiRead16Command (\r
+                   ScsiDiskDevice->ScsiIo,\r
+                   Timeout,\r
+                   ScsiDiskDevice->SenseData,\r
+                   &SenseDataLength,\r
+                   &HostAdapterStatus,\r
+                   &TargetStatus,\r
+                   DataBuffer,\r
+                   DataLength,\r
+                   StartLba,\r
+                   SectorSize\r
+                   );\r
+  if (ReturnStatus == EFI_NOT_READY) {\r
+    *NeedRetry = TRUE;\r
+    return EFI_DEVICE_ERROR;\r
+  } else if ((ReturnStatus == EFI_INVALID_PARAMETER) || (ReturnStatus == EFI_UNSUPPORTED)) {\r
+    *NeedRetry = FALSE;\r
+    return ReturnStatus;\r
+  }\r
+\r
+  //\r
+  // go ahead to check HostAdapterStatus and TargetStatus\r
+  // (EFI_TIMEOUT, EFI_DEVICE_ERROR, EFI_WARN_BUFFER_TOO_SMALL)\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
+    ScsiDiskDevice->ScsiIo->ResetBus (ScsiDiskDevice->ScsiIo);\r
+    *NeedRetry = FALSE;\r
+    return EFI_DEVICE_ERROR;\r
+  }\r
+\r
+  Status = CheckTargetStatus (TargetStatus);\r
+  if (Status == EFI_NOT_READY) {\r
+    //\r
+    // reset the scsi device\r
+    //\r
+    ScsiDiskDevice->ScsiIo->ResetDevice (ScsiDiskDevice->ScsiIo);\r
+    *NeedRetry = TRUE;\r
+    return EFI_DEVICE_ERROR;\r
+  } else if (Status == EFI_DEVICE_ERROR) {\r
+    *NeedRetry = FALSE;\r
+    return EFI_DEVICE_ERROR;\r
+  }\r
+\r
+  if (TargetStatus == EFI_EXT_SCSI_STATUS_TARGET_CHECK_CONDITION) {\r
+    DEBUG ((EFI_D_VERBOSE, "ScsiDiskRead16: Check Condition happened!\n"));\r
+    Status = DetectMediaParsingSenseKeys (ScsiDiskDevice, ScsiDiskDevice->SenseData, SenseDataLength / sizeof (EFI_SCSI_SENSE_DATA), &Action);\r
+    if (EFI_ERROR (Status)) {\r
+      return Status;\r
+    } else if (Action == ACTION_RETRY_COMMAND_LATER) {\r
+      *NeedRetry = TRUE;\r
+      return EFI_DEVICE_ERROR;\r
+    } else {\r
+      *NeedRetry = FALSE;\r
+      return EFI_DEVICE_ERROR;\r
+    }\r
+  }\r
+\r
+  return ReturnStatus;\r
 }\r
 \r
 \r
@@ -2242,26 +2408,81 @@ ScsiDiskWrite16 (
   )\r
 {\r
   EFI_STATUS  Status;\r
+  EFI_STATUS  ReturnStatus;\r
   UINT8       SenseDataLength;\r
   UINT8       HostAdapterStatus;\r
   UINT8       TargetStatus;\r
+  UINTN       Action;\r
 \r
   *NeedRetry          = FALSE;\r
   *NumberOfSenseKeys  = 0;\r
-  SenseDataLength     = 0;\r
-  Status = ScsiWrite16Command (\r
-            ScsiDiskDevice->ScsiIo,\r
-            Timeout,\r
-            NULL,\r
-            &SenseDataLength,\r
-            &HostAdapterStatus,\r
-            &TargetStatus,\r
-            DataBuffer,\r
-            DataLength,\r
-            StartLba,\r
-            SectorSize\r
-            );\r
-  return Status;\r
+  Action              = ACTION_NO_ACTION;\r
+  SenseDataLength     = (UINT8) (ScsiDiskDevice->SenseDataNumber * sizeof (EFI_SCSI_SENSE_DATA));\r
+  ReturnStatus = ScsiWrite16Command (\r
+                   ScsiDiskDevice->ScsiIo,\r
+                   Timeout,\r
+                   ScsiDiskDevice->SenseData,\r
+                   &SenseDataLength,\r
+                   &HostAdapterStatus,\r
+                   &TargetStatus,\r
+                   DataBuffer,\r
+                   DataLength,\r
+                   StartLba,\r
+                   SectorSize\r
+                   );\r
+  if (ReturnStatus == EFI_NOT_READY) {\r
+    *NeedRetry = TRUE;\r
+    return EFI_DEVICE_ERROR;\r
+  } else if ((ReturnStatus == EFI_INVALID_PARAMETER) || (ReturnStatus == EFI_UNSUPPORTED)) {\r
+    *NeedRetry = FALSE;\r
+    return ReturnStatus;\r
+  }\r
+\r
+  //\r
+  // go ahead to check HostAdapterStatus and TargetStatus\r
+  // (EFI_TIMEOUT, EFI_DEVICE_ERROR, EFI_WARN_BUFFER_TOO_SMALL)\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
+    ScsiDiskDevice->ScsiIo->ResetBus (ScsiDiskDevice->ScsiIo);\r
+    *NeedRetry = FALSE;\r
+    return EFI_DEVICE_ERROR;\r
+  }\r
+\r
+  Status = CheckTargetStatus (TargetStatus);\r
+  if (Status == EFI_NOT_READY) {\r
+    //\r
+    // reset the scsi device\r
+    //\r
+    ScsiDiskDevice->ScsiIo->ResetDevice (ScsiDiskDevice->ScsiIo);\r
+    *NeedRetry = TRUE;\r
+    return EFI_DEVICE_ERROR;\r
+  } else if (Status == EFI_DEVICE_ERROR) {\r
+    *NeedRetry = FALSE;\r
+    return EFI_DEVICE_ERROR;\r
+  }\r
+\r
+  if (TargetStatus == EFI_EXT_SCSI_STATUS_TARGET_CHECK_CONDITION) {\r
+    DEBUG ((EFI_D_VERBOSE, "ScsiDiskWrite16: Check Condition happened!\n"));\r
+    Status = DetectMediaParsingSenseKeys (ScsiDiskDevice, ScsiDiskDevice->SenseData, SenseDataLength / sizeof (EFI_SCSI_SENSE_DATA), &Action);\r
+    if (EFI_ERROR (Status)) {\r
+      return Status;\r
+    } else if (Action == ACTION_RETRY_COMMAND_LATER) {\r
+      *NeedRetry = TRUE;\r
+      return EFI_DEVICE_ERROR;\r
+    } else {\r
+      *NeedRetry = FALSE;\r
+      return EFI_DEVICE_ERROR;\r
+    }\r
+  }\r
+\r
+  return ReturnStatus;\r
 }\r
 \r
 \r