| Message ID | 1524824826-29473-6-git-send-email-nipun.gupta@nxp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
Hi Nipun, On 04/27/2018 01:27 PM, Nipun Gupta wrote: > Signed-off-by: Nipun Gupta <nipun.gupta@nxp.com> > --- > drivers/bus/fsl-mc/fsl-mc-bus.c | 16 ++++++++++++---- > 1 file changed, 12 insertions(+), 4 deletions(-) > > diff --git a/drivers/bus/fsl-mc/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bus.c > index 5d8266c..624828b 100644 > --- 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); > @@ -616,6 +627,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; This change seems a bit unrelated to the patch subject. I wonder if it makes sense to split it it in a distinct patch. --- Best Regards, Laurentiu
> -----Original Message----- > From: Laurentiu Tudor > Sent: Monday, May 14, 2018 7:10 PM > To: Nipun Gupta <nipun.gupta@nxp.com>; robin.murphy@arm.com; > will.deacon@arm.com; mark.rutland@arm.com; catalin.marinas@arm.com > Cc: hch@lst.de; gregkh@linuxfoundation.org; joro@8bytes.org; > robh+dt@kernel.org; m.szyprowski@samsung.com; shawnguo@kernel.org; > frowand.list@gmail.com; bhelgaas@google.com; iommu@lists.linux- > foundation.org; linux-kernel@vger.kernel.org; devicetree@vger.kernel.org; > linux-arm-kernel@lists.infradead.org; linuxppc-dev@lists.ozlabs.org; linux- > pci@vger.kernel.org; Bharat Bhushan <bharat.bhushan@nxp.com>; > stuyoder@gmail.com; Leo Li <leoyang.li@nxp.com> > Subject: Re: [PATCH 5/6 v3] bus: fsl-mc: supoprt dma configure for devices > on fsl-mc bus > > Hi Nipun, > > On 04/27/2018 01:27 PM, Nipun Gupta wrote: > > Signed-off-by: Nipun Gupta <nipun.gupta@nxp.com> > > --- > > drivers/bus/fsl-mc/fsl-mc-bus.c | 16 ++++++++++++---- > > 1 file changed, 12 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/bus/fsl-mc/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc- > bus.c > > index 5d8266c..624828b 100644 > > --- 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); > > @@ -616,6 +627,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; > > This change seems a bit unrelated to the patch subject. I wonder if it > makes sense to split it it in a distinct patch. Okay. I will spin a v5 after splitting this patch and adding changelog (Greg's comment), fixing typo (Bjorn's comment). Regards, Nipun > > --- > Best Regards, Laurentiu
diff --git a/drivers/bus/fsl-mc/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bus.c index 5d8266c..624828b 100644 --- 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); @@ -616,6 +627,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)); } @@ -633,10 +645,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() */
Signed-off-by: Nipun Gupta <nipun.gupta@nxp.com> --- drivers/bus/fsl-mc/fsl-mc-bus.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)