Patch "libata: Fix regression when the NCQ Send and Receive log page is absent" has been added to the 4.1-stable tree

Patch "libata: Fix regression when the NCQ Send and Receive log page is absent" has been added to the 4.1-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

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

to the 4.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     libata-fix-regression-when-the-ncq-send-and-receive-log-page-is-absent.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From eab6ee1ce3c4678224d70338134f7a02005768cb Mon Sep 17 00:00:00 2001
From: "Martin K. Petersen" <martin.petersen@oracle.com>
Date: Tue, 19 May 2015 19:44:17 -0400
Subject: libata: Fix regression when the NCQ Send and Receive log page is absent

From: "Martin K. Petersen" <martin.petersen@oracle.com>

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>

---
 drivers/ata/libata-eh.c |    1 +
 1 file changed, 1 insertion(+)

--- 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;


Patches currently in stable-queue which might be from martin.petersen@oracle.com are

queue-4.1/block-do-a-full-clone-when-splitting-discard-bios.patch
queue-4.1/libata-fix-regression-when-the-ncq-send-and-receive-log-page-is-absent.patch
queue-4.1/libata-fall-back-to-unqueued-read-log-ext-if-the-dma-variant-fails.patch
queue-4.1/libata-expose-trim-capability-in-sysfs.patch
queue-4.1/libata-do-not-blacklist-micron-m500dc.patch
queue-4.1/libata-do-not-blacklist-m510dc.patch