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

Commit 5b844b63 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Tejun Heo
Browse files

ata: Handle ATA NCQ NO-DATA commands correctly 



Add a new taskfile protocol ATA_PROT_NCQ_NODATA to handle
ATA NCQ NO-DATA commands correctly.
And fixup ata_scsi_zbc_out_xlat() to use it.

Signed-off-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 5b51ba61

drivers/ata/libata-eh.c

+2 −1
Original line number Diff line number Diff line
@@ -2611,7 +2611,8 @@ static void ata_eh_link_report(struct ata_link *link) 
				[ATA_PROT_NODATA]	= "nodata",

				[ATA_PROT_PIO]		= "pio",

				[ATA_PROT_DMA]		= "dma",

				[ATA_PROT_NCQ]		= "ncq",

				[ATA_PROT_NCQ]		= "ncq dma",

				[ATA_PROT_NCQ_NODATA]	= "ncq nodata",

				[ATAPI_PROT_NODATA]	= "nodata",

				[ATAPI_PROT_PIO]	= "pio",

				[ATAPI_PROT_DMA]	= "dma",

drivers/ata/libata-scsi.c

+4 −1
Original line number Diff line number Diff line
@@ -3082,6 +3082,9 @@ static unsigned int ata_scsi_pass_thru(struct ata_queued_cmd *qc) 
		goto invalid_fld;

	}



	if (ata_is_ncq(tf->protocol) && (cdb[2] & 0x3) == 0)

		tf->protocol = ATA_PROT_NCQ_NODATA;



	/* enable LBA */

	tf->flags |= ATA_TFLAG_LBA;
@@ -3548,7 +3551,7 @@ static unsigned int ata_scsi_zbc_out_xlat(struct ata_queued_cmd *qc) 


	if (ata_ncq_enabled(qc->dev) &&

	    ata_fpdma_zac_mgmt_out_supported(qc->dev)) {

		tf->protocol = ATA_PROT_NCQ;

		tf->protocol = ATA_PROT_NCQ_NODATA;

		tf->command = ATA_CMD_NCQ_NON_DATA;

		tf->hob_nsect = ATA_SUBCMD_NCQ_NON_DATA_ZAC_MGMT_OUT;

		tf->nsect = qc->tag << 3;

drivers/ata/sata_dwc_460ex.c

+2 −0
Original line number Diff line number Diff line
@@ -290,6 +290,8 @@ static const char *get_prot_descript(u8 protocol) 
		return "ATA DMA";

	case ATA_PROT_NCQ:

		return "ATA NCQ";

	case ATA_PROT_NCQ_NODATA:

		return "ATA NCQ no data";

	case ATAPI_PROT_NODATA:

		return "ATAPI no data";

	case ATAPI_PROT_PIO:

include/linux/ata.h

+1 −0
Original line number Diff line number Diff line
@@ -530,6 +530,7 @@ enum ata_tf_protocols { 
	ATA_PROT_PIO,		/* PIO data xfer */

	ATA_PROT_DMA,		/* DMA */

	ATA_PROT_NCQ,		/* NCQ */

	ATA_PROT_NCQ_NODATA,	/* NCQ no data */

	ATAPI_PROT_NODATA,	/* packet command, no data */

	ATAPI_PROT_PIO,		/* packet command, PIO data xfer*/

	ATAPI_PROT_DMA,		/* packet command with special DMA sauce */

include/linux/libata.h

+2 −0
Original line number Diff line number Diff line
@@ -1053,6 +1053,8 @@ static inline unsigned int ata_prot_flags(u8 prot) 
		return ATA_PROT_FLAG_DMA;

	case ATA_PROT_NCQ:

		return ATA_PROT_FLAG_DMA | ATA_PROT_FLAG_NCQ;

	case ATA_PROT_NCQ_NODATA:

		return ATA_PROT_FLAG_NCQ;

	case ATAPI_PROT_NODATA:

		return ATA_PROT_FLAG_ATAPI;

	case ATAPI_PROT_PIO: