Commit 4af5b63d authored Feb 20, 2022 by Damien Le Moal Committed by Greg Kroah-Hartman Apr 15, 2022

scsi: libsas: Fix sas_ata_qc_issue() handling of NCQ NON DATA commands

commit 8454563e4c2aafbfb81a383ab423ea8b9b430a25 upstream.

To detect for the DMA_NONE (no data transfer) DMA direction,
sas_ata_qc_issue() tests if the command protocol is ATA_PROT_NODATA.  This
test does not include the ATA_CMD_NCQ_NON_DATA command as this command
protocol is defined as ATA_PROT_NCQ_NODATA (equal to ATA_PROT_FLAG_NCQ) and
not as ATA_PROT_NODATA.

To include both NCQ and non-NCQ commands when testing for the DMA_NONE DMA
direction, use "!ata_is_data()".

Link: https://lore.kernel.org/r/20220220031810.738362-2-damien.lemoal@opensource.wdc.com


Fixes: 176ddd89171d ("scsi: libsas: Reset num_scatter if libata marks qc as NODATA")
Cc: stable@vger.kernel.org
Reviewed-by: John Garry <john.garry@huawei.com>
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent b86be11a

drivers/scsi/libsas/sas_ata.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -216,7 +216,7 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc)
	task->total_xfer_len = qc->nbytes;		task->total_xfer_len = qc->nbytes;
	task->num_scatter = qc->n_elem;		task->num_scatter = qc->n_elem;
	task->data_dir = qc->dma_dir;		task->data_dir = qc->dma_dir;
	} else if (qc->tf.protocol == ATA_PROT_NODATA) {		} else if (!ata_is_data(qc->tf.protocol)) {
	task->data_dir = DMA_NONE;		task->data_dir = DMA_NONE;
	} else {		} else {
	for_each_sg(qc->sg, sg, qc->n_elem, si)		for_each_sg(qc->sg, sg, qc->n_elem, si)