From: Greg Kroah-Hartman Date: Thu, 30 Jul 2015 19:16:03 +0000 (-0700) Subject: 4.1-stable patches X-Git-Tag: v4.1.4~34 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d6a04111607ed685e402770d82ea2f9c75da8d97;p=thirdparty%2Fkernel%2Fstable-queue.git 4.1-stable patches added patches: libata-fix-regression-when-the-ncq-send-and-receive-log-page-is-absent.patch --- diff --git a/queue-4.1/libata-fix-regression-when-the-ncq-send-and-receive-log-page-is-absent.patch b/queue-4.1/libata-fix-regression-when-the-ncq-send-and-receive-log-page-is-absent.patch new file mode 100644 index 00000000000..84c08d423b6 --- /dev/null +++ b/queue-4.1/libata-fix-regression-when-the-ncq-send-and-receive-log-page-is-absent.patch @@ -0,0 +1,37 @@ +From eab6ee1ce3c4678224d70338134f7a02005768cb Mon Sep 17 00:00:00 2001 +From: "Martin K. Petersen" +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" + +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 +Reported-by: Sergey Senozhatsky +Tested-by: Sergey Senozhatsky +Signed-off-by: Tejun Heo +Signed-off-by: Greg Kroah-Hartman + +--- + 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; diff --git a/queue-4.1/series b/queue-4.1/series index a1dd5f55f96..c851bfbe4fb 100644 --- a/queue-4.1/series +++ b/queue-4.1/series @@ -161,3 +161,4 @@ drm-rockchip-use-drm_gem_mmap-helpers.patch drm-add-a-check-for-x-y-in-drm_mode_setcrtc.patch drm-provide-compat-ioctl-for-addfb2.1.patch drm-stop-resetting-connector-state-to-unknown.patch +libata-fix-regression-when-the-ncq-send-and-receive-log-page-is-absent.patch