libata: Cleanup ata_read_log_page() (7cfdfdc8) · Commits · 戴 / test

The warning message "READ LOG DMA EXT failed, trying unqueued" in ata_read_log_page() as well as the macro name ATA_HORKAGE_NO_NCQ_LOG are confusing: the command READ LOG DMA EXT is not an queued NCQ command unless it is encapsulated in a RECEIVE FPDMA QUEUED command. From ACS-4 READ LOG DMA EXT description: "The device processes the READ LOG DMA EXT command in the NCQ feature set environment (see 4.13.6) if the READ LOG DMA EXT command is encapsulated in a RECEIVE FPDMA QUEUED command (see 7.30) with the inputs encapsulated as shown in 7.23.6." To avoid confusion, fix the warning messsage to mention switching to PIO and not "unqueued" and rename the macro ATA_HORKAGE_NO_NCQ_LOG to ATA_HORKAGE_NO_DMA_LOG. Signed-off-by:

Damien Le Moal <damien.lemoal@wdc.com> Reviewed-by:

Hannes Reinecke <hare@suse.com> Signed-off-by:

Tejun Heo <tj@kernel.org>

drivers/ata/libata-core.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -2083,7 +2083,7 @@ unsigned int ata_read_log_page(struct ata_device *dev, u8 log,
		retry:
		ata_tf_init(dev, &tf);
		if (dev->dma_mode && ata_id_has_read_log_dma_ext(dev->id) &&
		!(dev->horkage & ATA_HORKAGE_NO_NCQ_LOG)) {
		!(dev->horkage & ATA_HORKAGE_NO_DMA_LOG)) {
		tf.command = ATA_CMD_READ_LOG_DMA_EXT;
		tf.protocol = ATA_PROT_DMA;
		dma = true;
		@@ -2102,8 +2102,8 @@ retry:
		buf, sectors * ATA_SECT_SIZE, 0);

		if (err_mask && dma) {
		dev->horkage \|= ATA_HORKAGE_NO_NCQ_LOG;
		ata_dev_warn(dev, "READ LOG DMA EXT failed, trying unqueued\n");
		dev->horkage \|= ATA_HORKAGE_NO_DMA_LOG;
		ata_dev_warn(dev, "READ LOG DMA EXT failed, trying PIO\n");
		goto retry;
		}

include/linux/libata.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -435,7 +435,7 @@ enum {
		ATA_HORKAGE_NOLPM = (1 << 20), /* don't use LPM */
		ATA_HORKAGE_WD_BROKEN_LPM = (1 << 21), /* some WDs have broken LPM */
		ATA_HORKAGE_ZERO_AFTER_TRIM = (1 << 22),/* guarantees zero after trim */
		ATA_HORKAGE_NO_NCQ_LOG = (1 << 23), /* don't use NCQ for log read */
		ATA_HORKAGE_NO_DMA_LOG = (1 << 23), /* don't use DMA for log read */
		ATA_HORKAGE_NOTRIM = (1 << 24), /* don't use TRIM */
		ATA_HORKAGE_MAX_SEC_1024 = (1 << 25), /* Limit max sects to 1024 */

Admin message