Patch "dmaengine: ioatdma: workaround SKX ioatdma version" has been added to the 4.9-stable tree

Patch "dmaengine: ioatdma: workaround SKX ioatdma version" has been added to the 4.9-stable tree

[gregkh]

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

    dmaengine: ioatdma: workaround SKX ioatdma version

to the 4.9-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:
     dmaengine-ioatdma-workaround-skx-ioatdma-version.patch
and it can be found in the queue-4.9 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 foo@baz Fri Aug  4 15:15:01 PDT 2017
From: Dave Jiang <dave.jiang@intel.com>
Date: Tue, 13 Dec 2016 11:15:27 -0700
Subject: dmaengine: ioatdma: workaround SKX ioatdma version

From: Dave Jiang <dave.jiang@intel.com>


[ Upstream commit 34a31f0af84158955a9747fb5c6712da5bbb5331 ]

The Skylake ioatdma is technically CBDMA 3.2+ and contains the same hardware
bits with some additional 3.3 features, but it's not really 3.3 where the
driver is concerned.

Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/dma/ioat/init.c |    2 ++
 1 file changed, 2 insertions(+)

--- a/drivers/dma/ioat/init.c
+++ b/drivers/dma/ioat/init.c
@@ -1357,6 +1357,8 @@ static int ioat_pci_probe(struct pci_dev
 
 	device->version = readb(device->reg_base + IOAT_VER_OFFSET);
 	if (device->version >= IOAT_VER_3_0) {
+		if (is_skx_ioat(pdev))
+			device->version = IOAT_VER_3_2;
 		err = ioat3_dma_probe(device, ioat_dca_enabled);
 
 		if (device->version >= IOAT_VER_3_3)


Patches currently in stable-queue which might be from dave.jiang@intel.com are

queue-4.9/dmaengine-ioatdma-add-skylake-pci-dev-id.patch
queue-4.9/dmaengine-ioatdma-workaround-skx-ioatdma-version.patch