From: Yong Wu <yong.wu@mediatek.com>
To: Joerg Roedel <joro@8bytes.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
Robin Murphy <robin.murphy@arm.com>,
Rob Herring <robh+dt@kernel.org>
Cc: Evan Green <evgreen@chromium.org>, Tomasz Figa <tfiga@google.com>,
Will Deacon <will.deacon@arm.com>,
<linux-mediatek@lists.infradead.org>,
<srv_heupstream@mediatek.com>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<iommu@lists.linux-foundation.org>, <yingjoe.chen@mediatek.com>,
<yong.wu@mediatek.com>, <youlin.pei@mediatek.com>,
Nicolas Boichat <drinkcat@chromium.org>, <anan.sun@mediatek.com>,
Matthias Kaehlcke <mka@chromium.org>
Subject: [PATCH v6 09/22] iommu/mediatek: Refine protect memory definition
Date: Sun, 17 Feb 2019 17:04:47 +0800 [thread overview]
Message-ID: <1550394300-17420-10-git-send-email-yong.wu@mediatek.com> (raw)
In-Reply-To: <1550394300-17420-1-git-send-email-yong.wu@mediatek.com>
The protect memory setting is a little different in the different SoCs.
In the register REG_MMU_CTRL_REG(0x110), the TF_PROT(translation fault
protect) shift bit is normally 4 while it shift 5 bits only in the
mt8173. This patch delete the complex MACRO and use a common if-else
instead.
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
---
drivers/iommu/mtk_iommu.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index 3bf7b76..483f6e8 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -52,12 +52,9 @@
#define REG_MMU_DCM_DIS 0x050
#define REG_MMU_CTRL_REG 0x110
+#define F_MMU_TF_PROT_TO_PROGRAM_ADDR (2 << 4)
#define F_MMU_PREFETCH_RT_REPLACE_MOD BIT(4)
-#define F_MMU_TF_PROTECT_SEL_SHIFT(data) \
- ((data)->plat_data->m4u_plat == M4U_MT2712 ? 4 : 5)
-/* It's named by F_MMU_TF_PROT_SEL in mt2712. */
-#define F_MMU_TF_PROTECT_SEL(prot, data) \
- (((prot) & 0x3) << F_MMU_TF_PROTECT_SEL_SHIFT(data))
+#define F_MMU_TF_PROT_TO_PROGRAM_ADDR_MT8173 (2 << 5)
#define REG_MMU_IVRP_PADDR 0x114
@@ -519,9 +516,11 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)
return ret;
}
- regval = F_MMU_TF_PROTECT_SEL(2, data);
if (data->plat_data->m4u_plat == M4U_MT8173)
- regval |= F_MMU_PREFETCH_RT_REPLACE_MOD;
+ regval = F_MMU_PREFETCH_RT_REPLACE_MOD |
+ F_MMU_TF_PROT_TO_PROGRAM_ADDR_MT8173;
+ else
+ regval = F_MMU_TF_PROT_TO_PROGRAM_ADDR;
writel_relaxed(regval, data->base + REG_MMU_CTRL_REG);
regval = F_L2_MULIT_HIT_EN |
--
1.9.1
next prev parent reply other threads:[~2019-02-17 9:08 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-17 9:04 [PATCH v6 00/22] MT8183 IOMMU SUPPORT Yong Wu
2019-02-17 9:04 ` [PATCH v6 01/22] dt-bindings: mediatek: Add binding for mt8183 IOMMU and SMI Yong Wu
2019-02-18 15:44 ` Rob Herring
2019-02-19 23:28 ` Evan Green
2019-02-17 9:04 ` [PATCH v6 02/22] iommu/mediatek: Use a struct as the platform data Yong Wu
2019-02-17 9:04 ` [PATCH v6 03/22] memory: mtk-smi: Use a general config_port interface Yong Wu
2019-02-17 9:04 ` [PATCH v6 04/22] memory: mtk-smi: Use a struct for the platform data for smi-common Yong Wu
2019-02-17 9:04 ` [PATCH v6 05/22] iommu/io-pgtable-arm-v7s: Add paddr_to_iopte and iopte_to_paddr helpers Yong Wu
2019-02-17 9:04 ` [PATCH v6 06/22] iommu/io-pgtable-arm-v7s: Extend MediaTek 4GB Mode Yong Wu
2019-02-19 23:29 ` Evan Green
2019-02-17 9:04 ` [PATCH v6 07/22] iommu/mediatek: Add bclk can be supported optionally Yong Wu
2019-02-17 9:04 ` [PATCH v6 08/22] iommu/mediatek: Add larb-id remapped support Yong Wu
2019-02-17 9:04 ` Yong Wu [this message]
2019-02-19 23:30 ` [PATCH v6 09/22] iommu/mediatek: Refine protect memory definition Evan Green
2019-02-17 9:04 ` [PATCH v6 10/22] iommu/mediatek: Move reset_axi into plat_data Yong Wu
2019-02-19 23:30 ` Evan Green
2019-02-17 9:04 ` [PATCH v6 11/22] iommu/mediatek: Move vld_pa_rng " Yong Wu
2019-02-19 23:31 ` Evan Green
2019-02-17 9:04 ` [PATCH v6 12/22] memory: mtk-smi: Add gals support Yong Wu
2019-03-13 9:25 ` Yong Wu
2019-02-17 9:04 ` [PATCH v6 13/22] iommu/mediatek: Add mt8183 IOMMU support Yong Wu
2019-02-19 23:31 ` Evan Green
2019-02-17 9:04 ` [PATCH v6 14/22] iommu/mediatek: Add mmu1 support Yong Wu
2019-02-17 9:04 ` [PATCH v6 15/22] memory: mtk-smi: Invoke pm runtime_callback to enable clocks Yong Wu
2019-02-17 9:04 ` [PATCH v6 16/22] memory: mtk-smi: Add bus_sel for mt8183 Yong Wu
2019-02-19 23:31 ` Evan Green
2019-02-17 9:04 ` [PATCH v6 17/22] memory: mtk-smi: Get rid of need_larbid Yong Wu
2019-02-19 23:32 ` Evan Green
2019-02-17 9:04 ` [PATCH v6 18/22] iommu/mediatek: Fix VLD_PA_RNG register backup when suspend Yong Wu
2019-02-17 9:04 ` [PATCH v6 19/22] iommu/mediatek: Add shutdown callback Yong Wu
2019-02-17 9:04 ` [PATCH v6 20/22] iommu/mediatek: Rename enable_4GB to dram_is_4gb Yong Wu
2019-02-19 23:32 ` Evan Green
2019-02-17 9:04 ` [PATCH v6 21/22] iommu/mediatek: Fix iova_to_phys PA start for 4GB mode Yong Wu
2019-02-19 23:33 ` Evan Green
2019-02-20 9:17 ` Yong Wu
2019-02-17 9:05 ` [PATCH v6 22/22] iommu/mediatek: Switch to SPDX license identifier Yong Wu
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=1550394300-17420-10-git-send-email-yong.wu@mediatek.com \
--to=yong.wu@mediatek.com \
--cc=anan.sun@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=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=mka@chromium.org \
--cc=robh+dt@kernel.org \
--cc=robin.murphy@arm.com \
--cc=srv_heupstream@mediatek.com \
--cc=tfiga@google.com \
--cc=will.deacon@arm.com \
--cc=yingjoe.chen@mediatek.com \
--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).