LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
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
Cc: hch@lst.de, joro@8bytes.org, m.szyprowski@samsung.com,
	shawnguo@kernel.org, frowand.list@gmail.com, bhelgaas@google.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,
	laurentiu.tudor@nxp.com, leoyang.li@nxp.com,
	Nipun Gupta <nipun.gupta@nxp.com>
Subject: [PATCH v4 5/6] bus: fsl-mc: supoprt dma configure for devices on fsl-mc bus
Date: Mon, 30 Apr 2018 11:57:20 +0530	[thread overview]
Message-ID: <1525069641-8523-6-git-send-email-nipun.gupta@nxp.com> (raw)
In-Reply-To: <1525069641-8523-1-git-send-email-nipun.gupta@nxp.com>

Signed-off-by: Nipun Gupta <nipun.gupta@nxp.com>
---
 drivers/bus/fsl-mc/fsl-mc-bus.c | 16 ++++++++++++----
 1 file changed, 12 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..624828b 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);
@@ -616,6 +627,7 @@ int fsl_mc_device_add(struct fsl_mc_obj_desc *obj_desc,
 		mc_dev->icid = parent_mc_dev->icid;
 		mc_dev->dma_mask = FSL_MC_DEFAULT_DMA_MASK;
 		mc_dev->dev.dma_mask = &mc_dev->dma_mask;
+		mc_dev->dev.coherent_dma_mask = mc_dev->dma_mask;
 		dev_set_msi_domain(&mc_dev->dev,
 				   dev_get_msi_domain(&parent_mc_dev->dev));
 	}
@@ -633,10 +645,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

  parent reply	other threads:[~2018-04-30  6:27 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-27 10:27 [PATCH 0/6 v3] Support for fsl-mc bus and its devices in SMMU Nipun Gupta
2018-04-27 10:27 ` [PATCH 1/6 v3] Docs: dt: add fsl-mc iommu-map device-tree binding Nipun Gupta
2018-04-27 17:20   ` Rob Herring
2018-04-27 10:27 ` [PATCH 2/6 v3] iommu: of: make of_pci_map_rid() available for other devices too Nipun Gupta
2018-04-27 17:15   ` Rob Herring
2018-04-30  3:27     ` Nipun Gupta
2018-04-28  8:17   ` kbuild test robot
2018-04-27 10:27 ` [PATCH 3/6 v3] iommu: support iommu configuration for fsl-mc devices Nipun Gupta
2018-04-27 10:27 ` [PATCH 4/6 v3] iommu: arm-smmu: Add support for the fsl-mc bus Nipun Gupta
2018-04-27 10:27 ` [PATCH 5/6 v3] bus: fsl-mc: supoprt dma configure for devices on " Nipun Gupta
2018-05-14 13:39   ` Laurentiu Tudor
2018-05-16  8:48     ` Nipun Gupta
2018-04-27 10:27 ` [PATCH 6/6 v3] arm64: dts: ls208xa: comply with the iommu map binding for fsl_mc Nipun Gupta
2018-04-27 15:52 ` [PATCH 0/6 v3] Support for fsl-mc bus and its devices in SMMU Christoph Hellwig
2018-04-30  6:27 ` [PATCH v4 0/6] " Nipun Gupta
2018-04-30  6:27   ` [PATCH v4 1/6] Docs: dt: add fsl-mc iommu-map device-tree binding Nipun Gupta
2018-04-30  6:27   ` [PATCH v4 2/6] iommu: of: make of_pci_map_rid() available for other devices too Nipun Gupta
2018-04-30 20:56     ` Bjorn Helgaas
2018-05-01 12:44     ` Rob Herring
2018-04-30  6:27   ` [PATCH v4 3/6] iommu: support iommu configuration for fsl-mc devices Nipun Gupta
2018-04-30  6:27   ` [PATCH v4 4/6] iommu: arm-smmu: Add support for the fsl-mc bus Nipun Gupta
2018-04-30  6:27   ` Nipun Gupta [this message]
2018-05-01  5:43     ` [PATCH v4 5/6] bus: fsl-mc: supoprt dma configure for devices on " kbuild test robot
2018-05-02  9:35     ` Laurentiu Tudor
2018-05-14 11:24     ` Greg KH
2018-05-14 12:47     ` Bjorn Helgaas
2018-04-30  6:27   ` [PATCH v4 6/6] arm64: dts: ls208xa: comply with the iommu map binding for fsl_mc Nipun Gupta
2018-05-02  9:14     ` Laurentiu Tudor

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=1525069641-8523-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 \
    --subject='Re: [PATCH v4 5/6] bus: fsl-mc: supoprt dma configure for devices on fsl-mc bus' \
    /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

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).