On Fri, Mar 30, 2018 at 01:24:45PM +0530, Nipun Gupta wrote:
> With each bus implementing its own DMA configuration callback,
> there is no need for bus to explicitly have force_dma in its
> global structure. This patch modifies of_dma_configure API to
> accept an input parameter which specifies if implicit DMA
> configuration is required even when it is not described by the
> firmware.
>
> Signed-off-by: Nipun Gupta
Acked-by: Bjorn Helgaas # PCI parts
> ---
> Changes in v2:
> - This is a new change suggested by Robin and Christoph
> and is added to the series.
>
> Changes in v3:
> - Rebase and changes corresponding to the changes in patch 1/2
>
> drivers/amba/bus.c| 1 -
> drivers/base/platform.c | 3 +--
> drivers/bcma/main.c | 2 +-
> drivers/dma/qcom/hidma_mgmt.c | 2 +-
> drivers/gpu/host1x/bus.c | 5 ++---
> drivers/of/device.c | 6 --
> drivers/of/of_reserved_mem.c | 2 +-
> drivers/pci/pci-driver.c | 3 +--
> include/linux/device.h| 4
> include/linux/of_device.h | 8 ++--
> 10 files changed, 17 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
> index 867dc2b..abe73c4 100644
> --- a/drivers/amba/bus.c
> +++ b/drivers/amba/bus.c
> @@ -199,7 +199,6 @@ struct bus_type amba_bustype = {
> .uevent = amba_uevent,
> .dma_configure = platform_dma_configure,
> .pm = &amba_pm,
> - .force_dma = true,
> };
>
> static int __init amba_init(void)
> diff --git a/drivers/base/platform.c b/drivers/base/platform.c
> index 72fdbf6..cfbc569 100644
> --- a/drivers/base/platform.c
> +++ b/drivers/base/platform.c
> @@ -1136,7 +1136,7 @@ int platform_dma_configure(struct device *dev)
> int ret = 0;
>
> if (dev->of_node) {
> - ret = of_dma_configure(dev, dev->of_node);
> + ret = of_dma_configure(dev, dev->of_node, true);
> } else if (has_acpi_companion(dev)) {
> attr = acpi_get_dma_attr(to_acpi_device_node(dev->fwnode));
> if (attr != DEV_DMA_NOT_SUPPORTED)
> @@ -1159,7 +1159,6 @@ struct bus_type platform_bus_type = {
> .uevent = platform_uevent,
> .dma_configure = platform_dma_configure,
> .pm = &platform_dev_pm_ops,
> - .force_dma = true,
> };
> EXPORT_SYMBOL_GPL(platform_bus_type);
>
> diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
> index e6986c7..fc1f4ac 100644
> --- a/drivers/bcma/main.c
> +++ b/drivers/bcma/main.c
> @@ -207,7 +207,7 @@ static void bcma_of_fill_device(struct device *parent,
>
> core->irq = bcma_of_get_irq(parent, core, 0);
>
> - of_dma_configure(&core->dev, node);
> + of_dma_configure(&core->dev, node, false);
> }
>
> unsigned int bcma_core_irq(struct bcma_device *core, int num)
> diff --git a/drivers/dma/qcom/hidma_mgmt.c b/drivers/dma/qcom/hidma_mgmt.c
> index 000c7019..d64edeb 100644
> --- a/drivers/dma/qcom/hidma_mgmt.c
> +++ b/drivers/dma/qcom/hidma_mgmt.c
> @@ -398,7 +398,7 @@ static int __init hidma_mgmt_of_populate_channels(struct
> device_node *np)
> }
> of_node_get(child);
> new_pdev->dev.of_node = child;
> - of_dma_configure(&new_pdev->dev, child);
> + of_dma_configure(&new_pdev->dev, child, true);
> /*
>* It is assumed that calling of_msi_configure is safe on
>* platforms with or without MSI support.
> diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c
> index a9ec99d..b39c1e9 100644
> --- a/drivers/gpu/host1x/bus.c
> +++ b/drivers/gpu/host1x/bus.c
> @@ -317,7 +317,7 @@ static int host1x_device_match(struct device *dev, struct
> device_driver *drv)
> static int host1x_dma_configure(struct device *dev)
> {
> if (dev->of_node)
> - return of_dma_configure(dev, dev->of_node);
> + return of_dma_configure(dev, dev->of_node, true);
> return 0;
> }
>
> @@ -335,7 +335,6 @@ struct bus_type host1x_bus_type = {
> .match = host1x_device_match,
> .dma_configure = host1x_dma_configure,
> .pm = &host1x_device_pm_ops,
> - .force_dma = true,
> };
>
> static void __host1x_device_del(struct host1x_device *device)
> @@ -424,7 +423,7 @@ static int host1x_device_add(struct host1x *host1x,
> device->dev.bus = &host1x_bus_type;
> device->dev.parent = host1x->dev;
>
> - of_dma_configure(&device->dev, host1x->dev->of_node);
> + of_dma_configure(&device->dev, host1x->dev->of_node, true);
>
> err = host1x_device_parse_dt(device, driver);
> if (err < 0) {
> diff --git a/drivers/of/device.c b/drivers/of/device.c
> index 064c818..33d8551 100644
> --- a/drivers/of/device.c
> +++ b/drivers/of/device.c
> @@ -76,6 +76,8 @@ int of_device_add(struct platform_device *ofdev)
> * of_dma_configure - Setup DMA configuration
> * @dev: Device to apply DMA configuration
