7 files changed, 11 insertions, 4 deletions

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
index 860c9f847371..bd20c5488768 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
@@ -1632,6 +1632,7 @@ static u8 get_ata_protocol(u8 cmd, int direction)
         case ATA_CMD_FPDMA_READ:
         case ATA_CMD_FPDMA_RECV:
         case ATA_CMD_FPDMA_SEND:
+        case ATA_CMD_NCQ_NON_DATA:
         return SATA_PROTOCOL_FPDMA;
 
         case ATA_CMD_ID_ATA:
diff --git a/drivers/scsi/isci/request.c b/drivers/scsi/isci/request.c
index 29456e097a30..b709d2b20880 100644
--- a/drivers/scsi/isci/request.c
+++ b/drivers/scsi/isci/request.c
@@ -3171,7 +3171,8 @@ static enum sci_status isci_request_stp_request_construct(struct isci_request *i
         if (qc && (qc->tf.command == ATA_CMD_FPDMA_WRITE ||
                    qc->tf.command == ATA_CMD_FPDMA_READ ||
                    qc->tf.command == ATA_CMD_FPDMA_RECV ||
-                   qc->tf.command == ATA_CMD_FPDMA_SEND)) {
+                   qc->tf.command == ATA_CMD_FPDMA_SEND ||
+                   qc->tf.command == ATA_CMD_NCQ_NON_DATA)) {
                 fis->sector_count = qc->tag << 3;
                 ireq->tc->type.stp.ncq_tag = qc->tag;
         }
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index fe1cd2691748..935c43095109 100644
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -207,7 +207,8 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc)
         if (qc->tf.command == ATA_CMD_FPDMA_WRITE ||
             qc->tf.command == ATA_CMD_FPDMA_READ ||
             qc->tf.command == ATA_CMD_FPDMA_RECV ||
-            qc->tf.command == ATA_CMD_FPDMA_SEND) {
+            qc->tf.command == ATA_CMD_FPDMA_SEND ||
+            qc->tf.command == ATA_CMD_NCQ_NON_DATA) {
                 /* Need to zero out the tag libata assigned us */
                 qc->tf.nsect = 0;
         }
diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c
index db3714964c0a..5b9fcff6cd94 100644
--- a/drivers/scsi/mvsas/mv_sas.c
+++ b/drivers/scsi/mvsas/mv_sas.c
@@ -431,7 +431,8 @@ static u32 mvs_get_ncq_tag(struct sas_task *task, u32 *tag)
                 if (qc->tf.command == ATA_CMD_FPDMA_WRITE ||
                     qc->tf.command == ATA_CMD_FPDMA_READ ||
                     qc->tf.command == ATA_CMD_FPDMA_RECV ||
-                    qc->tf.command == ATA_CMD_FPDMA_SEND) {
+                    qc->tf.command == ATA_CMD_FPDMA_SEND ||
+                    qc->tf.command == ATA_CMD_NCQ_NON_DATA) {
                         *tag = qc->tag;
                         return 1;
                 }
diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c
index 62abd9896625..dc33dfa8f994 100644
--- a/drivers/scsi/pm8001/pm8001_sas.c
+++ b/drivers/scsi/pm8001/pm8001_sas.c
@@ -282,7 +282,8 @@ u32 pm8001_get_ncq_tag(struct sas_task *task, u32 *tag)
                 if (qc->tf.command == ATA_CMD_FPDMA_WRITE ||
                     qc->tf.command == ATA_CMD_FPDMA_READ ||
                     qc->tf.command == ATA_CMD_FPDMA_RECV ||
-                    qc->tf.command == ATA_CMD_FPDMA_SEND) {
+                    qc->tf.command == ATA_CMD_FPDMA_SEND ||
+                    qc->tf.command == ATA_CMD_NCQ_NON_DATA) {
                         *tag = qc->tag;
                         return 1;
                 }
diff --git a/include/linux/ata.h b/include/linux/ata.h
index 00aebc4c83ad..b84210a28a00 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -243,6 +243,7 @@ enum {
         ATA_CMD_WRITE_QUEUED_FUA_EXT = 0x3E,
         ATA_CMD_FPDMA_READ      = 0x60,
         ATA_CMD_FPDMA_WRITE     = 0x61,
+        ATA_CMD_NCQ_NON_DATA    = 0x63,
         ATA_CMD_FPDMA_SEND      = 0x64,
         ATA_CMD_FPDMA_RECV      = 0x65,
         ATA_CMD_PIO_READ        = 0x20,
diff --git a/include/trace/events/libata.h b/include/trace/events/libata.h
index 8b0fbd93082c..016860320f6f 100644
--- a/include/trace/events/libata.h
+++ b/include/trace/events/libata.h
@@ -39,6 +39,7 @@
                  ata_opcode_name(ATA_CMD_WRITE_QUEUED_FUA_EXT), \
                  ata_opcode_name(ATA_CMD_FPDMA_READ),           \
                  ata_opcode_name(ATA_CMD_FPDMA_WRITE),          \
+                 ata_opcode_name(ATA_CMD_NCQ_NON_DATA),         \
                  ata_opcode_name(ATA_CMD_FPDMA_SEND),           \
                  ata_opcode_name(ATA_CMD_FPDMA_RECV),           \
                  ata_opcode_name(ATA_CMD_PIO_READ),             \