All of lore.kernel.org
 help / color / mirror / Atom feed
From: laurentiu.tudor@nxp.com
To: linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org,
	linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org
Cc: robin.murphy@arm.com, lorenzo.pieralisi@arm.com,
	ard.biesheuvel@linaro.org, ioana.ciornei@nxp.com,
	diana.craciun@oss.nxp.com, maz@kernel.org, jon@solid-run.com,
	pankaj.bansal@nxp.com, makarand.pawagi@nxp.com,
	calvin.johnson@nxp.com, V.Sethi@nxp.com,
	cristian.sovaiala@nxp.com, Stuart.Yoder@arm.com,
	jeremy.linton@arm.com, joro@8bytes.org, tglx@linutronix.de,
	jason@lakedaemon.net, Laurentiu Tudor <laurentiu.tudor@nxp.com>
Subject: [RFC PATCH 1/4] bus: fsl-mc: add custom .dma_configure implementation
Date: Thu, 27 Feb 2020 12:05:39 +0200	[thread overview]
Message-ID: <20200227100542.13819-1-laurentiu.tudor@nxp.com> (raw)

From: Laurentiu Tudor <laurentiu.tudor@nxp.com>

The devices on this bus are not discovered by way of device tree
but by queries to the firmware. It makes little sense to trick the
generic of layer into thinking that these devices are of related so
that we can get our dma configuration. Instead of doing that, add
our custom dma configuration implementation.

Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
---
 drivers/bus/fsl-mc/fsl-mc-bus.c | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/drivers/bus/fsl-mc/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bus.c
index 36eb25f82c8e..eafaa0e0b906 100644
--- a/drivers/bus/fsl-mc/fsl-mc-bus.c
+++ b/drivers/bus/fsl-mc/fsl-mc-bus.c
@@ -132,11 +132,40 @@ static int fsl_mc_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
 static int fsl_mc_dma_configure(struct device *dev)
 {
 	struct device *dma_dev = dev;
+	struct iommu_fwspec *fwspec;
+	const struct iommu_ops *iommu_ops;
+	struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev);
+	int ret;
+	u32 icid;
 
 	while (dev_is_fsl_mc(dma_dev))
 		dma_dev = dma_dev->parent;
 
-	return of_dma_configure(dev, dma_dev->of_node, 0);
+	fwspec = dev_iommu_fwspec_get(dma_dev);
+	if (!fwspec)
+		return -ENODEV;
+	iommu_ops = iommu_ops_from_fwnode(fwspec->iommu_fwnode);
+	if (!iommu_ops)
+		return -ENODEV;
+
+	ret = iommu_fwspec_init(dev, fwspec->iommu_fwnode, iommu_ops);
+	if (ret)
+		return ret;
+
+	icid = mc_dev->icid;
+	ret = iommu_fwspec_add_ids(dev, &icid, 1);
+	if (ret)
+		return ret;
+
+	if (!device_iommu_mapped(dev)) {
+		ret = iommu_probe_device(dev);
+		if (ret)
+			return ret;
+	}
+
+	arch_setup_dma_ops(dev, 0, *dma_dev->dma_mask + 1, iommu_ops, true);
+
+	return 0;
 }
 
 static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
-- 
2.17.1


WARNING: multiple messages have this Message-ID (diff)
From: laurentiu.tudor@nxp.com
To: linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org,
	linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org
Cc: calvin.johnson@nxp.com, ard.biesheuvel@linaro.org,
	maz@kernel.org, pankaj.bansal@nxp.com, diana.craciun@oss.nxp.com,
	jon@solid-run.com, jeremy.linton@arm.com,
	makarand.pawagi@nxp.com, cristian.sovaiala@nxp.com,
	V.Sethi@nxp.com, ioana.ciornei@nxp.com, tglx@linutronix.de,
	robin.murphy@arm.com, jason@lakedaemon.net, Stuart.Yoder@arm.com
Subject: [RFC PATCH 1/4] bus: fsl-mc: add custom .dma_configure implementation
Date: Thu, 27 Feb 2020 12:05:39 +0200	[thread overview]
Message-ID: <20200227100542.13819-1-laurentiu.tudor@nxp.com> (raw)

From: Laurentiu Tudor <laurentiu.tudor@nxp.com>

The devices on this bus are not discovered by way of device tree
but by queries to the firmware. It makes little sense to trick the
generic of layer into thinking that these devices are of related so
that we can get our dma configuration. Instead of doing that, add
our custom dma configuration implementation.

Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
---
 drivers/bus/fsl-mc/fsl-mc-bus.c | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/drivers/bus/fsl-mc/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bus.c
index 36eb25f82c8e..eafaa0e0b906 100644
--- a/drivers/bus/fsl-mc/fsl-mc-bus.c
+++ b/drivers/bus/fsl-mc/fsl-mc-bus.c
@@ -132,11 +132,40 @@ static int fsl_mc_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
 static int fsl_mc_dma_configure(struct device *dev)
 {
 	struct device *dma_dev = dev;
+	struct iommu_fwspec *fwspec;
+	const struct iommu_ops *iommu_ops;
+	struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev);
+	int ret;
+	u32 icid;
 
 	while (dev_is_fsl_mc(dma_dev))
 		dma_dev = dma_dev->parent;
 
-	return of_dma_configure(dev, dma_dev->of_node, 0);
+	fwspec = dev_iommu_fwspec_get(dma_dev);
+	if (!fwspec)
+		return -ENODEV;
+	iommu_ops = iommu_ops_from_fwnode(fwspec->iommu_fwnode);
+	if (!iommu_ops)
+		return -ENODEV;
+
+	ret = iommu_fwspec_init(dev, fwspec->iommu_fwnode, iommu_ops);
+	if (ret)
+		return ret;
+
+	icid = mc_dev->icid;
+	ret = iommu_fwspec_add_ids(dev, &icid, 1);
+	if (ret)
+		return ret;
+
+	if (!device_iommu_mapped(dev)) {
+		ret = iommu_probe_device(dev);
+		if (ret)
+			return ret;
+	}
+
+	arch_setup_dma_ops(dev, 0, *dma_dev->dma_mask + 1, iommu_ops, true);
+
+	return 0;
 }
 
 static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
-- 
2.17.1

_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

WARNING: multiple messages have this Message-ID (diff)
From: laurentiu.tudor@nxp.com
To: linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org,
	linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org
Cc: lorenzo.pieralisi@arm.com, calvin.johnson@nxp.com,
	ard.biesheuvel@linaro.org, maz@kernel.org, pankaj.bansal@nxp.com,
	diana.craciun@oss.nxp.com, jon@solid-run.com,
	jeremy.linton@arm.com, makarand.pawagi@nxp.com,
	cristian.sovaiala@nxp.com, V.Sethi@nxp.com,
	ioana.ciornei@nxp.com, tglx@linutronix.de,
	Laurentiu Tudor <laurentiu.tudor@nxp.com>,
	robin.murphy@arm.com, joro@8bytes.org, jason@lakedaemon.net,
	Stuart.Yoder@arm.com
Subject: [RFC PATCH 1/4] bus: fsl-mc: add custom .dma_configure implementation
Date: Thu, 27 Feb 2020 12:05:39 +0200	[thread overview]
Message-ID: <20200227100542.13819-1-laurentiu.tudor@nxp.com> (raw)

From: Laurentiu Tudor <laurentiu.tudor@nxp.com>

The devices on this bus are not discovered by way of device tree
but by queries to the firmware. It makes little sense to trick the
generic of layer into thinking that these devices are of related so
that we can get our dma configuration. Instead of doing that, add
our custom dma configuration implementation.

Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
---
 drivers/bus/fsl-mc/fsl-mc-bus.c | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/drivers/bus/fsl-mc/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bus.c
index 36eb25f82c8e..eafaa0e0b906 100644
--- a/drivers/bus/fsl-mc/fsl-mc-bus.c
+++ b/drivers/bus/fsl-mc/fsl-mc-bus.c
@@ -132,11 +132,40 @@ static int fsl_mc_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
 static int fsl_mc_dma_configure(struct device *dev)
 {
 	struct device *dma_dev = dev;
+	struct iommu_fwspec *fwspec;
+	const struct iommu_ops *iommu_ops;
+	struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev);
+	int ret;
+	u32 icid;
 
 	while (dev_is_fsl_mc(dma_dev))
 		dma_dev = dma_dev->parent;
 
-	return of_dma_configure(dev, dma_dev->of_node, 0);
+	fwspec = dev_iommu_fwspec_get(dma_dev);
+	if (!fwspec)
+		return -ENODEV;
+	iommu_ops = iommu_ops_from_fwnode(fwspec->iommu_fwnode);
+	if (!iommu_ops)
+		return -ENODEV;
+
+	ret = iommu_fwspec_init(dev, fwspec->iommu_fwnode, iommu_ops);
+	if (ret)
+		return ret;
+
+	icid = mc_dev->icid;
+	ret = iommu_fwspec_add_ids(dev, &icid, 1);
+	if (ret)
+		return ret;
+
+	if (!device_iommu_mapped(dev)) {
+		ret = iommu_probe_device(dev);
+		if (ret)
+			return ret;
+	}
+
+	arch_setup_dma_ops(dev, 0, *dma_dev->dma_mask + 1, iommu_ops, true);
+
+	return 0;
 }
 
 static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
-- 
2.17.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

             reply	other threads:[~2020-02-27 10:05 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-27 10:05 laurentiu.tudor [this message]
2020-02-27 10:05 ` [RFC PATCH 1/4] bus: fsl-mc: add custom .dma_configure implementation laurentiu.tudor
2020-02-27 10:05 ` laurentiu.tudor
2020-02-27 10:05 ` [RFC PATCH 2/4] irqchip/fsl-mc: Change the way the IRQ domain is set for MC devices laurentiu.tudor
2020-02-27 10:05   ` laurentiu.tudor
2020-02-27 10:05   ` laurentiu.tudor
2020-02-27 10:05 ` [RFC PATCH 3/4] bus: fsl-mc: Add ACPI support for fsl-mc laurentiu.tudor
2020-02-27 10:05   ` laurentiu.tudor
2020-02-27 10:05   ` laurentiu.tudor
2020-02-27 10:05 ` [RFC PATCH 4/4] iommu/of: get rid of fsl-mc specific code laurentiu.tudor
2020-02-27 10:05   ` laurentiu.tudor
2020-02-27 10:05   ` laurentiu.tudor
2020-03-25 12:51 ` [RFC PATCH 1/4] bus: fsl-mc: add custom .dma_configure implementation Lorenzo Pieralisi
2020-03-25 12:51   ` Lorenzo Pieralisi
2020-03-25 12:51   ` Lorenzo Pieralisi
2020-03-25 16:48   ` Laurentiu Tudor
2020-03-25 16:48     ` Laurentiu Tudor
2020-03-25 16:48     ` Laurentiu Tudor
2020-04-14 14:32     ` Lorenzo Pieralisi
2020-04-14 14:32       ` Lorenzo Pieralisi
2020-04-14 14:32       ` Lorenzo Pieralisi
2020-04-15  5:42       ` [EXT] " Makarand Pawagi
2020-04-15  5:42         ` Makarand Pawagi
2020-04-15  5:42         ` Makarand Pawagi
2020-04-15 15:43         ` Lorenzo Pieralisi
2020-04-15 15:43           ` Lorenzo Pieralisi
2020-04-15 15:43           ` Lorenzo Pieralisi
2020-04-15 15:44       ` Laurentiu Tudor
2020-04-15 15:44         ` Laurentiu Tudor
2020-04-15 15:44         ` Laurentiu Tudor
2020-04-15 16:04         ` Lorenzo Pieralisi
2020-04-15 16:04           ` Lorenzo Pieralisi
2020-04-15 16:04           ` Lorenzo Pieralisi
2020-04-16 14:38           ` Laurentiu Tudor
2020-04-16 14:38             ` Laurentiu Tudor
2020-04-16 14:38             ` Laurentiu Tudor
2020-04-15 17:31         ` Robin Murphy
2020-04-15 17:31           ` Robin Murphy
2020-04-15 17:31           ` Robin Murphy
2020-04-23  9:56           ` [EXT] " Makarand Pawagi
2020-04-23  9:56             ` Makarand Pawagi
2020-04-23  9:56             ` Makarand Pawagi
2020-04-23 11:09             ` Lorenzo Pieralisi
2020-04-23 11:09               ` Lorenzo Pieralisi
2020-04-23 11:09               ` Lorenzo Pieralisi

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=20200227100542.13819-1-laurentiu.tudor@nxp.com \
    --to=laurentiu.tudor@nxp.com \
    --cc=Stuart.Yoder@arm.com \
    --cc=V.Sethi@nxp.com \
    --cc=ard.biesheuvel@linaro.org \
    --cc=calvin.johnson@nxp.com \
    --cc=cristian.sovaiala@nxp.com \
    --cc=diana.craciun@oss.nxp.com \
    --cc=ioana.ciornei@nxp.com \
    --cc=iommu@lists.linux-foundation.org \
    --cc=jason@lakedaemon.net \
    --cc=jeremy.linton@arm.com \
    --cc=jon@solid-run.com \
    --cc=joro@8bytes.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lorenzo.pieralisi@arm.com \
    --cc=makarand.pawagi@nxp.com \
    --cc=maz@kernel.org \
    --cc=pankaj.bansal@nxp.com \
    --cc=robin.murphy@arm.com \
    --cc=tglx@linutronix.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.