From: Yong Wu <yong.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
To: Joerg Roedel <joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>,
Matthias Brugger
<matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org>,
Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
Cc: youlin.pei-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org,
devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Nicolas Boichat
<drinkcat-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>,
srv_heupstream-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org,
Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Evan Green <evgreen-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>,
Tomasz Figa <tfiga-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org,
Matthias Kaehlcke <mka-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
yingjoe.chen-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org,
anan.sun-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
Subject: [PATCH v6 11/22] iommu/mediatek: Move vld_pa_rng into plat_data
Date: Sun, 17 Feb 2019 17:04:49 +0800 [thread overview]
Message-ID: <1550394300-17420-12-git-send-email-yong.wu@mediatek.com> (raw)
In-Reply-To: <1550394300-17420-1-git-send-email-yong.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
Both mt8173 and mt8183 don't have this vld_pa_rng(valid physical address
range) register while mt2712 have. Move it into the plat_data.
Signed-off-by: Yong Wu <yong.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
---
drivers/iommu/mtk_iommu.c | 3 ++-
drivers/iommu/mtk_iommu.h | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index 2cf814c..57aa526 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -547,7 +547,7 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)
upper_32_bits(data->protect_base);
writel_relaxed(regval, data->base + REG_MMU_IVRP_PADDR);
- if (data->enable_4GB && data->plat_data->m4u_plat != M4U_MT8173) {
+ if (data->enable_4GB && data->plat_data->has_vld_pa_rng) {
/*
* If 4GB mode is enabled, the validate PA range is from
* 0x1_0000_0000 to 0x1_ffff_ffff. here record bit[32:30].
@@ -740,6 +740,7 @@ static int __maybe_unused mtk_iommu_resume(struct device *dev)
.m4u_plat = M4U_MT2712,
.has_4gb_mode = true,
.has_bclk = true,
+ .has_vld_pa_rng = true,
.larbid_remap = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9},
};
diff --git a/drivers/iommu/mtk_iommu.h b/drivers/iommu/mtk_iommu.h
index b46aeaa..f170a1d 100644
--- a/drivers/iommu/mtk_iommu.h
+++ b/drivers/iommu/mtk_iommu.h
@@ -48,6 +48,7 @@ struct mtk_iommu_plat_data {
/* HW will use the EMI clock if there isn't the "bclk". */
bool has_bclk;
bool reset_axi;
+ bool has_vld_pa_rng;
unsigned char larbid_remap[MTK_LARB_NR_MAX];
};
--
1.9.1
next prev parent reply other threads:[~2019-02-17 9:04 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 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
[not found] ` <1550394300-17420-1-git-send-email-yong.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
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 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 09/22] iommu/mediatek: Refine protect memory definition Yong Wu
2019-02-19 23:30 ` Evan Green
2019-02-17 9:04 ` Yong Wu [this message]
2019-02-19 23:31 ` [PATCH v6 11/22] iommu/mediatek: Move vld_pa_rng into plat_data Evan Green
2019-02-17 9:04 ` [PATCH v6 12/22] memory: mtk-smi: Add gals support Yong Wu
[not found] ` <1550394300-17420-13-git-send-email-yong.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
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 15/22] memory: mtk-smi: Invoke pm runtime_callback to enable clocks 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 08/22] iommu/mediatek: Add larb-id remapped support Yong Wu
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 14/22] iommu/mediatek: Add mmu1 support 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 20/22] iommu/mediatek: Rename enable_4GB to dram_is_4gb Yong Wu
[not found] ` <1550394300-17420-21-git-send-email-yong.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
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-12-git-send-email-yong.wu@mediatek.com \
--to=yong.wu-nus5lvnupcjwk0htik3j/w@public.gmane.org \
--cc=anan.sun-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org \
--cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=drinkcat-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org \
--cc=evgreen-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org \
--cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
--cc=joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=mka-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org \
--cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=robin.murphy-5wv7dgnIgG8@public.gmane.org \
--cc=srv_heupstream-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org \
--cc=tfiga-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org \
--cc=will.deacon-5wv7dgnIgG8@public.gmane.org \
--cc=yingjoe.chen-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org \
--cc=youlin.pei-NuS5LvNUpcJWk0Htik3J/w@public.gmane.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).