From: Peng Fan <peng.fan@nxp.com>
To: hch@lst.de, m.szyprowski@samsung.com, robin.murphy@arm.com,
gregkh@linuxfoundation.org, robh+dt@kernel.org,
frowand.list@gmail.com
Cc: iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org,
devicetree@vger.kernel.org, van.freenix@gmail.com,
Peng Fan <peng.fan@nxp.com>
Subject: [RFC 2/2] drivers: dma-mapping: parse per device reserved mem at probe time
Date: Sun, 26 Nov 2017 21:13:46 +0800 [thread overview]
Message-ID: <20171126131346.12532-2-peng.fan@nxp.com> (raw)
In-Reply-To: <20171126131346.12532-1-peng.fan@nxp.com>
Invoke of_reserved_mem_device_init at dma_configure, then
there is no need to call of_reserved_mem_device_init in device
specific probe function.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
drivers/base/dma-mapping.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/base/dma-mapping.c b/drivers/base/dma-mapping.c
index e584eddef0a7..55dca06a7b55 100644
--- a/drivers/base/dma-mapping.c
+++ b/drivers/base/dma-mapping.c
@@ -12,6 +12,7 @@
#include <linux/export.h>
#include <linux/gfp.h>
#include <linux/of_device.h>
+#include <linux/of_reserved_mem.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
@@ -351,7 +352,9 @@ int dma_configure(struct device *dev)
}
if (dma_dev->of_node) {
- ret = of_dma_configure(dev, dma_dev->of_node);
+ ret = of_reserved_mem_device_init(dev);
+ if (ret)
+ ret = of_dma_configure(dev, dma_dev->of_node);
} else if (has_acpi_companion(dma_dev)) {
attr = acpi_get_dma_attr(to_acpi_device_node(dma_dev->fwnode));
if (attr != DEV_DMA_NOT_SUPPORTED)
@@ -367,5 +370,6 @@ int dma_configure(struct device *dev)
void dma_deconfigure(struct device *dev)
{
of_dma_deconfigure(dev);
+ of_reserved_mem_device_release(dev);
acpi_dma_deconfigure(dev);
}
--
2.14.1
next prev parent reply other threads:[~2017-11-26 13:14 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-26 13:13 [RFC 1/2] of: reserved_mem: check return value of_dma_configure Peng Fan
2017-11-26 13:13 ` Peng Fan [this message]
2017-11-27 8:31 ` [RFC 2/2] drivers: dma-mapping: parse per device reserved mem at probe time Marek Szyprowski
2017-11-27 8:37 ` Peng Fan
2017-11-27 8:44 ` Marek Szyprowski
2017-11-27 9:04 ` Peng Fan
2017-12-07 12:01 ` Marek Szyprowski
2017-11-27 4:15 ` [RFC 1/2] of: reserved_mem: check return value of_dma_configure Peng Fan
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=20171126131346.12532-2-peng.fan@nxp.com \
--to=peng.fan@nxp.com \
--cc=devicetree@vger.kernel.org \
--cc=frowand.list@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=hch@lst.de \
--cc=iommu@lists.linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=robh+dt@kernel.org \
--cc=robin.murphy@arm.com \
--cc=van.freenix@gmail.com \
/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
all inboxes | Powered by JetHome®