From: Yong Wu <yong.wu@mediatek.com>
To: Joerg Roedel <joro@8bytes.org>, Rob Herring <robh+dt@kernel.org>,
"Matthias Brugger" <matthias.bgg@gmail.com>,
Will Deacon <will@kernel.org>,
Robin Murphy <robin.murphy@arm.com>
Cc: youlin.pei@mediatek.com, devicetree@vger.kernel.org,
Nicolas Boichat <drinkcat@chromium.org>,
srv_heupstream@mediatek.com, chao.hao@mediatek.com,
linux-kernel@vger.kernel.org, Evan Green <evgreen@chromium.org>,
yong.wu@mediatek.com, Tomasz Figa <tfiga@google.com>,
iommu@lists.linux-foundation.org,
linux-mediatek@lists.infradead.org,
Krzysztof Kozlowski <krzk@kernel.org>,
anan.sun@mediatek.com, linux-arm-kernel@lists.infradead.org
Subject: [PATCH v6 24/33] iommu/mediatek: Move domain_finalise into attach_device
Date: Mon, 11 Jan 2021 19:19:05 +0800 [thread overview]
Message-ID: <20210111111914.22211-25-yong.wu@mediatek.com> (raw)
In-Reply-To: <20210111111914.22211-1-yong.wu@mediatek.com>
Currently domain_alloc only has a parameter(type), We have no chance to
input some special data. This patch moves the domain_finalise into
attach_device which has the device information, then could update
the domain's geometry.aperture ranges for each a device.
Strictly, I should use the data from mtk_iommu_get_m4u_data as the
parameter of mtk_iommu_domain_finalise in this patch. but dom->data
only is used in tlb ops in which the data is get from the m4u_list, thus
it is ok here.
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
---
drivers/iommu/mtk_iommu.c | 31 ++++++++++++-------------------
1 file changed, 12 insertions(+), 19 deletions(-)
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index f1941608ccb7..d321d09ac4c2 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -328,10 +328,9 @@ static void mtk_iommu_config(struct mtk_iommu_data *data,
}
}
-static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom)
+static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom,
+ struct mtk_iommu_data *data)
{
- struct mtk_iommu_data *data = mtk_iommu_get_m4u_data();
-
dom->cfg = (struct io_pgtable_cfg) {
.quirks = IO_PGTABLE_QUIRK_ARM_NS |
IO_PGTABLE_QUIRK_NO_PERMS |
@@ -352,7 +351,6 @@ static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom)
return -EINVAL;
}
- dom->data = data;
/* Update our support page sizes bitmap */
dom->domain.pgsize_bitmap = dom->cfg.pgsize_bitmap;
return 0;
@@ -369,30 +367,19 @@ static struct iommu_domain *mtk_iommu_domain_alloc(unsigned type)
if (!dom)
return NULL;
- if (iommu_get_dma_cookie(&dom->domain))
- goto free_dom;
-
- if (mtk_iommu_domain_finalise(dom))
- goto put_dma_cookie;
+ if (iommu_get_dma_cookie(&dom->domain)) {
+ kfree(dom);
+ return NULL;
+ }
dom->domain.geometry.aperture_start = 0;
dom->domain.geometry.aperture_end = DMA_BIT_MASK(32);
dom->domain.geometry.force_aperture = true;
-
return &dom->domain;
-
-put_dma_cookie:
- iommu_put_dma_cookie(&dom->domain);
-free_dom:
- kfree(dom);
- return NULL;
}
static void mtk_iommu_domain_free(struct iommu_domain *domain)
{
- struct mtk_iommu_domain *dom = to_mtk_domain(domain);
-
- free_io_pgtable_ops(dom->iop);
iommu_put_dma_cookie(domain);
kfree(to_mtk_domain(domain));
}
@@ -408,6 +395,12 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,
if (!data)
return -ENODEV;
+ if (!dom->data) {
+ if (mtk_iommu_domain_finalise(dom, data))
+ return -ENODEV;
+ dom->data = data;
+ }
+
if (!data->m4u_dom) { /* Initialize the M4U HW */
ret = pm_runtime_resume_and_get(m4udev);
if (ret < 0)
--
2.18.0
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
next prev parent reply other threads:[~2021-01-11 11:36 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-11 11:18 [PATCH v6 00/33] MT8192 IOMMU support Yong Wu
2021-01-11 11:18 ` [PATCH v6 01/33] dt-bindings: iommu: mediatek: Convert IOMMU to DT schema Yong Wu
2021-01-11 11:18 ` [PATCH v6 02/33] dt-bindings: memory: mediatek: Add a common memory header file Yong Wu
2021-01-11 11:18 ` [PATCH v6 03/33] dt-bindings: memory: mediatek: Extend LARB_NR_MAX to 32 Yong Wu
2021-01-11 11:18 ` [PATCH v6 04/33] dt-bindings: memory: mediatek: Rename header guard for SMI header file Yong Wu
2021-01-11 11:18 ` [PATCH v6 05/33] dt-bindings: mediatek: Add binding for mt8192 IOMMU Yong Wu
2021-01-11 11:18 ` [PATCH v6 06/33] of/device: Move dma_range_map before of_iommu_configure Yong Wu
2021-01-14 19:27 ` Rob Herring
2021-01-15 5:30 ` Yong Wu
2021-01-18 15:49 ` Robin Murphy
2021-01-19 9:13 ` Paul Kocialkowski
2021-01-19 9:20 ` Yong Wu
2021-01-19 9:37 ` Paul Kocialkowski
2021-01-11 11:18 ` [PATCH v6 07/33] iommu: Avoid reallocate default domain for a group Yong Wu
2021-01-26 22:23 ` Will Deacon
2021-01-27 9:39 ` Yong Wu
2021-01-28 21:10 ` Will Deacon
2021-01-28 21:14 ` Will Deacon
2021-01-29 0:03 ` Robin Murphy
2021-01-29 1:52 ` Yong Wu
2021-01-29 8:47 ` Will Deacon
2021-01-11 11:18 ` [PATCH v6 08/33] iommu/mediatek: Use the common mtk-memory-port.h Yong Wu
2021-01-11 11:18 ` [PATCH v6 09/33] iommu/io-pgtable-arm-v7s: Use ias to check the valid iova in unmap Yong Wu
2021-01-11 11:18 ` [PATCH v6 10/33] iommu/io-pgtable-arm-v7s: Extend PA34 for MediaTek Yong Wu
2021-01-11 11:18 ` [PATCH v6 11/33] iommu/io-pgtable-arm-v7s: Clarify LVL_SHIFT/BITS macro Yong Wu
2021-01-11 11:18 ` [PATCH v6 12/33] iommu/io-pgtable-arm-v7s: Add cfg as a param in some macros Yong Wu
2021-01-11 11:18 ` [PATCH v6 13/33] iommu/io-pgtable-arm-v7s: Quad lvl1 pgtable for MediaTek Yong Wu
2021-01-11 11:18 ` [PATCH v6 14/33] iommu/mediatek: Add a flag for iova 34bits case Yong Wu
2021-01-11 11:18 ` [PATCH v6 15/33] iommu/mediatek: Update oas for v7s Yong Wu
2021-01-11 11:18 ` [PATCH v6 16/33] iommu/mediatek: Move hw_init into attach_device Yong Wu
2021-01-11 11:18 ` [PATCH v6 17/33] iommu/mediatek: Add error handle for mtk_iommu_probe Yong Wu
2021-01-11 11:18 ` [PATCH v6 18/33] iommu/mediatek: Add device link for smi-common and m4u Yong Wu
2021-01-11 11:19 ` [PATCH v6 19/33] iommu/mediatek: Add pm runtime callback Yong Wu
2021-01-11 11:19 ` [PATCH v6 20/33] iommu/mediatek: Add power-domain operation Yong Wu
2021-01-11 11:19 ` [PATCH v6 21/33] iommu/mediatek: Support up to 34bit iova in tlb flush Yong Wu
2021-01-11 11:19 ` [PATCH v6 22/33] iommu/mediatek: Support report iova 34bit translation fault in ISR Yong Wu
2021-01-11 11:19 ` [PATCH v6 23/33] iommu/mediatek: Adjust the structure Yong Wu
2021-01-11 11:19 ` Yong Wu [this message]
2021-01-11 11:19 ` [PATCH v6 25/33] iommu/mediatek: Move geometry.aperture updating into domain_finalise Yong Wu
2021-01-11 11:19 ` [PATCH v6 26/33] iommu/mediatek: Add iova_region structure Yong Wu
2021-01-11 11:19 ` [PATCH v6 27/33] iommu/mediatek: Add get_domain_id from dev->dma_range_map Yong Wu
2021-01-11 11:19 ` [PATCH v6 28/33] iommu/mediatek: Support for multi domains Yong Wu
2021-01-11 11:19 ` [PATCH v6 29/33] iommu/mediatek: Add iova reserved function Yong Wu
2021-01-11 11:19 ` [PATCH v6 30/33] iommu/mediatek: Support master use iova over 32bit Yong Wu
2021-01-11 11:19 ` [PATCH v6 31/33] iommu/mediatek: Remove unnecessary check in attach_device Yong Wu
2021-01-11 11:19 ` [PATCH v6 32/33] iommu/mediatek: Add mt8192 support Yong Wu
2021-01-11 11:19 ` [PATCH v6 33/33] MAINTAINERS: Add entry for MediaTek IOMMU Yong Wu
2021-01-26 22:25 ` [PATCH v6 00/33] MT8192 IOMMU support Will Deacon
2021-01-29 11:27 ` Tomasz Figa
2021-02-01 14:54 ` Will Deacon
2021-02-02 2:03 ` Yong Wu
2021-02-02 13:33 ` Will Deacon
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=20210111111914.22211-25-yong.wu@mediatek.com \
--to=yong.wu@mediatek.com \
--cc=anan.sun@mediatek.com \
--cc=chao.hao@mediatek.com \
--cc=devicetree@vger.kernel.org \
--cc=drinkcat@chromium.org \
--cc=evgreen@chromium.org \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=krzk@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=robh+dt@kernel.org \
--cc=robin.murphy@arm.com \
--cc=srv_heupstream@mediatek.com \
--cc=tfiga@google.com \
--cc=will@kernel.org \
--cc=youlin.pei@mediatek.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).