[SCSI] hpsa: Retry commands completing with a sense key of ABORTED_COMMAND

Signed-off-by: Matt Gates <matthew.gates@hp.com>
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

1 files changed, 9 insertions, 2 deletions

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index bcc51f9d3903..d07b3d3f11a4 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -1037,8 +1037,15 @@ static void complete_scsi_command(struct CommandList *cp,
                                         break;
                                 }
                         }
-
-
+                        if (sense_key == ABORTED_COMMAND) {
+                                /* Aborted command is retryable */
+                                dev_warn(&h->pdev->dev, "cp %p "
+                                        "has check condition: aborted command: "
+                                        "ASC: 0x%x, ASCQ: 0x%x\n",
+                                        cp, asc, ascq);
+                                cmd->result = DID_SOFT_ERROR << 16;
+                                break;
+                        }
                         /* Must be some other type of check condition */
                         dev_warn(&h->pdev->dev, "cp %p has check condition: "
                                         "unknown type: "