Merge tag 'powerpc-4.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[linux-2.6-block.git] / arch / powerpc / platforms / powernv / pci-ioda.c

diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index 398cc5e4b91bc609cc4d46f888afaf3c3d0ff734..496e47696ed0c57c413b6ce4c920c7c3beda745f 100644 (file)
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -1864,7 +1864,7 @@ static int pnv_pci_ioda_dma_set_mask(struct pci_dev *pdev, u64 dma_mask)
 
        if (bypass) {
                dev_info(&pdev->dev, "Using 64-bit DMA iommu bypass\n");
-               set_dma_ops(&pdev->dev, &dma_direct_ops);
+               set_dma_ops(&pdev->dev, &dma_nommu_ops);
        } else {
                /*
                 * If the device can't set the TCE bypass bit but still wants
@@ -1882,7 +1882,7 @@ static int pnv_pci_ioda_dma_set_mask(struct pci_dev *pdev, u64 dma_mask)
                                return rc;
                        /* 4GB offset bypasses 32-bit space */
                        set_dma_offset(&pdev->dev, (1ULL << 32));
-                       set_dma_ops(&pdev->dev, &dma_direct_ops);
+                       set_dma_ops(&pdev->dev, &dma_nommu_ops);
                } else if (dma_mask >> 32 && dma_mask != DMA_BIT_MASK(64)) {
                        /*
                         * Fail the request if a DMA mask between 32 and 64 bits