Return-path: Received: from mail-ve1eur01on0068.outbound.protection.outlook.com ([104.47.1.68]:3083 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751855AbeCUHTU (ORCPT ); Wed, 21 Mar 2018 03:19:20 -0400 From: Bharat Bhushan To: Nipun Gupta , "robin.murphy@arm.com" , "hch@lst.de" , "linux@armlinux.org.uk" , "gregkh@linuxfoundation.org" , "m.szyprowski@samsung.com" CC: "bhelgaas@google.com" , "zajec5@gmail.com" , "andy.gross@linaro.org" , "david.brown@linaro.org" , "dan.j.williams@intel.com" , "vinod.koul@intel.com" , "thierry.reding@gmail.com" , "robh+dt@kernel.org" , "frowand.list@gmail.com" , "jarkko.sakkinen@linux.intel.com" , "rafael.j.wysocki@intel.com" , "dmitry.torokhov@gmail.com" , "johan@kernel.org" , "msuchanek@suse.de" , "linux-kernel@vger.kernel.org" , "iommu@lists.linux-foundation.org" , "linux-wireless@vger.kernel.org" , "linux-arm-msm@vger.kernel.org" , "linux-soc@vger.kernel.org" , "dmaengine@vger.kernel.org" , "dri-devel@lists.freedesktop.org" , "linux-tegra@vger.kernel.org" , "devicetree@vger.kernel.org" , "linux-pci@vger.kernel.org" , Leo Li Subject: RE: [PATCH v2 1/2] dma-mapping: move dma configuration to bus infrastructure Date: Wed, 21 Mar 2018 07:19:15 +0000 Message-ID: (sfid-20180321_082049_256479_BEC20C53) References: <1520868292-2479-1-git-send-email-nipun.gupta@nxp.com> <1521615323-4752-1-git-send-email-nipun.gupta@nxp.com> In-Reply-To: <1521615323-4752-1-git-send-email-nipun.gupta@nxp.com> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org List-ID: > -----Original Message----- > From: Nipun Gupta > Sent: Wednesday, March 21, 2018 12:25 PM > To: robin.murphy@arm.com; hch@lst.de; linux@armlinux.org.uk; > gregkh@linuxfoundation.org; m.szyprowski@samsung.com > Cc: bhelgaas@google.com; zajec5@gmail.com; andy.gross@linaro.org; > david.brown@linaro.org; dan.j.williams@intel.com; vinod.koul@intel.com; > thierry.reding@gmail.com; robh+dt@kernel.org; frowand.list@gmail.com; > jarkko.sakkinen@linux.intel.com; rafael.j.wysocki@intel.com; > dmitry.torokhov@gmail.com; johan@kernel.org; msuchanek@suse.de; linux- > kernel@vger.kernel.org; iommu@lists.linux-foundation.org; linux- > wireless@vger.kernel.org; linux-arm-msm@vger.kernel.org; linux- > soc@vger.kernel.org; dmaengine@vger.kernel.org; dri- > devel@lists.freedesktop.org; linux-tegra@vger.kernel.org; > devicetree@vger.kernel.org; linux-pci@vger.kernel.org; Bharat Bhushan > ; Leo Li ; Nipun Gupta > > Subject: [PATCH v2 1/2] dma-mapping: move dma configuration to bus > infrastructure >=20 > It's bus specific aspect to map a given device on the bus and relevant fi= rmware > description of its DMA configuration. > So, this change introduces '/dma_configure/' as bus callback giving flexi= bility to > busses for implementing its own dma configuration function. >=20 > The change eases the addition of new busses w.r.t. adding the dma > configuration functionality. >=20 > This patch also updates the PCI, Platform, ACPI and host1x bus to use new > introduced callbacks. >=20 > Suggested-by: Christoph Hellwig > Signed-off-by: Nipun Gupta > --- > - The patches are based on the comments on: > https://patchwork.kernel.org/patch/10259087/ >=20 > Changes in v2: > - Do not have dma_deconfigure callback > - Have '/dma_common_configure/' API to provide a common DMA > configuration which can be used by busses if it suits them. > - Platform and ACPI bus to use '/dma_common_configure/' in > '/dma_configure/' callback. > - Updated commit message > - Updated pci_dma_configure API with changes suggested by Robin >=20 > drivers/amba/bus.c | 7 +++++++ > drivers/base/dma-mapping.c | 35 +++++++++++++++-------------------- > drivers/base/platform.c | 6 ++++++ > drivers/gpu/host1x/bus.c | 9 +++++++++ > drivers/pci/pci-driver.c | 32 ++++++++++++++++++++++++++++++++ > include/linux/device.h | 4 ++++ > include/linux/dma-mapping.h | 1 + > 7 files changed, 74 insertions(+), 20 deletions(-) >=20 > diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c index 594c228..2fa1e= 8b > 100644 > --- a/drivers/amba/bus.c > +++ b/drivers/amba/bus.c > @@ -20,6 +20,7 @@ > #include > #include > #include > +#include >=20 > #include >=20 > @@ -171,6 +172,11 @@ static int amba_pm_runtime_resume(struct device > *dev) } #endif /* CONFIG_PM */ >=20 > +static int amba_dma_configure(struct device *dev) { > + return dma_common_configure(dev); > +} > + > static const struct dev_pm_ops amba_pm =3D { > .suspend =3D pm_generic_suspend, > .resume =3D pm_generic_resume, > @@ -194,6 +200,7 @@ struct bus_type amba_bustype =3D { > .dev_groups =3D amba_dev_groups, > .match =3D amba_match, > .uevent =3D amba_uevent, > + .dma_configure =3D amba_dma_configure, > .pm =3D &amba_pm, > .force_dma =3D true, > }; > diff --git a/drivers/base/dma-mapping.c b/drivers/base/dma-mapping.c inde= x > 3b11835..48f9af0 100644 > --- a/drivers/base/dma-mapping.c > +++ b/drivers/base/dma-mapping.c > @@ -331,38 +331,33 @@ void dma_common_free_remap(void *cpu_addr, > size_t size, unsigned long vm_flags) #endif >=20 > /* > - * Common configuration to enable DMA API use for a device > + * Common configuration to enable DMA API use for a device. > + * A bus can use this function in its 'dma_configure' callback, if > + * suitable for the bus. > */ > -#include > - > -int dma_configure(struct device *dev) > +int dma_common_configure(struct device *dev) > { > - struct device *bridge =3D NULL, *dma_dev =3D dev; > enum dev_dma_attr attr; > int ret =3D 0; >=20 > - if (dev_is_pci(dev)) { > - bridge =3D pci_get_host_bridge_device(to_pci_dev(dev)); > - dma_dev =3D bridge; > - if (IS_ENABLED(CONFIG_OF) && dma_dev->parent && > - dma_dev->parent->of_node) > - dma_dev =3D dma_dev->parent; > - } > - > - if (dma_dev->of_node) { > - ret =3D of_dma_configure(dev, dma_dev->of_node); > - } else if (has_acpi_companion(dma_dev)) { > - attr =3D acpi_get_dma_attr(to_acpi_device_node(dma_dev- > >fwnode)); > + if (dev->of_node) { > + ret =3D of_dma_configure(dev, dev->of_node); > + } else if (has_acpi_companion(dev)) { > + attr =3D acpi_get_dma_attr(to_acpi_device_node(dev->fwnode)); > if (attr !=3D DEV_DMA_NOT_SUPPORTED) > ret =3D acpi_dma_configure(dev, attr); > } >=20 > - if (bridge) > - pci_put_host_bridge_device(bridge); > - > return ret; > } >=20 > +int dma_configure(struct device *dev) > +{ > + if (dev->bus->dma_configure) > + return dev->bus->dma_configure(dev); What if dma_common_configure() is called in case "bus->dma_configure" is no= t defined? Thanks -Bharat > + > + return 0; > +} > void dma_deconfigure(struct device *dev) { > of_dma_deconfigure(dev); > diff --git a/drivers/base/platform.c b/drivers/base/platform.c index > f1bf7b3..d2d5891 100644 > --- a/drivers/base/platform.c > +++ b/drivers/base/platform.c > @@ -1130,6 +1130,11 @@ int platform_pm_restore(struct device *dev) >=20 > #endif /* CONFIG_HIBERNATE_CALLBACKS */ >=20 > +static int platform_dma_configure(struct device *dev) { > + return dma_common_configure(dev); > +} > + > static const struct dev_pm_ops platform_dev_pm_ops =3D { > .runtime_suspend =3D pm_generic_runtime_suspend, > .runtime_resume =3D pm_generic_runtime_resume, @@ -1141,6 +1146,7 > @@ struct bus_type platform_bus_type =3D { > .dev_groups =3D platform_dev_groups, > .match =3D platform_match, > .uevent =3D platform_uevent, > + .dma_configure =3D platform_dma_configure, > .pm =3D &platform_dev_pm_ops, > .force_dma =3D true, > }; > diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c index > 88a3558..fa9896d 100644 > --- a/drivers/gpu/host1x/bus.c > +++ b/drivers/gpu/host1x/bus.c > @@ -314,6 +314,14 @@ static int host1x_device_match(struct device *dev, > struct device_driver *drv) > return strcmp(dev_name(dev), drv->name) =3D=3D 0; } >=20 > +static int host1x_dma_configure(struct device *dev) { > + if (dev->of_node) > + return of_dma_configure(dev, dev->of_node); > + > + return 0; > +} > + > static const struct dev_pm_ops host1x_device_pm_ops =3D { > .suspend =3D pm_generic_suspend, > .resume =3D pm_generic_resume, > @@ -326,6 +334,7 @@ static int host1x_device_match(struct device *dev, > struct device_driver *drv) struct bus_type host1x_bus_type =3D { > .name =3D "host1x", > .match =3D host1x_device_match, > + .dma_configure =3D host1x_dma_configure, > .pm =3D &host1x_device_pm_ops, > .force_dma =3D true, > }; > diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index > 3bed6be..b473a4c 100644 > --- a/drivers/pci/pci-driver.c > +++ b/drivers/pci/pci-driver.c > @@ -18,6 +18,8 @@ > #include > #include > #include > +#include > +#include > #include "pci.h" >=20 > struct pci_dynid { > @@ -1522,6 +1524,35 @@ static int pci_bus_num_vf(struct device *dev) > return pci_num_vf(to_pci_dev(dev)); > } >=20 > +/** > + * pci_dma_configure - Setup DMA configuration > + * @dev: ptr to dev structure > + * > + * Function to update PCI devices's DMA configuration using the same > + * info from the OF node or ACPI node of host bridge's parent (if any). > + */ > +static int pci_dma_configure(struct device *dev) { > + struct device *bridge; > + enum dev_dma_attr attr; > + int ret =3D 0; > + > + bridge =3D pci_get_host_bridge_device(to_pci_dev(dev)); > + > + if (IS_ENABLED(CONFIG_OF) && bridge->parent && > + bridge->parent->of_node) { > + ret =3D of_dma_configure(dev, bridge->parent->of_node); > + } else if (has_acpi_companion(bridge)) { > + attr =3D acpi_get_dma_attr(to_acpi_device_node(bridge- > >fwnode)); > + if (attr !=3D DEV_DMA_NOT_SUPPORTED) > + ret =3D acpi_dma_configure(dev, attr); > + } > + > + pci_put_host_bridge_device(bridge); > + > + return ret; > +} > + > struct bus_type pci_bus_type =3D { > .name =3D "pci", > .match =3D pci_bus_match, > @@ -1534,6 +1565,7 @@ struct bus_type pci_bus_type =3D { > .drv_groups =3D pci_drv_groups, > .pm =3D PCI_PM_OPS_PTR, > .num_vf =3D pci_bus_num_vf, > + .dma_configure =3D pci_dma_configure, > .force_dma =3D true, > }; > EXPORT_SYMBOL(pci_bus_type); > diff --git a/include/linux/device.h b/include/linux/device.h index > b093405..1832d90 100644 > --- a/include/linux/device.h > +++ b/include/linux/device.h > @@ -88,6 +88,8 @@ extern int __must_check bus_create_file(struct bus_type > *, > * @resume: Called to bring a device on this bus out of sleep mode. > * @num_vf: Called to find out how many virtual functions a device on th= is > * bus supports. > + * @dma_configure: Called to setup DMA configuration on a device on > + this bus. > * @pm: Power management operations of this bus, callback the > specific > * device driver's pm-ops. > * @iommu_ops: IOMMU specific operations for this bus, used to attach > IOMMU @@ -130,6 +132,8 @@ struct bus_type { >=20 > int (*num_vf)(struct device *dev); >=20 > + int (*dma_configure)(struct device *dev); > + > const struct dev_pm_ops *pm; >=20 > const struct iommu_ops *iommu_ops; > diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h in= dex > eb9eab4..c15986b 100644 > --- a/include/linux/dma-mapping.h > +++ b/include/linux/dma-mapping.h > @@ -761,6 +761,7 @@ void *dma_mark_declared_memory_occupied(struct > device *dev, } #endif /* CONFIG_HAVE_GENERIC_DMA_COHERENT */ >=20 > +int dma_common_configure(struct device *dev); > #ifdef CONFIG_HAS_DMA > int dma_configure(struct device *dev); > void dma_deconfigure(struct device *dev); > -- > 1.9.1