Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 661ce1f0 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Tejun Heo
Browse files

libata/libsas: Define ATA_CMD_NCQ_NON_DATA 



Define the NCQ NON DATA command and update libsas to handle it
correctly.

Signed-off-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent ef026b18

drivers/scsi/hisi_sas/hisi_sas_v2_hw.c

+1 −0
Original line number Diff line number Diff line
@@ -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:

drivers/scsi/isci/request.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

	}

drivers/scsi/libsas/sas_ata.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

	}

drivers/scsi/mvsas/mv_sas.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

		}

drivers/scsi/pm8001/pm8001_sas.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

		}