scsi: pm8001: Fix NCQ NON DATA command completion handling

[ Upstream commit 1d6736c3e162061dc811c76e605f35ef3234bffa ]

NCQ NON DATA is an NCQ command with the DMA_NONE DMA direction and so a
register-device-to-host-FIS response is expected for it.

However, for an IO_SUCCESS case, mpi_sata_completion() expects a
set-device-bits-FIS for any ata task with an use_ncq field true, which
includes NCQ NON DATA commands.

Fix this to correctly treat NCQ NON DATA commands as non-data by also
testing for the DMA_NONE DMA direction.

Link: https://lore.kernel.org/r/20220220031810.738362-16-damien.lemoal@opensource.wdc.com
Fixes: dbf9bfe61571 ("[SCSI] pm8001: add SAS/SATA HBA driver")
Reviewed-by: Jack Wang <jinpu.wang@ionos.com>
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c
index 9d982eb970feaddf7d9991fd1b78c03018616dd9..8095eb0b04f735a3c1629eaa99d13f58560ccca5 100644 (file)
--- a/drivers/scsi/pm8001/pm8001_hwi.c
+++ b/drivers/scsi/pm8001/pm8001_hwi.c
@@ -2418,7 +2418,8 @@ mpi_sata_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)
                                len = sizeof(struct pio_setup_fis);
                                pm8001_dbg(pm8001_ha, IO,
                                           "PIO read len = %d\n", len);
-                       } else if (t->ata_task.use_ncq) {
+                       } else if (t->ata_task.use_ncq &&
+                                  t->data_dir != DMA_NONE) {
                                len = sizeof(struct set_dev_bits_fis);
                                pm8001_dbg(pm8001_ha, IO, "FPDMA len = %d\n",
                                           len);

diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c
index 4c19691a2bce20309650230de30e4ac69fb0255a..a5a1db6ed463fea8b82bfe91ce87d02a685236c5 100644 (file)
--- a/drivers/scsi/pm8001/pm80xx_hwi.c
+++ b/drivers/scsi/pm8001/pm80xx_hwi.c
@@ -2511,7 +2511,8 @@ mpi_sata_completion(struct pm8001_hba_info *pm8001_ha,
                                len = sizeof(struct pio_setup_fis);
                                pm8001_dbg(pm8001_ha, IO,
                                           "PIO read len = %d\n", len);
-                       } else if (t->ata_task.use_ncq) {
+                       } else if (t->ata_task.use_ncq &&
+                                  t->data_dir != DMA_NONE) {
                                len = sizeof(struct set_dev_bits_fis);
                                pm8001_dbg(pm8001_ha, IO, "FPDMA len = %d\n",
                                           len);