NTB: Set dma mask and dma coherent mask to NTB devices

The dma_mask and dma_coherent_mask fields of the NTB struct device
weren't initialized in hardware drivers. In fact it should be done
instead of PCIe interface usage, since NTB clients are supposed to
use NTB API and left unaware of real hardware implementation.
In addition to that ntb_device_register() method shouldn't clear
the passed ntb_dev structure, since it dma_mask is initialized
by hardware drivers.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
Signed-off-by: Jon Mason <jdmason@kudzu.us>

4 files changed, 15 insertions, 2 deletions

diff --git a/drivers/ntb/hw/amd/ntb_hw_amd.c b/drivers/ntb/hw/amd/ntb_hw_amd.c
index f0788aae05c9..3cfa46876239 100644
--- a/drivers/ntb/hw/amd/ntb_hw_amd.c
+++ b/drivers/ntb/hw/amd/ntb_hw_amd.c
@@ -1020,6 +1020,10 @@ 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 24040317bb9c..93d4c9d2a9ad 100644
--- a/drivers/ntb/hw/idt/ntb_hw_idt.c
+++ b/drivers/ntb/hw/idt/ntb_hw_idt.c
@@ -2426,7 +2426,7 @@ static int idt_init_pci(struct idt_ntb_dev *ndev)
         struct pci_dev *pdev = ndev->ntb.pdev;
         int ret;
 
-        /* Initialize the bit mask of DMA */
+        /* Initialize the bit mask of PCI/NTB DMA */
         ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
         if (ret != 0) {
                 ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
@@ -2447,6 +2447,12 @@ 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_intel.c b/drivers/ntb/hw/intel/ntb_hw_intel.c
index 341a3d5baa3f..156b45cd4a19 100644
--- a/drivers/ntb/hw/intel/ntb_hw_intel.c
+++ b/drivers/ntb/hw/intel/ntb_hw_intel.c
@@ -2334,6 +2334,10 @@ 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) {
diff --git a/drivers/ntb/ntb.c b/drivers/ntb/ntb.c
index bdcd59b13c1f..2581ab724c34 100644
--- a/drivers/ntb/ntb.c
+++ b/drivers/ntb/ntb.c
@@ -111,7 +111,6 @@ int ntb_register_device(struct ntb_dev *ntb)
 
         init_completion(&ntb->released);
 
-        memset(&ntb->dev, 0, sizeof(ntb->dev));
         ntb->dev.bus = &ntb_bus;
         ntb->dev.parent = &ntb->pdev->dev;
         ntb->dev.release = ntb_dev_release;