Merge tag 'iommu-updates-v4.20' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / bus / fsl-mc / fsl-mc-bus.c

diff --git a/drivers/bus/fsl-mc/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bus.c
index 4552b06fe601a16616b50c73c8f599ced891df0f..439ba5c23693be5c137212c391a90f96267f376f 100644 (file)
--- a/drivers/bus/fsl-mc/fsl-mc-bus.c
+++ b/drivers/bus/fsl-mc/fsl-mc-bus.c
@@ -127,6 +127,16 @@ static int fsl_mc_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
        return 0;
 }
 
+static int fsl_mc_dma_configure(struct device *dev)
+{
+       struct device *dma_dev = dev;
+
+       while (dev_is_fsl_mc(dma_dev))
+               dma_dev = dma_dev->parent;
+
+       return of_dma_configure(dev, dma_dev->of_node, 0);
+}
+
 static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
                             char *buf)
 {
@@ -148,6 +158,7 @@ struct bus_type fsl_mc_bus_type = {
        .name = "fsl-mc",
        .match = fsl_mc_bus_match,
        .uevent = fsl_mc_bus_uevent,
+       .dma_configure  = fsl_mc_dma_configure,
        .dev_groups = fsl_mc_dev_groups,
 };
 EXPORT_SYMBOL_GPL(fsl_mc_bus_type);
@@ -621,6 +632,7 @@ int fsl_mc_device_add(struct fsl_mc_obj_desc *obj_desc,
                mc_dev->icid = parent_mc_dev->icid;
                mc_dev->dma_mask = FSL_MC_DEFAULT_DMA_MASK;
                mc_dev->dev.dma_mask = &mc_dev->dma_mask;
+               mc_dev->dev.coherent_dma_mask = mc_dev->dma_mask;
                dev_set_msi_domain(&mc_dev->dev,
                                   dev_get_msi_domain(&parent_mc_dev->dev));
        }
@@ -638,10 +650,6 @@ int fsl_mc_device_add(struct fsl_mc_obj_desc *obj_desc,
                        goto error_cleanup_dev;
        }
 
-       /* Objects are coherent, unless 'no shareability' flag set. */
-       if (!(obj_desc->flags & FSL_MC_OBJ_FLAG_NO_MEM_SHAREABILITY))
-               arch_setup_dma_ops(&mc_dev->dev, 0, 0, NULL, true);
-
        /*
         * The device-specific probe callback will get invoked by device_add()
         */