From: Joerg Roedel <joro@8bytes.org>
To: iommu@lists.linux-foundation.org
Cc: linux-ia64@vger.kernel.org, Heiko Stuebner <heiko@sntech.de>,
David Airlie <airlied@linux.ie>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Thierry Reding <thierry.reding@gmail.com>,
Paul Mackerras <paulus@samba.org>, Will Deacon <will@kernel.org>,
Michael Ellerman <mpe@ellerman.id.au>,
x86@kernel.org, Russell King <linux@armlinux.org.uk>,
Catalin Marinas <catalin.marinas@arm.com>,
Fenghua Yu <fenghua.yu@intel.com>, Joerg Roedel <jroedel@suse.de>,
intel-gfx@lists.freedesktop.org,
Jani Nikula <jani.nikula@linux.intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
Matthias Brugger <matthias.bgg@gmail.com>,
linux-arm-kernel@lists.infradead.org,
Tony Luck <tony.luck@intel.com>,
linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org,
Daniel Vetter <daniel@ffwll.ch>,
David Woodhouse <dwmw2@infradead.org>
Subject: [PATCH 08/13] iommu/mediatek: Do no use dev->archdata.iommu
Date: Thu, 25 Jun 2020 15:08:31 +0200 [thread overview]
Message-ID: <20200625130836.1916-9-joro@8bytes.org> (raw)
In-Reply-To: <20200625130836.1916-1-joro@8bytes.org>
From: Joerg Roedel <jroedel@suse.de>
The iommu private pointer is already used in the Mediatek IOMMU v1
driver, so move the dma_iommu_mapping pointer into 'struct
mtk_iommu_data' and do not use dev->archdata.iommu anymore.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/mtk_iommu.h | 2 ++
drivers/iommu/mtk_iommu_v1.c | 10 ++++------
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/iommu/mtk_iommu.h b/drivers/iommu/mtk_iommu.h
index ea949a324e33..1682406e98dc 100644
--- a/drivers/iommu/mtk_iommu.h
+++ b/drivers/iommu/mtk_iommu.h
@@ -62,6 +62,8 @@ struct mtk_iommu_data {
struct iommu_device iommu;
const struct mtk_iommu_plat_data *plat_data;
+ struct dma_iommu_mapping *mapping; /* For mtk_iommu_v1.c */
+
struct list_head list;
struct mtk_smi_larb_iommu larb_imu[MTK_LARB_NR_MAX];
};
diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c
index c9d79cff4d17..82ddfe9170d4 100644
--- a/drivers/iommu/mtk_iommu_v1.c
+++ b/drivers/iommu/mtk_iommu_v1.c
@@ -269,7 +269,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,
int ret;
/* Only allow the domain created internally. */
- mtk_mapping = data->dev->archdata.iommu;
+ mtk_mapping = data->mapping;
if (mtk_mapping->domain != domain)
return 0;
@@ -369,7 +369,6 @@ static int mtk_iommu_create_mapping(struct device *dev,
struct mtk_iommu_data *data;
struct platform_device *m4updev;
struct dma_iommu_mapping *mtk_mapping;
- struct device *m4udev;
int ret;
if (args->args_count != 1) {
@@ -401,8 +400,7 @@ static int mtk_iommu_create_mapping(struct device *dev,
return ret;
data = dev_iommu_priv_get(dev);
- m4udev = data->dev;
- mtk_mapping = m4udev->archdata.iommu;
+ mtk_mapping = data->mapping;
if (!mtk_mapping) {
/* MTK iommu support 4GB iova address space. */
mtk_mapping = arm_iommu_create_mapping(&platform_bus_type,
@@ -410,7 +408,7 @@ static int mtk_iommu_create_mapping(struct device *dev,
if (IS_ERR(mtk_mapping))
return PTR_ERR(mtk_mapping);
- m4udev->archdata.iommu = mtk_mapping;
+ data->mapping = mtk_mapping;
}
return 0;
@@ -459,7 +457,7 @@ static void mtk_iommu_probe_finalize(struct device *dev)
int err;
data = dev_iommu_priv_get(dev);
- mtk_mapping = data->dev->archdata.iommu;
+ mtk_mapping = data->mapping;
err = arm_iommu_attach_device(dev, mtk_mapping);
if (err)
--
2.27.0
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2020-06-25 13:08 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-25 13:08 [PATCH 00/13] iommu: Remove usage of dev->archdata.iommu Joerg Roedel
2020-06-25 13:08 ` [PATCH 01/13] iommu/exynos: Use dev_iommu_priv_get/set() Joerg Roedel
2020-06-29 7:51 ` Marek Szyprowski
2020-06-25 13:08 ` [PATCH 02/13] iommu/vt-d: " Joerg Roedel
2020-06-25 13:24 ` Lu Baolu
2020-06-25 13:08 ` [PATCH 03/13] iommu/msm: " Joerg Roedel
2020-06-25 13:08 ` [PATCH 04/13] iommu/omap: " Joerg Roedel
2020-06-25 13:08 ` [PATCH 05/13] iommu/rockchip: " Joerg Roedel
2020-06-25 13:08 ` [PATCH 06/13] iommu/tegra: " Joerg Roedel
2020-06-25 13:08 ` [PATCH 07/13] iommu/pamu: " Joerg Roedel
2020-06-25 13:08 ` Joerg Roedel [this message]
2020-06-25 13:08 ` [PATCH 09/13] x86: Remove dev->archdata.iommu pointer Joerg Roedel
2020-06-26 11:46 ` Borislav Petkov
2020-06-25 13:08 ` [PATCH 10/13] ia64: " Joerg Roedel
2020-06-25 13:08 ` [PATCH 11/13] arm: " Joerg Roedel
2020-06-25 13:08 ` [PATCH 12/13] arm64: " Joerg Roedel
2020-06-25 13:16 ` Will Deacon
2020-06-25 13:08 ` [PATCH 13/13] powerpc/dma: Remove dev->archdata.iommu_domain Joerg Roedel
2020-06-29 10:57 ` Michael Ellerman
2020-06-26 1:41 ` [PATCH 00/13] iommu: Remove usage of dev->archdata.iommu Jerry Snitselaar
2020-06-30 10:00 ` Joerg Roedel
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=20200625130836.1916-9-joro@8bytes.org \
--to=joro@8bytes.org \
--cc=airlied@linux.ie \
--cc=benh@kernel.crashing.org \
--cc=catalin.marinas@arm.com \
--cc=daniel@ffwll.ch \
--cc=dwmw2@infradead.org \
--cc=fenghua.yu@intel.com \
--cc=heiko@sntech.de \
--cc=intel-gfx@lists.freedesktop.org \
--cc=iommu@lists.linux-foundation.org \
--cc=jani.nikula@linux.intel.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=jroedel@suse.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=matthias.bgg@gmail.com \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
--cc=rodrigo.vivi@intel.com \
--cc=thierry.reding@gmail.com \
--cc=tony.luck@intel.com \
--cc=will@kernel.org \
--cc=x86@kernel.org \
/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).