PCI: endpoint: Use of_dma_configure() to set initial DMA mask

Use of_dma_configure() to set the initial DMA mask of EPF device. This
helps to get rid of "Coherent DMA mask 0x0 (pfn 0x0-0x1) covers a smaller
range of system memory than the DMA zone pfn" warning in certain platforms
like TI's K2G resulting in coherent DMA mask not being set.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/endpoint/pci-epc-core.c b/drivers/pci/endpoint/pci-epc-core.c
index caa7be10e473f0e0df8f6b45584da72fdf545d0b..42c2a1156325711b0e69802e25ef393d6fa11209 100644 (file)
--- a/drivers/pci/endpoint/pci-epc-core.c
+++ b/drivers/pci/endpoint/pci-epc-core.c
@@ -21,6 +21,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
 #include <linux/module.h>
+#include <linux/of_device.h>
 
 #include <linux/pci-epc.h>
 #include <linux/pci-epf.h>
@@ -370,6 +371,7 @@ EXPORT_SYMBOL_GPL(pci_epc_write_header);
 int pci_epc_add_epf(struct pci_epc *epc, struct pci_epf *epf)
 {
        unsigned long flags;
+       struct device *dev = epc->dev.parent;
 
        if (epf->epc)
                return -EBUSY;
@@ -381,8 +383,12 @@ int pci_epc_add_epf(struct pci_epc *epc, struct pci_epf *epf)
                return -EINVAL;
 
        epf->epc = epc;
-       dma_set_coherent_mask(&epf->dev, epc->dev.coherent_dma_mask);
-       epf->dev.dma_mask = epc->dev.dma_mask;
+       if (dev->of_node) {
+               of_dma_configure(&epf->dev, dev->of_node);
+       } else {
+               dma_set_coherent_mask(&epf->dev, epc->dev.coherent_dma_mask);
+               epf->dev.dma_mask = epc->dev.dma_mask;
+       }
 
        spin_lock_irqsave(&epc->lock, flags);
        list_add_tail(&epf->list, &epc->pci_epf);
@@ -500,6 +506,7 @@ __pci_epc_create(struct device *dev, const struct pci_epc_ops *ops,
        dma_set_coherent_mask(&epc->dev, dev->coherent_dma_mask);
        epc->dev.class = pci_epc_class;
        epc->dev.dma_mask = dev->dma_mask;
+       epc->dev.parent = dev;
        epc->ops = ops;
 
        ret = dev_set_name(&epc->dev, "%s", dev_name(dev));