From: Rob Herring <robh@kernel.org>
To: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org,
Nicolas Saenz Julienne <nsaenzjulienne@suse.de>,
Robin Murphy <robin.murphy@arm.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Stefan Wahren <wahrenst@gmx.net>,
Frank Rowand <frowand.list@gmail.com>,
Arnd Bergmann <arnd@arndb.de>,
Marek Vasut <marek.vasut@gmail.com>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Simon Horman <horms+renesas@verge.net.au>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Oza Pawandeep <oza.oza@broadcom.com>
Subject: [PATCH 05/11] of: Ratify of_dma_configure() interface
Date: Thu, 26 Sep 2019 19:24:49 -0500 [thread overview]
Message-ID: <20190927002455.13169-6-robh@kernel.org> (raw)
In-Reply-To: <20190927002455.13169-1-robh@kernel.org>
From: Robin Murphy <robin.murphy@arm.com>
For various DMA masters not directly represented in DT, we pass the OF
node of their parent or bridge device as the master_np argument to
of_dma_configure(), such that they can inherit the appropriate DMA
configuration from whatever is described there. This creates an
ambiguity for properties which are not valid for a device itself but
only for its parent bus, since we don't know whether to start looking
for those at master_np or master_np->parent.
Fortunately, the de-facto interface since the prototype change in
1f5c69aa51f9 ("of: Move of_dma_configure() to device.c to help re-use")
is pretty clear-cut: either master_np is redundant with dev->of_node, or
dev->of_node is NULL and master_np is already the relevant parent. Let's
formally ratify that so we can start relying on it.
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Rob Herring <robh@kernel.org>
---
drivers/of/device.c | 12 ++++++++++--
include/linux/of_device.h | 4 ++--
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/drivers/of/device.c b/drivers/of/device.c
index da8158392010..a45261e21144 100644
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -75,7 +75,8 @@ int of_device_add(struct platform_device *ofdev)
/**
* of_dma_configure - Setup DMA configuration
* @dev: Device to apply DMA configuration
- * @np: Pointer to OF node having DMA configuration
+ * @parent: OF node of parent device having DMA configuration, if
+ * @dev->of_node is NULL (ignored otherwise)
* @force_dma: Whether device is to be set up by of_dma_configure() even if
* DMA capability is not explicitly described by firmware.
*
@@ -86,15 +87,22 @@ int of_device_add(struct platform_device *ofdev)
* can use a platform bus notifier and handle BUS_NOTIFY_ADD_DEVICE events
* to fix up DMA configuration.
*/
-int of_dma_configure(struct device *dev, struct device_node *np, bool force_dma)
+int of_dma_configure(struct device *dev, struct device_node *parent, bool force_dma)
{
u64 dma_addr, paddr, size = 0;
int ret;
bool coherent;
unsigned long offset;
const struct iommu_ops *iommu;
+ struct device_node *np;
u64 mask;
+ np = dev->of_node;
+ if (!np)
+ np = parent;
+ if (!np)
+ return -ENODEV;
+
ret = of_dma_get_range(np, &dma_addr, &paddr, &size);
if (ret < 0) {
/*
diff --git a/include/linux/of_device.h b/include/linux/of_device.h
index 8d31e39dd564..a4fe418e57f6 100644
--- a/include/linux/of_device.h
+++ b/include/linux/of_device.h
@@ -56,7 +56,7 @@ static inline struct device_node *of_cpu_device_node_get(int cpu)
}
int of_dma_configure(struct device *dev,
- struct device_node *np,
+ struct device_node *parent,
bool force_dma);
#else /* CONFIG_OF */
@@ -107,7 +107,7 @@ static inline struct device_node *of_cpu_device_node_get(int cpu)
}
static inline int of_dma_configure(struct device *dev,
- struct device_node *np,
+ struct device_node *parent,
bool force_dma)
{
return 0;
--
2.20.1
next prev parent reply other threads:[~2019-09-27 0:25 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-27 0:24 [PATCH 00/11] of: dma-ranges fixes and improvements Rob Herring
2019-09-27 0:24 ` [PATCH 01/11] of: Remove unused of_find_matching_node_by_address() Rob Herring
2019-09-27 9:17 ` Geert Uytterhoeven
2019-09-30 12:49 ` Christoph Hellwig
2019-09-27 0:24 ` [PATCH 02/11] of: Make of_dma_get_range() private Rob Herring
2019-09-27 9:18 ` Geert Uytterhoeven
2019-09-30 12:53 ` Christoph Hellwig
2019-09-27 0:24 ` [PATCH 03/11] of: address: Report of_dma_get_range() errors meaningfully Rob Herring
2019-09-27 9:15 ` Geert Uytterhoeven
2019-09-30 12:54 ` Christoph Hellwig
2019-09-27 0:24 ` [PATCH 04/11] of/unittest: Add dma-ranges address translation tests Rob Herring
2019-09-27 0:24 ` Rob Herring [this message]
2019-09-30 12:57 ` [PATCH 05/11] of: Ratify of_dma_configure() interface Christoph Hellwig
2019-09-30 13:32 ` Nicolas Saenz Julienne
2019-09-30 21:24 ` Rob Herring
2019-10-01 15:43 ` Nicolas Saenz Julienne
2019-10-04 1:53 ` Rob Herring
2019-10-07 17:51 ` Nicolas Saenz Julienne
2019-09-27 0:24 ` [PATCH 06/11] of/address: Introduce of_get_next_dma_parent() helper Rob Herring
2019-09-27 9:24 ` Geert Uytterhoeven
2019-09-27 0:24 ` [PATCH 07/11] of: address: Follow DMA parent for "dma-coherent" Rob Herring
2019-09-27 0:24 ` [PATCH 08/11] of: Factor out #{addr,size}-cells parsing Rob Herring
2019-09-27 9:27 ` Geert Uytterhoeven
2019-09-27 0:24 ` [PATCH 09/11] of: Make of_dma_get_range() work on bus nodes Rob Herring
2019-09-27 0:24 ` [PATCH 10/11] of/address: Translate 'dma-ranges' for parent nodes missing 'dma-ranges' Rob Herring
2019-09-27 0:24 ` [PATCH 11/11] of/address: Fix of_pci_range_parser_one translation of DMA addresses Rob Herring
2019-09-29 11:16 ` [PATCH 00/11] of: dma-ranges fixes and improvements Arnd Bergmann
2019-09-30 8:20 ` Christoph Hellwig
2019-09-30 8:56 ` Thierry Reding
2019-09-30 9:55 ` Robin Murphy
2019-09-30 13:35 ` Thierry Reding
2019-09-30 9:20 ` Nicolas Saenz Julienne
2019-09-30 12:40 ` Marek Vasut
2019-09-30 12:52 ` Robin Murphy
2019-09-30 12:54 ` Marek Vasut
2019-09-30 13:05 ` Robin Murphy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190927002455.13169-6-robh@kernel.org \
--to=robh@kernel.org \
--cc=arnd@arndb.de \
--cc=devicetree@vger.kernel.org \
--cc=f.fainelli@gmail.com \
--cc=frowand.list@gmail.com \
--cc=geert+renesas@glider.be \
--cc=horms+renesas@verge.net.au \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=marek.vasut@gmail.com \
--cc=nsaenzjulienne@suse.de \
--cc=oza.oza@broadcom.com \
--cc=robin.murphy@arm.com \
--cc=wahrenst@gmx.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).