libata: NCQ encapsulation for ZAC MANAGEMENT OUT

Add NCQ encapsulation for ZAC MANAGEMENT OUT and evaluate
NCQ Non-Data log pages to figure out if NCQ encapsulation
is supported.

Signed-off-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Tejun Heo <tj@kernel.org>

3 files changed, 56 insertions, 8 deletions

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index b2bd7c499653..1528c7cc0089 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -2121,6 +2121,40 @@ static void ata_dev_config_ncq_send_recv(struct ata_device *dev)
         }
 }
 
+static void ata_dev_config_ncq_non_data(struct ata_device *dev)
+{
+        struct ata_port *ap = dev->link->ap;
+        unsigned int err_mask;
+        int log_index = ATA_LOG_NCQ_NON_DATA * 2;
+        u16 log_pages;
+
+        err_mask = ata_read_log_page(dev, ATA_LOG_DIRECTORY,
+                                     0, ap->sector_buf, 1);
+        if (err_mask) {
+                ata_dev_dbg(dev,
+                            "failed to get Log Directory Emask 0x%x\n",
+                            err_mask);
+                return;
+        }
+        log_pages = get_unaligned_le16(&ap->sector_buf[log_index]);
+        if (!log_pages) {
+                ata_dev_warn(dev,
+                             "NCQ Send/Recv Log not supported\n");
+                return;
+        }
+        err_mask = ata_read_log_page(dev, ATA_LOG_NCQ_NON_DATA,
+                                     0, ap->sector_buf, 1);
+        if (err_mask) {
+                ata_dev_dbg(dev,
+                            "failed to get NCQ Non-Data Log Emask 0x%x\n",
+                            err_mask);
+        } else {
+                u8 *cmds = dev->ncq_non_data_cmds;
+
+                memcpy(cmds, ap->sector_buf, ATA_LOG_NCQ_NON_DATA_SIZE);
+        }
+}
+
 static int ata_dev_config_ncq(struct ata_device *dev,
                                char *desc, size_t desc_sz)
 {
@@ -2165,9 +2199,12 @@ static int ata_dev_config_ncq(struct ata_device *dev,
                 snprintf(desc, desc_sz, "NCQ (depth %d/%d)%s", hdepth,
                         ddepth, aa_desc);
 
-        if ((ap->flags & ATA_FLAG_FPDMA_AUX) &&
-            ata_id_has_ncq_send_and_recv(dev->id))
-                ata_dev_config_ncq_send_recv(dev);
+        if ((ap->flags & ATA_FLAG_FPDMA_AUX)) {
+                if (ata_id_has_ncq_send_and_recv(dev->id))
+                        ata_dev_config_ncq_send_recv(dev);
+                if (ata_id_has_ncq_non_data(dev->id))
+                        ata_dev_config_ncq_non_data(dev);
+        }
 
         return 0;
 }
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 6afd0840ebbe..43403aa0801f 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -3506,11 +3506,19 @@ static unsigned int ata_scsi_zbc_out_xlat(struct ata_queued_cmd *qc)
 
         reset_all = cdb[14] & 0x1;
 
-        tf->protocol = ATA_PROT_NODATA;
-        tf->command = ATA_CMD_ZAC_MGMT_OUT;
-        tf->feature = sa;
-        tf->hob_feature = reset_all & 0x1;
-
+        if (ata_ncq_enabled(qc->dev) &&
+            ata_fpdma_zac_mgmt_out_supported(qc->dev)) {
+                tf->protocol = ATA_PROT_NCQ;
+                tf->command = ATA_CMD_NCQ_NON_DATA;
+                tf->hob_nsect = ATA_SUBCMD_NCQ_NON_DATA_ZAC_MGMT_OUT;
+                tf->nsect = qc->tag << 3;
+                tf->auxiliary = sa | (reset_all & 0x1) << 8;
+        } else {
+                tf->protocol = ATA_PROT_NODATA;
+                tf->command = ATA_CMD_ZAC_MGMT_OUT;
+                tf->feature = sa;
+                tf->hob_feature = reset_all & 0x1;
+        }
         tf->lbah = (block >> 16) & 0xff;
         tf->lbam = (block >> 8) & 0xff;
         tf->lbal = block & 0xff;
diff --git a/drivers/ata/libata-trace.c b/drivers/ata/libata-trace.c
index 1111ba7db5b3..f8c550df0615 100644
--- a/drivers/ata/libata-trace.c
+++ b/drivers/ata/libata-trace.c
@@ -188,6 +188,9 @@ libata_trace_parse_subcmd(struct trace_seq *p, unsigned char cmd,
                 case ATA_SUBCMD_NCQ_NON_DATA_ZERO_EXT:
                         trace_seq_printf(p, " ZERO_EXT");
                         break;
+                case ATA_SUBCMD_NCQ_NON_DATA_ZAC_MGMT_OUT:
+                        trace_seq_printf(p, " ZAC_MGMT_OUT");
+                        break;
                 }
                 break;
         case ATA_CMD_ZAC_MGMT_IN: