scsi: mpt3sas: check command status before attempting abort

When attempting a command abort we should check the command status prior
to sending the abort; the command might've been completed already.

Signed-off-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Suganath Prabu S <suganath-prabu.subramani@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index a11774ba3ab825431eca45385fec40d3c3d3725c..8870ceffb0bb1ce8ace405618c9f6440f6a56780 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -2771,6 +2771,14 @@ mpt3sas_scsih_issue_tm(struct MPT3SAS_ADAPTER *ioc, u16 handle, uint channel,
                return (!rc) ? SUCCESS : FAILED;
        }
 
+       if (type == MPI2_SCSITASKMGMT_TASKTYPE_ABORT_TASK) {
+               scsi_lookup = mpt3sas_get_st_from_smid(ioc, smid_task);
+               if (!scsi_lookup)
+                       return FAILED;
+               if (scsi_lookup->cb_idx == 0xFF)
+                       return SUCCESS;
+       }
+
        smid = mpt3sas_base_get_smid_hpr(ioc, ioc->tm_cb_idx);
        if (!smid) {
                pr_err(MPT3SAS_FMT "%s: failed obtaining a smid\n",
@@ -2778,9 +2786,6 @@ mpt3sas_scsih_issue_tm(struct MPT3SAS_ADAPTER *ioc, u16 handle, uint channel,
                return FAILED;
        }
 
-       if (type == MPI2_SCSITASKMGMT_TASKTYPE_ABORT_TASK)
-               scsi_lookup = mpt3sas_get_st_from_smid(ioc, smid_task);
-
        dtmprintk(ioc, pr_info(MPT3SAS_FMT
                "sending tm: handle(0x%04x), task_type(0x%02x), smid(%d)\n",
                ioc->name, handle, type, smid_task));