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: 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>, <arnd@arndb.de>,
<yingjoe.chen@mediatek.com>, <yong.wu@mediatek.com>,
<youlin.pei@mediatek.com>,
Nicolas Boichat <drinkcat@chromium.org>
Subject: [PATCH v5 18/20] iommu/mediatek: Fix VLD_PA_RANGE register backup when suspend
Date: Tue, 1 Jan 2019 11:55:50 +0800 [thread overview]
Message-ID: <1546314952-15990-19-git-send-email-yong.wu@mediatek.com> (raw)
In-Reply-To: <1546314952-15990-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 7fcef19..ddf1969 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -716,6 +716,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;
}
@@ -740,6 +741,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 0a7c463..c500bfd 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:[~2019-01-01 4:00 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
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-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
2019-01-02 6:23 ` Nicolas Boichat
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
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 ` [PATCH v5 11/20] iommu/mediatek: Move vld_pa_rng " Yong Wu
2019-01-02 6:45 ` Nicolas Boichat
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 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 ` Yong Wu [this message]
2019-01-02 6:54 ` [PATCH v5 18/20] iommu/mediatek: Fix VLD_PA_RANGE register backup when suspend 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
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-19-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).