scsi: pm8001: Fix NCQ NON DATA command completion handling

BugLink: https://bugs.launchpad.net/bugs/1969110
[ 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>
(cherry picked from commit c6c95cdd513891ee1349d58ef5e9fdc58186221b)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c
index e9c77c945752cd0d936c57242834a1f168fa31e4..d50eb22b2506faa8605b1d12794661c68fb32e25 100644 (file)
--- a/drivers/scsi/pm8001/pm8001_hwi.c
+++ b/drivers/scsi/pm8001/pm8001_hwi.c
@@ -2421,7 +2421,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 043a2cc4d4de19dcbae3145339aae08c5ebfd78f..3c2f2fbdb43238ebc68f3badb1dcd536179707b3 100644 (file)
--- a/drivers/scsi/pm8001/pm80xx_hwi.c
+++ b/drivers/scsi/pm8001/pm80xx_hwi.c
@@ -2518,7 +2518,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);