scsi: hisi_sas: add v2 hw slot complete internal abort support

Add code in slot_complete_v2_hw() to deal with the slots which have
completed due to internal abort.

The status codes have the following meaning:

- STAT_IO_ABORTED: the IO has been aborted due to internal abort,
  whether by device or individual abort command

- STAT_IO_COMPLETE: internal abort command has completed successfully
  for device or individual abort command

- STAT_IO_NO_DEVICE: internal abort command has completed for device but
  cannot find any IO

- STAT_IO_NOT_VALID: internal abort command has completed for single
  command but could not find the command

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_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
index fec1675..bf9b693 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
@@ -227,6 +227,13 @@
 #define CMPLT_HDR_RSPNS_XFRD_MSK       (0x1 << CMPLT_HDR_RSPNS_XFRD_OFF)
 #define CMPLT_HDR_ERX_OFF              12
 #define CMPLT_HDR_ERX_MSK              (0x1 << CMPLT_HDR_ERX_OFF)
+#define CMPLT_HDR_ABORT_STAT_OFF       13
+#define CMPLT_HDR_ABORT_STAT_MSK       (0x7 << CMPLT_HDR_ABORT_STAT_OFF)
+/* abort_stat */
+#define STAT_IO_NOT_VALID              0x1
+#define STAT_IO_NO_DEVICE              0x2
+#define STAT_IO_COMPLETE               0x3
+#define STAT_IO_ABORTED                        0x4
 /* dw1 */
 #define CMPLT_HDR_IPTT_OFF             0
 #define CMPLT_HDR_IPTT_MSK             (0xffff << CMPLT_HDR_IPTT_OFF)
@@ -1569,6 +1576,30 @@ slot_complete_v2_hw(struct hisi_hba *hisi_hba, struct hisi_sas_slot *slot,
                goto out;
        }
 
+       /* Use SAS+TMF status codes */
+       switch ((complete_hdr->dw0 & CMPLT_HDR_ABORT_STAT_MSK)
+                       >> CMPLT_HDR_ABORT_STAT_OFF) {
+       case STAT_IO_ABORTED:
+               /* this io has been aborted by abort command */
+               ts->stat = SAS_ABORTED_TASK;
+               goto out;
+       case STAT_IO_COMPLETE:
+               /* internal abort command complete */
+               ts->stat = TMF_RESP_FUNC_COMPLETE;
+               goto out;
+       case STAT_IO_NO_DEVICE:
+               ts->stat = TMF_RESP_FUNC_COMPLETE;
+               goto out;
+       case STAT_IO_NOT_VALID:
+               /* abort single io, controller don't find
+                * the io need to abort
+                */
+               ts->stat = TMF_RESP_FUNC_FAILED;
+               goto out;
+       default:
+               break;
+       }
+
        if ((complete_hdr->dw0 & CMPLT_HDR_ERX_MSK) &&
                (!(complete_hdr->dw0 & CMPLT_HDR_RSPNS_XFRD_MSK))) {