Skip to content

Commit

Permalink
bus/fsl-mc: support dma configure for devices on fsl-mc bus
Browse files Browse the repository at this point in the history
This patch adds support of dma configuration for devices on fsl-mc
bus using 'dma_configure' callback for busses. Also, directly calling
arch_setup_dma_ops is removed from the fsl-mc bus.

Signed-off-by: Nipun Gupta <nipun.gupta@nxp.com>
Reviewed-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
  • Loading branch information
Nipun Gupta authored and Joerg Roedel committed Sep 25, 2018
1 parent eab03e2 commit a259ed1
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions drivers/bus/fsl-mc/fsl-mc-bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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);
Expand Down Expand Up @@ -633,10 +644,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()
*/
Expand Down

0 comments on commit a259ed1

Please sign in to comment.