scsi: hisi_sas: add internal abort to hisi_sas_abort_task()

Execute an internal abort for executing a task abort.
This is for case of the command still being present
in host when abort is executed.

For a SATA internal abort, we set abort for all tasks
associated with the device.

Signed-off-by: John Garry <john.garry@huawei.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
index c4e59cd8ff7bc2d3510c688209098bd380551d6e..280a19dae8eb909fbbc98ec99596d7f373f2c6fa 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -841,18 +841,22 @@ static int hisi_sas_abort_task(struct sas_task *task)
                        }
                }
 
+               hisi_sas_internal_task_abort(hisi_hba, device,
+                                            HISI_SAS_INT_ABT_CMD, tag);
        } else if (task->task_proto & SAS_PROTOCOL_SATA ||
                task->task_proto & SAS_PROTOCOL_STP) {
                if (task->dev->dev_type == SAS_SATA_DEV) {
-                       struct hisi_slot_info *slot = task->lldd_task;
-
-                       dev_notice(dev, "abort task: hba=%p task=%p slot=%p\n",
-                                  hisi_hba, task, slot);
-                       task->task_state_flags |= SAS_TASK_STATE_ABORTED;
+                       hisi_sas_internal_task_abort(hisi_hba, device,
+                                                    HISI_SAS_INT_ABT_DEV, 0);
                        rc = TMF_RESP_FUNC_COMPLETE;
-                       goto out;
                }
+       } else if (task->task_proto & SAS_PROTOCOL_SMP) {
+               /* SMP */
+               struct hisi_sas_slot *slot = task->lldd_task;
+               u32 tag = slot->idx;
 
+               hisi_sas_internal_task_abort(hisi_hba, device,
+                                            HISI_SAS_INT_ABT_CMD, tag);
        }
 
 out: