ntb: hw: remove the code that sets the DMA mask

This patch removes the code that sets the DMA mask as it no longer
makes sense to do this.

Fixes: 7f46c8b3a552 ("NTB: ntb_tool: Add full multi-port NTB API support")
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Tested-by: Alexander Fomichev <fomichev.ru@gmail.com>
Signed-off-by: Sanjay R Mehta <sanju.mehta@amd.com>
Signed-off-by: Jon Mason <jdmason@kudzu.us>

diff --git a/drivers/ntb/hw/amd/ntb_hw_amd.c b/drivers/ntb/hw/amd/ntb_hw_amd.c
index 9e310e1ad4d00a254dd6b72fd782179e23255afb..88e1db65be02c2bb2554eee51fd32e93d193da4e 100644 (file)
--- a/drivers/ntb/hw/amd/ntb_hw_amd.c
+++ b/drivers/ntb/hw/amd/ntb_hw_amd.c
@@ -1191,10 +1191,6 @@ static int amd_ntb_init_pci(struct amd_ntb_dev *ndev,
                        goto err_dma_mask;
                dev_warn(&pdev->dev, "Cannot DMA consistent highmem\n");
        }
-       rc = dma_coerce_mask_and_coherent(&ndev->ntb.dev,
-                                         dma_get_mask(&pdev->dev));
-       if (rc)
-               goto err_dma_mask;
 
        ndev->self_mmio = pci_iomap(pdev, 0, 0);
        if (!ndev->self_mmio) {

diff --git a/drivers/ntb/hw/idt/ntb_hw_idt.c b/drivers/ntb/hw/idt/ntb_hw_idt.c
index edae52384b8ab2e7e536a52e87b37525c3f4a7c4..d54261f50851918407decbb28bf77f39b668b140 100644 (file)
--- a/drivers/ntb/hw/idt/ntb_hw_idt.c
+++ b/drivers/ntb/hw/idt/ntb_hw_idt.c
@@ -2660,12 +2660,6 @@ static int idt_init_pci(struct idt_ntb_dev *ndev)
                dev_warn(&pdev->dev,
                        "Cannot set consistent DMA highmem bit mask\n");
        }
-       ret = dma_coerce_mask_and_coherent(&ndev->ntb.dev,
-                                          dma_get_mask(&pdev->dev));
-       if (ret != 0) {
-               dev_err(&pdev->dev, "Failed to set NTB device DMA bit mask\n");
-               return ret;
-       }
 
        /*
         * Enable the device advanced error reporting. It's not critical to

diff --git a/drivers/ntb/hw/intel/ntb_hw_gen1.c b/drivers/ntb/hw/intel/ntb_hw_gen1.c
index cae70e7fe5bd16707139f3fd20053e1ded5397d9..423f9b8fbbcf5e741dfc004d181188d16fcb9b26 100644 (file)
--- a/drivers/ntb/hw/intel/ntb_hw_gen1.c
+++ b/drivers/ntb/hw/intel/ntb_hw_gen1.c
@@ -1786,10 +1786,6 @@ static int intel_ntb_init_pci(struct intel_ntb_dev *ndev, struct pci_dev *pdev)
                        goto err_dma_mask;
                dev_warn(&pdev->dev, "Cannot DMA consistent highmem\n");
        }
-       rc = dma_coerce_mask_and_coherent(&ndev->ntb.dev,
-                                         dma_get_mask(&pdev->dev));
-       if (rc)
-               goto err_dma_mask;
 
        ndev->self_mmio = pci_iomap(pdev, 0, 0);
        if (!ndev->self_mmio) {