From: Martin K. Petersen <martin.petersen@oracle.com>
Date: Tue, 19 May 2015 23:44:17 +0000 (-0400)
Subject: libata: Fix regression when the NCQ Send and Receive log page is absent
X-Git-Tag: v4.1.4~106
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f8a895a6704bba5752c136f7338814c40c891e89;p=users%2Fjedix%2Flinux-maple.git

libata: Fix regression when the NCQ Send and Receive log page is absent

commit eab6ee1ce3c4678224d70338134f7a02005768cb upstream.

Commit 5d3abf8ff67f ("libata: Fall back to unqueued READ LOG EXT if
the DMA variant fails") allowed us to fall back to the unqueued READ
LOG variant if the queued version failed. However, if the device did
not support the page at all we would end up looping due to a merge
snafu.

Ensure we only take the fallback path once.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Reported-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Tested-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index f0931742a439..7465031a893c 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -1521,6 +1521,7 @@ retry:
 	} else {
 		tf.command = ATA_CMD_READ_LOG_EXT;
 		tf.protocol = ATA_PROT_PIO;
+		dma = false;
 	}
 	tf.lbal = log;
 	tf.lbam = page;