iommu.lists.linux-foundation.org archive mirror
 help / color / mirror / Atom feed
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>,
	arnd-r2nGTMty4D4@public.gmane.org,
	srv_heupstream-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org,
	Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	Tomasz Figa <tfiga-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>,
	iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org,
	linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
	yingjoe.chen-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.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-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 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

  parent reply	other threads:[~2019-01-01  3:55 UTC|newest]

Thread overview: 67+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-01  3:55 [PATCH v5 00/18] MT8183 IOMMU SUPPORT Yong Wu
     [not found] ` <1546314952-15990-1-git-send-email-yong.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2019-01-01  3:55   ` [PATCH v5 01/20] dt-bindings: mediatek: Add binding for mt8183 IOMMU and SMI Yong Wu
     [not found]     ` <1546314952-15990-2-git-send-email-yong.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
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
     [not found]               ` <CAE=gft4YBvbq5fSuu-RzY9jF8ea8eLKHgOrZ46wPcgdSAWKkVQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2019-02-17 10:01                 ` Yong Wu
2019-01-01  3:55   ` [PATCH v5 08/20] iommu/mediatek: Add larb-id remapped support Yong Wu
     [not found]     ` <1546314952-15990-9-git-send-email-yong.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2019-01-02  6:15       ` Nicolas Boichat
2019-01-30 18:29       ` Evan Green
2019-01-01  3:55   ` [PATCH v5 09/20] iommu/mediatek: Refine protect memory definition Yong Wu
     [not found]     ` <1546314952-15990-10-git-send-email-yong.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2019-01-02  6:23       ` Nicolas Boichat
     [not found]         ` <CANMq1KC0zciUAtvcYoxfBOOMbGFu_Un031QemtuDopjWvwk3cw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2019-01-02  9:33           ` 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
     [not found]     ` <1546314952-15990-11-git-send-email-yong.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2019-01-02  6:43       ` Nicolas Boichat
2019-01-30 18:30     ` Evan Green
2019-01-31  3:22       ` Yong Wu
2019-01-01  3:55   ` Yong Wu [this message]
     [not found]     ` <1546314952-15990-12-git-send-email-yong.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2019-01-02  6:45       ` [PATCH v5 11/20] iommu/mediatek: Move vld_pa_rng " Nicolas Boichat
     [not found]         ` <CANMq1KAZumH0=iLFgi7=P2mCE4B=7nw_FW9ir4Dwp4M3f8Ukjg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2019-01-02  9:32           ` Yong Wu
2019-01-30 18:30     ` Evan Green
2019-01-31  3:20       ` Yong Wu
2019-01-31 16:36         ` 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 17/20] memory: mtk-smi: Get rid of need_larbid Yong Wu
     [not found]     ` <1546314952-15990-18-git-send-email-yong.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
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
     [not found]     ` <1546314952-15990-19-git-send-email-yong.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2019-01-02  6:54       ` Nicolas Boichat
2019-01-02  9:31         ` 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
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 12/20] memory: mtk-smi: Add gals support Yong Wu
2019-01-14  6:57   ` Yong Wu
     [not found]   ` <1546314952-15990-13-git-send-email-yong.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2019-01-30 18:30     ` Evan Green
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

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-nus5lvnupcjwk0htik3j/w@public.gmane.org \
    --cc=arnd-r2nGTMty4D4@public.gmane.org \
    --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=drinkcat-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=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).