1 files changed, 14 insertions, 3 deletions

diff --git a/drivers/dma/ioat/init.c b/drivers/dma/ioat/init.c
index efdee1a69fc4..d406056e8892 100644
--- a/drivers/dma/ioat/init.c
+++ b/drivers/dma/ioat/init.c
@@ -690,12 +690,11 @@ static int ioat_alloc_chan_resources(struct dma_chan *c)
         /* allocate a completion writeback area */
         /* doing 2 32bit writes to mmio since 1 64b write doesn't work */
         ioat_chan->completion =
-                dma_pool_alloc(ioat_chan->ioat_dma->completion_pool,
-                               GFP_KERNEL, &ioat_chan->completion_dma);
+                dma_pool_zalloc(ioat_chan->ioat_dma->completion_pool,
+                                GFP_KERNEL, &ioat_chan->completion_dma);
         if (!ioat_chan->completion)
                 return -ENOMEM;
 
-        memset(ioat_chan->completion, 0, sizeof(*ioat_chan->completion));
         writel(((u64)ioat_chan->completion_dma) & 0x00000000FFFFFFFF,
                ioat_chan->reg_base + IOAT_CHANCMP_OFFSET_LOW);
         writel(((u64)ioat_chan->completion_dma) >> 32,
@@ -1074,6 +1073,7 @@ static int ioat3_dma_probe(struct ioatdma_device *ioat_dma, int dca)
         struct ioatdma_chan *ioat_chan;
         bool is_raid_device = false;
         int err;
+        u16 val16;
 
         dma = &ioat_dma->dma_dev;
         dma->device_prep_dma_memcpy = ioat_dma_prep_memcpy_lock;
@@ -1173,6 +1173,17 @@ static int ioat3_dma_probe(struct ioatdma_device *ioat_dma, int dca)
         if (dca)
                 ioat_dma->dca = ioat_dca_init(pdev, ioat_dma->reg_base);
 
+        /* disable relaxed ordering */
+        err = pcie_capability_read_word(pdev, IOAT_DEVCTRL_OFFSET, &val16);
+        if (err)
+                return err;
+
+        /* clear relaxed ordering enable */
+        val16 &= ~IOAT_DEVCTRL_ROE;
+        err = pcie_capability_write_word(pdev, IOAT_DEVCTRL_OFFSET, val16);
+        if (err)
+                return err;
+
         return 0;
 }