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>,
Robin Murphy <robin.murphy@arm.com>
Cc: Tomasz Figa <tfiga@google.com>, Will Deacon <will.deacon@arm.com>,
Daniel Kurtz <djkurtz@google.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>, <arnd@arndb.de>,
<yingjoe.chen@mediatek.com>, <yong.wu@mediatek.com>
Subject: [PATCH 10/13] iommu/mediatek: Add VLD_PA_RANGE register backup when suspend
Date: Mon, 3 Sep 2018 14:01:39 +0800 [thread overview]
Message-ID: <1535954502-30646-11-git-send-email-yong.wu@mediatek.com> (raw)
In-Reply-To: <1535954502-30646-1-git-send-email-yong.wu@mediatek.com>
The register VLD_PA_RNG(0x118) was forgot to backup while adding 4GB
mode support for mt2712. this patch add it.
Fixes: 30e2fccf9512 ("iommu/mediatek: Enlarge the validate PA range
for 4GB mode")
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
---
drivers/iommu/mtk_iommu.c | 2 ++
drivers/iommu/mtk_iommu.h | 1 +
2 files changed, 3 insertions(+)
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index e9665ad..2f907dd 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -733,6 +733,7 @@ static int __maybe_unused mtk_iommu_suspend(struct device *dev)
reg->int_control0 = readl_relaxed(base + REG_MMU_INT_CONTROL0);
reg->int_main_control = readl_relaxed(base + REG_MMU_INT_MAIN_CONTROL);
reg->ivrp_paddr = readl_relaxed(base + REG_MMU_IVRP_PADDR);
+ reg->vld_pa_range = readl_relaxed(base + REG_MMU_VLD_PA_RNG);
clk_disable_unprepare(data->bclk);
return 0;
}
@@ -757,6 +758,7 @@ static int __maybe_unused mtk_iommu_resume(struct device *dev)
writel_relaxed(reg->int_control0, base + REG_MMU_INT_CONTROL0);
writel_relaxed(reg->int_main_control, base + REG_MMU_INT_MAIN_CONTROL);
writel_relaxed(reg->ivrp_paddr, base + REG_MMU_IVRP_PADDR);
+ writel_relaxed(reg->vld_pa_range, base + REG_MMU_VLD_PA_RNG);
if (m4u_dom)
writel(m4u_dom->cfg.arm_v7s_cfg.ttbr[0] & MMU_PT_ADDR_MASK,
base + REG_MMU_PT_BASE_ADDR);
diff --git a/drivers/iommu/mtk_iommu.h b/drivers/iommu/mtk_iommu.h
index 8bf76be..1b423fe 100644
--- a/drivers/iommu/mtk_iommu.h
+++ b/drivers/iommu/mtk_iommu.h
@@ -33,6 +33,7 @@ struct mtk_iommu_suspend_reg {
u32 int_control0;
u32 int_main_control;
u32 ivrp_paddr;
+ u32 vld_pa_range;
};
enum mtk_iommu_plat {
--
1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Yong Wu <yong.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
To: Joerg Roedel <joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>,
Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
Matthias Brugger
<matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org>
Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@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,
Daniel Kurtz <djkurtz-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
Subject: [PATCH 10/13] iommu/mediatek: Add VLD_PA_RANGE register backup when suspend
Date: Mon, 3 Sep 2018 14:01:39 +0800 [thread overview]
Message-ID: <1535954502-30646-11-git-send-email-yong.wu@mediatek.com> (raw)
In-Reply-To: <1535954502-30646-1-git-send-email-yong.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
The register VLD_PA_RNG(0x118) was forgot to backup while adding 4GB
mode support for mt2712. this patch add it.
Fixes: 30e2fccf9512 ("iommu/mediatek: Enlarge the validate PA range
for 4GB mode")
Signed-off-by: Yong Wu <yong.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
---
drivers/iommu/mtk_iommu.c | 2 ++
drivers/iommu/mtk_iommu.h | 1 +
2 files changed, 3 insertions(+)
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index e9665ad..2f907dd 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -733,6 +733,7 @@ static int __maybe_unused mtk_iommu_suspend(struct device *dev)
reg->int_control0 = readl_relaxed(base + REG_MMU_INT_CONTROL0);
reg->int_main_control = readl_relaxed(base + REG_MMU_INT_MAIN_CONTROL);
reg->ivrp_paddr = readl_relaxed(base + REG_MMU_IVRP_PADDR);
+ reg->vld_pa_range = readl_relaxed(base + REG_MMU_VLD_PA_RNG);
clk_disable_unprepare(data->bclk);
return 0;
}
@@ -757,6 +758,7 @@ static int __maybe_unused mtk_iommu_resume(struct device *dev)
writel_relaxed(reg->int_control0, base + REG_MMU_INT_CONTROL0);
writel_relaxed(reg->int_main_control, base + REG_MMU_INT_MAIN_CONTROL);
writel_relaxed(reg->ivrp_paddr, base + REG_MMU_IVRP_PADDR);
+ writel_relaxed(reg->vld_pa_range, base + REG_MMU_VLD_PA_RNG);
if (m4u_dom)
writel(m4u_dom->cfg.arm_v7s_cfg.ttbr[0] & MMU_PT_ADDR_MASK,
base + REG_MMU_PT_BASE_ADDR);
diff --git a/drivers/iommu/mtk_iommu.h b/drivers/iommu/mtk_iommu.h
index 8bf76be..1b423fe 100644
--- a/drivers/iommu/mtk_iommu.h
+++ b/drivers/iommu/mtk_iommu.h
@@ -33,6 +33,7 @@ struct mtk_iommu_suspend_reg {
u32 int_control0;
u32 int_main_control;
u32 ivrp_paddr;
+ u32 vld_pa_range;
};
enum mtk_iommu_plat {
--
1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: yong.wu@mediatek.com (Yong Wu)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 10/13] iommu/mediatek: Add VLD_PA_RANGE register backup when suspend
Date: Mon, 3 Sep 2018 14:01:39 +0800 [thread overview]
Message-ID: <1535954502-30646-11-git-send-email-yong.wu@mediatek.com> (raw)
In-Reply-To: <1535954502-30646-1-git-send-email-yong.wu@mediatek.com>
The register VLD_PA_RNG(0x118) was forgot to backup while adding 4GB
mode support for mt2712. this patch add it.
Fixes: 30e2fccf9512 ("iommu/mediatek: Enlarge the validate PA range
for 4GB mode")
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
---
drivers/iommu/mtk_iommu.c | 2 ++
drivers/iommu/mtk_iommu.h | 1 +
2 files changed, 3 insertions(+)
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index e9665ad..2f907dd 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -733,6 +733,7 @@ static int __maybe_unused mtk_iommu_suspend(struct device *dev)
reg->int_control0 = readl_relaxed(base + REG_MMU_INT_CONTROL0);
reg->int_main_control = readl_relaxed(base + REG_MMU_INT_MAIN_CONTROL);
reg->ivrp_paddr = readl_relaxed(base + REG_MMU_IVRP_PADDR);
+ reg->vld_pa_range = readl_relaxed(base + REG_MMU_VLD_PA_RNG);
clk_disable_unprepare(data->bclk);
return 0;
}
@@ -757,6 +758,7 @@ static int __maybe_unused mtk_iommu_resume(struct device *dev)
writel_relaxed(reg->int_control0, base + REG_MMU_INT_CONTROL0);
writel_relaxed(reg->int_main_control, base + REG_MMU_INT_MAIN_CONTROL);
writel_relaxed(reg->ivrp_paddr, base + REG_MMU_IVRP_PADDR);
+ writel_relaxed(reg->vld_pa_range, base + REG_MMU_VLD_PA_RNG);
if (m4u_dom)
writel(m4u_dom->cfg.arm_v7s_cfg.ttbr[0] & MMU_PT_ADDR_MASK,
base + REG_MMU_PT_BASE_ADDR);
diff --git a/drivers/iommu/mtk_iommu.h b/drivers/iommu/mtk_iommu.h
index 8bf76be..1b423fe 100644
--- a/drivers/iommu/mtk_iommu.h
+++ b/drivers/iommu/mtk_iommu.h
@@ -33,6 +33,7 @@ struct mtk_iommu_suspend_reg {
u32 int_control0;
u32 int_main_control;
u32 ivrp_paddr;
+ u32 vld_pa_range;
};
enum mtk_iommu_plat {
--
1.9.1
next prev parent reply other threads:[~2018-09-03 6:04 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-03 6:01 [PATCH 00/13] MT8183 IOMMU SUPPORT Yong Wu
2018-09-03 6:01 ` Yong Wu
2018-09-03 6:01 ` Yong Wu
2018-09-03 6:01 ` [PATCH 01/13] dt-bindings: mediatek: Add binding for mt8183 IOMMU and SMI Yong Wu
2018-09-03 6:01 ` Yong Wu
2018-09-03 6:01 ` Yong Wu
[not found] ` <1535954502-30646-2-git-send-email-yong.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2018-09-16 22:26 ` Rob Herring
2018-09-16 22:26 ` Rob Herring
2018-09-17 6:15 ` Yong Wu
2018-09-17 6:15 ` Yong Wu
2018-09-17 6:15 ` Yong Wu
2018-09-03 6:01 ` [PATCH 02/13] iommu/mediatek: Use a struct as the platform data Yong Wu
2018-09-03 6:01 ` Yong Wu
2018-09-03 6:01 ` Yong Wu
2018-09-03 6:01 ` [PATCH 03/13] memory: mtk-smi: Use a general config_port interface Yong Wu
2018-09-03 6:01 ` Yong Wu
2018-09-03 6:01 ` Yong Wu
2018-09-03 6:01 ` [PATCH 04/13] iommu/io-pgtable-arm-v7s: Extend MediaTek 4GB mode Yong Wu
2018-09-03 6:01 ` Yong Wu
2018-09-03 6:01 ` Yong Wu
2018-09-20 5:54 ` Yong Wu
2018-09-20 5:54 ` Yong Wu
2018-09-20 5:54 ` Yong Wu
2018-09-20 11:54 ` Robin Murphy
2018-09-20 11:54 ` Robin Murphy
2018-09-20 11:54 ` Robin Murphy
2018-09-20 17:31 ` Robin Murphy
2018-09-20 17:31 ` Robin Murphy
2018-09-20 17:31 ` Robin Murphy
2018-09-24 9:26 ` Yong Wu
2018-09-24 9:26 ` Yong Wu
2018-09-24 9:26 ` Yong Wu
2018-09-03 6:01 ` [PATCH 05/13] iommu/mediatek: Add mt8183 IOMMU support Yong Wu
2018-09-03 6:01 ` Yong Wu
2018-09-03 6:01 ` Yong Wu
2018-09-03 6:01 ` [PATCH 06/13] iommu/mediatek: Add mmu1 support Yong Wu
2018-09-03 6:01 ` Yong Wu
2018-09-03 6:01 ` Yong Wu
2018-09-03 6:01 ` [PATCH 07/13] memory: mtk-smi: Invoke pm runtime_callback to enable clocks Yong Wu
2018-09-03 6:01 ` Yong Wu
2018-09-03 6:01 ` Yong Wu
2018-09-03 6:01 ` [PATCH 08/13] memory: mtk-smi: Use a struct for the platform data for smi-common Yong Wu
2018-09-03 6:01 ` Yong Wu
2018-09-03 6:01 ` Yong Wu
2018-09-03 6:01 ` [PATCH 09/13] memory: mtk-smi: Add bus_sel for mt8183 Yong Wu
2018-09-03 6:01 ` Yong Wu
2018-09-03 6:01 ` Yong Wu
2018-09-03 6:01 ` Yong Wu [this message]
2018-09-03 6:01 ` [PATCH 10/13] iommu/mediatek: Add VLD_PA_RANGE register backup when suspend Yong Wu
2018-09-03 6:01 ` Yong Wu
2018-09-03 6:01 ` [PATCH 11/13] iommu/mediatek: Add shutdown callback Yong Wu
2018-09-03 6:01 ` Yong Wu
2018-09-03 6:01 ` Yong Wu
2018-09-03 6:01 ` [PATCH 12/13] memory: mtk-smi: Get rid of need_larbid Yong Wu
2018-09-03 6:01 ` Yong Wu
2018-09-03 6:01 ` Yong Wu
2018-09-03 6:01 ` [PATCH 13/13] iommu/mediatek: Switch to SPDX license identifier Yong Wu
2018-09-03 6:01 ` Yong Wu
2018-09-03 6:01 ` Yong Wu
[not found] ` <1535954502-30646-14-git-send-email-yong.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2018-09-17 5:44 ` Rob Herring
2018-09-17 5:44 ` Rob Herring
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=1535954502-30646-11-git-send-email-yong.wu@mediatek.com \
--to=yong.wu@mediatek.com \
--cc=arnd@arndb.de \
--cc=devicetree@vger.kernel.org \
--cc=djkurtz@google.com \
--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 \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.