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: youlin.pei@mediatek.com, devicetree@vger.kernel.org,
Nicolas Boichat <drinkcat@chromium.org>,
arnd@arndb.de, srv_heupstream@mediatek.com,
Will Deacon <will.deacon@arm.com>,
linux-kernel@vger.kernel.org, Tomasz Figa <tfiga@google.com>,
iommu@lists.linux-foundation.org,
linux-mediatek@lists.infradead.org, yong.wu@mediatek.com,
yingjoe.chen@mediatek.com, linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 11/20] iommu/mediatek: Move vld_pa_rng into plat_data
Date: Tue, 1 Jan 2019 11:55:43 +0800 [thread overview]
Message-ID: <1546314952-15990-12-git-send-email-yong.wu@mediatek.com> (raw)
In-Reply-To: <1546314952-15990-1-git-send-email-yong.wu@mediatek.com>
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@mediatek.com>
---
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 8d8ab21..2913ddb 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -548,7 +548,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->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].
@@ -741,6 +741,7 @@ static int __maybe_unused mtk_iommu_resume(struct device *dev)
.m4u_plat = M4U_MT2712,
.has_4gb_mode = true,
.has_bclk = true,
+ .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..a8c5d1e 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 vld_pa_rng;
unsigned char larbid_remap[MTK_LARB_NR_MAX];
};
--
1.9.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-01-01 4:00 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-01 3:55 [PATCH v5 00/18] MT8183 IOMMU SUPPORT Yong Wu
2019-01-01 3:55 ` [PATCH v5 01/20] dt-bindings: mediatek: Add binding for mt8183 IOMMU and SMI Yong Wu
2019-01-30 18:27 ` Evan Green
2019-01-31 3:19 ` Yong Wu
2019-01-01 3:55 ` [PATCH v5 02/20] iommu/mediatek: Use a struct as the platform data Yong Wu
2019-01-30 18:27 ` Evan Green
2019-01-01 3:55 ` [PATCH v5 03/20] memory: mtk-smi: Use a general config_port interface Yong Wu
2019-01-30 18:27 ` Evan Green
2019-01-01 3:55 ` [PATCH v5 04/20] memory: mtk-smi: Use a struct for the platform data for smi-common Yong Wu
2019-01-30 18:28 ` Evan Green
2019-01-01 3:55 ` [PATCH v5 05/20] iommu/io-pgtable-arm-v7s: Add paddr_to_iopte and iopte_to_paddr helpers Yong Wu
2019-01-30 18:28 ` Evan Green
2019-01-01 3:55 ` [PATCH v6 06/20] iommu/io-pgtable-arm-v7s: Extend MediaTek 4GB Mode Yong Wu
2019-01-30 18:28 ` Evan Green
2019-01-31 6:58 ` Yong Wu
2019-01-31 19:23 ` Evan Green
2019-02-01 9:42 ` Yong Wu
2019-02-05 23:11 ` Evan Green
2019-02-17 10:01 ` Yong Wu
2019-01-01 3:55 ` [PATCH v5 07/20] iommu/mediatek: Add bclk can be supported optionally Yong Wu
2019-01-30 18:29 ` Evan Green
2019-01-01 3:55 ` [PATCH v5 08/20] iommu/mediatek: Add larb-id remapped support Yong Wu
2019-01-30 18:29 ` Evan Green
2019-01-01 3:55 ` [PATCH v5 09/20] iommu/mediatek: Refine protect memory definition Yong Wu
2019-01-30 18:30 ` Evan Green
2019-01-01 3:55 ` [PATCH v5 10/20] iommu/mediatek: Move reset_axi into plat_data Yong Wu
2019-01-30 18:30 ` Evan Green
2019-01-31 3:22 ` Yong Wu
2019-01-01 3:55 ` Yong Wu [this message]
2019-01-30 18:30 ` [PATCH v5 11/20] iommu/mediatek: Move vld_pa_rng " Evan Green
2019-01-31 3:20 ` Yong Wu
2019-01-31 16:36 ` Evan Green
2019-01-01 3:55 ` [PATCH v5 12/20] memory: mtk-smi: Add gals support Yong Wu
2019-01-14 6:57 ` Yong Wu
2019-01-30 18:30 ` Evan Green
2019-01-01 3:55 ` [PATCH v5 13/20] iommu/mediatek: Add mt8183 IOMMU support Yong Wu
2019-01-30 18:31 ` Evan Green
2019-01-31 3:19 ` Yong Wu
2019-01-01 3:55 ` [PATCH v5 14/20] iommu/mediatek: Add mmu1 support Yong Wu
2019-01-30 18:55 ` Evan Green
2019-01-31 3:22 ` Yong Wu
2019-01-01 3:55 ` [PATCH v5 15/20] memory: mtk-smi: Invoke pm runtime_callback to enable clocks Yong Wu
2019-01-30 19:05 ` Evan Green
2019-01-31 3:42 ` Yong Wu
2019-01-01 3:55 ` [PATCH v5 16/20] memory: mtk-smi: Add bus_sel for mt8183 Yong Wu
2019-01-30 19:07 ` Evan Green
2019-01-31 3:20 ` Yong Wu
2019-01-01 3:55 ` [PATCH v5 17/20] memory: mtk-smi: Get rid of need_larbid Yong Wu
2019-01-30 19:11 ` Evan Green
2019-01-31 3:22 ` Yong Wu
2019-01-31 17:45 ` Evan Green
2019-02-01 9:42 ` Yong Wu
2019-01-01 3:55 ` [PATCH v5 18/20] iommu/mediatek: Fix VLD_PA_RANGE register backup when suspend Yong Wu
2019-01-30 19:11 ` Evan Green
2019-01-01 3:55 ` [PATCH v5 19/20] iommu/mediatek: Add shutdown callback Yong Wu
2019-01-30 19:12 ` Evan Green
2019-01-31 3:21 ` Yong Wu
2019-01-01 3:55 ` [PATCH v5 20/20] iommu/mediatek: Switch to SPDX license identifier Yong Wu
2019-01-30 19:13 ` Evan Green
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=1546314952-15990-12-git-send-email-yong.wu@mediatek.com \
--to=yong.wu@mediatek.com \
--cc=arnd@arndb.de \
--cc=devicetree@vger.kernel.org \
--cc=drinkcat@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=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).