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 21/33] iommu/mediatek: Support up to 34bit iova in tlb flush
Date: Mon, 11 Jan 2021 19:19:02 +0800 [thread overview]
Message-ID: <20210111111914.22211-22-yong.wu@mediatek.com> (raw)
In-Reply-To: <20210111111914.22211-1-yong.wu@mediatek.com>
If the iova is 34bit, the iova[32][33] is the bit0/1 in the tlb flush
register. Add a new macro for this.
In the macro, since (iova + size - 1) may be end with 0xfff, then the
bit0/1 always is 1, thus add a mask.
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
---
drivers/iommu/mtk_iommu.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index b9c63c8de33e..468be7ca62e4 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -129,6 +129,11 @@ static const struct iommu_ops mtk_iommu_ops;
static int mtk_iommu_hw_init(const struct mtk_iommu_data *data);
+#define MTK_IOMMU_TLB_ADDR(iova) ({ \
+ dma_addr_t _addr = iova; \
+ ((lower_32_bits(_addr) & GENMASK(31, 12)) | upper_32_bits(_addr));\
+})
+
/*
* In M4U 4GB mode, the physical address is remapped as below:
*
@@ -213,8 +218,9 @@ static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size,
writel_relaxed(F_INVLD_EN1 | F_INVLD_EN0,
data->base + data->plat_data->inv_sel_reg);
- writel_relaxed(iova, data->base + REG_MMU_INVLD_START_A);
- writel_relaxed(iova + size - 1,
+ writel_relaxed(MTK_IOMMU_TLB_ADDR(iova),
+ data->base + REG_MMU_INVLD_START_A);
+ writel_relaxed(MTK_IOMMU_TLB_ADDR(iova + size - 1),
data->base + REG_MMU_INVLD_END_A);
writel_relaxed(F_MMU_INV_RANGE,
data->base + REG_MMU_INVALIDATE);
--
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:30 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 ` Yong Wu [this message]
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 ` [PATCH v6 24/33] iommu/mediatek: Move domain_finalise into attach_device Yong Wu
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-22-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).