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 4/4] iommu/of: get rid of fsl-mc specific code
Date: Thu, 27 Feb 2020 12:05:42 +0200 [thread overview]
Message-ID: <20200227100542.13819-4-laurentiu.tudor@nxp.com> (raw)
In-Reply-To: <20200227100542.13819-1-laurentiu.tudor@nxp.com>
From: Laurentiu Tudor <laurentiu.tudor@nxp.com>
Changing the way we configure dma for fsl-mc devices allows
us to get rid of our fsl-mc specific code in the generic
of iommu code.
Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
---
drivers/iommu/of_iommu.c | 20 --------------------
1 file changed, 20 deletions(-)
diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c
index 20738aacac89..332072ada474 100644
--- a/drivers/iommu/of_iommu.c
+++ b/drivers/iommu/of_iommu.c
@@ -15,7 +15,6 @@
#include <linux/of_pci.h>
#include <linux/pci.h>
#include <linux/slab.h>
-#include <linux/fsl/mc.h>
#define NO_IOMMU 1
@@ -139,23 +138,6 @@ static int of_pci_iommu_init(struct pci_dev *pdev, u16 alias, void *data)
return err;
}
-static int of_fsl_mc_iommu_init(struct fsl_mc_device *mc_dev,
- struct device_node *master_np)
-{
- struct of_phandle_args iommu_spec = { .args_count = 1 };
- int err;
-
- err = of_map_rid(master_np, mc_dev->icid, "iommu-map",
- "iommu-map-mask", &iommu_spec.np,
- iommu_spec.args);
- if (err)
- return err == -ENODEV ? NO_IOMMU : err;
-
- err = of_iommu_xlate(&mc_dev->dev, &iommu_spec);
- of_node_put(iommu_spec.np);
- return err;
-}
-
const struct iommu_ops *of_iommu_configure(struct device *dev,
struct device_node *master_np)
{
@@ -188,8 +170,6 @@ const struct iommu_ops *of_iommu_configure(struct device *dev,
pci_request_acs();
err = pci_for_each_dma_alias(to_pci_dev(dev),
of_pci_iommu_init, &info);
- } else if (dev_is_fsl_mc(dev)) {
- err = of_fsl_mc_iommu_init(to_fsl_mc_device(dev), master_np);
} else {
struct of_phandle_args iommu_spec;
int idx = 0;
--
2.17.1
next prev parent reply other threads:[~2020-02-27 10:06 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-27 10:05 [RFC PATCH 1/4] bus: fsl-mc: add custom .dma_configure implementation 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 ` [RFC PATCH 3/4] bus: fsl-mc: Add ACPI support for fsl-mc laurentiu.tudor
2020-02-27 10:05 ` laurentiu.tudor [this message]
2020-03-25 12:51 ` [RFC PATCH 1/4] bus: fsl-mc: add custom .dma_configure implementation Lorenzo Pieralisi
2020-03-25 16:48 ` Laurentiu Tudor
2020-04-14 14:32 ` Lorenzo Pieralisi
2020-04-15 5:42 ` [EXT] " Makarand Pawagi
2020-04-15 15:43 ` Lorenzo Pieralisi
2020-04-15 15:44 ` Laurentiu Tudor
2020-04-15 16:04 ` Lorenzo Pieralisi
2020-04-16 14:38 ` Laurentiu Tudor
2020-04-15 17:31 ` Robin Murphy
2020-04-23 9:56 ` [EXT] " Makarand Pawagi
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-4-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 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).