From: Nipun Gupta <nipun.gupta@nxp.com>
To: robin.murphy@arm.com, will.deacon@arm.com, robh+dt@kernel.org,
robh@kernel.org, mark.rutland@arm.com, catalin.marinas@arm.com,
gregkh@linuxfoundation.org, laurentiu.tudor@nxp.com,
bhelgaas@google.com
Cc: hch@lst.de, joro@8bytes.org, m.szyprowski@samsung.com,
shawnguo@kernel.org, frowand.list@gmail.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@nxp.com, stuyoder@gmail.com, leoyang.li@nxp.com,
Nipun Gupta <nipun.gupta@nxp.com>
Subject: [PATCH 5/7 v5] bus: fsl-mc: support dma configure for devices on fsl-mc bus
Date: Sun, 20 May 2018 19:19:49 +0530 [thread overview]
Message-ID: <1526824191-7000-6-git-send-email-nipun.gupta@nxp.com> (raw)
In-Reply-To: <1526824191-7000-1-git-send-email-nipun.gupta@nxp.com>
This patch adds support of dma configuration for devices on fsl-mc
bus using 'dma_configure' callback for busses. Also, directly calling
arch_setup_dma_ops is removed from the fsl-mc bus.
Signed-off-by: Nipun Gupta <nipun.gupta@nxp.com>
Reviewed-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
---
drivers/bus/fsl-mc/fsl-mc-bus.c | 15 +++++++++++----
1 file changed, 11 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..fa43c7d 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);
@@ -633,10 +644,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()
*/
--
1.9.1
next prev parent reply other threads:[~2018-05-20 13:49 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-20 13:49 [PATCH 0/7 v5] Support for fsl-mc bus and its devices in SMMU Nipun Gupta
2018-05-20 13:49 ` [PATCH 1/7 v5] Docs: dt: add fsl-mc iommu-map device-tree binding Nipun Gupta
2018-07-03 14:39 ` Robin Murphy
[not found] ` <cd70dc56-ce6a-f6ef-1362-143d9c31bb46-5wv7dgnIgG8@public.gmane.org>
2018-07-06 12:10 ` Nipun Gupta
2018-05-20 13:49 ` [PATCH 2/7 v5] iommu: of: make of_pci_map_rid() available for other devices too Nipun Gupta
2018-07-03 14:41 ` Robin Murphy
2018-05-20 13:49 ` [PATCH 3/7 v5] iommu: support iommu configuration for fsl-mc devices Nipun Gupta
[not found] ` <1526824191-7000-4-git-send-email-nipun.gupta-3arQi8VN3Tc@public.gmane.org>
2018-07-03 15:30 ` Robin Murphy
2018-05-20 13:49 ` [PATCH 4/7 v5] iommu: arm-smmu: Add support for the fsl-mc bus Nipun Gupta
[not found] ` <1526824191-7000-5-git-send-email-nipun.gupta-3arQi8VN3Tc@public.gmane.org>
2018-07-03 16:01 ` Robin Murphy
2018-05-20 13:49 ` Nipun Gupta [this message]
[not found] ` <1526824191-7000-6-git-send-email-nipun.gupta-3arQi8VN3Tc@public.gmane.org>
2018-07-03 16:14 ` [PATCH 5/7 v5] bus: fsl-mc: support dma configure for devices on " Robin Murphy
[not found] ` <b4cf1e86-0297-97ed-d10e-9b430ecb0bc7-5wv7dgnIgG8@public.gmane.org>
2018-07-06 12:17 ` Nipun Gupta
2018-05-20 13:49 ` [PATCH 6/7 v5] bus: fsl-mc: set coherent dma mask " Nipun Gupta
[not found] ` <1526824191-7000-7-git-send-email-nipun.gupta-3arQi8VN3Tc@public.gmane.org>
2018-05-22 7:03 ` Laurentiu Tudor
2018-07-03 16:15 ` Robin Murphy
2018-05-20 13:49 ` [PATCH 7/7 v5] arm64: dts: ls208xa: comply with the iommu map binding for fsl_mc Nipun Gupta
[not found] ` <1526824191-7000-8-git-send-email-nipun.gupta-3arQi8VN3Tc@public.gmane.org>
2018-07-03 16:35 ` Robin Murphy
2018-07-06 12:18 ` Nipun Gupta
[not found] ` <1526824191-7000-1-git-send-email-nipun.gupta-3arQi8VN3Tc@public.gmane.org>
2018-06-21 3:59 ` [PATCH 0/7 v5] Support for fsl-mc bus and its devices in SMMU Nipun Gupta
[not found] ` <HE1PR0401MB24250CEFBC0B7CC919C4388AE6760-B0v07Ae2taqTjcJO+iVGAo3W/0Ik+aLCnBOFsp37pqbUKgpGm//BTAC/G2K4zDHf@public.gmane.org>
2018-06-21 11:40 ` Will Deacon
2018-07-06 11:13 ` joro-zLv9SwRftAIdnm+yROfE0A
[not found] ` <20180706111327.7gkerhkk6udfeirr-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>
2018-07-06 11:18 ` Nipun Gupta
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=1526824191-7000-6-git-send-email-nipun.gupta@nxp.com \
--to=nipun.gupta@nxp.com \
--cc=bharat.bhushan@nxp.com \
--cc=bhelgaas@google.com \
--cc=catalin.marinas@arm.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=joro@8bytes.org \
--cc=laurentiu.tudor@nxp.com \
--cc=leoyang.li@nxp.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=m.szyprowski@samsung.com \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=robh@kernel.org \
--cc=robin.murphy@arm.com \
--cc=shawnguo@kernel.org \
--cc=stuyoder@gmail.com \
--cc=will.deacon@arm.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;
as well as URLs for NNTP newsgroup(s).