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: Evan Green <evgreen@chromium.org>, 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>, <yingjoe.chen@mediatek.com>,
<yong.wu@mediatek.com>, <youlin.pei@mediatek.com>,
Nicolas Boichat <drinkcat@chromium.org>, <anan.sun@mediatek.com>,
Matthias Kaehlcke <mka@chromium.org>
Subject: [PATCH v6 18/22] iommu/mediatek: Fix VLD_PA_RNG register backup when suspend
Date: Sun, 17 Feb 2019 17:04:56 +0800 [thread overview]
Message-ID: <1550394300-17420-19-git-send-email-yong.wu@mediatek.com> (raw)
In-Reply-To: <1550394300-17420-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>
Reviewed-by: Evan Green <evgreen@chromium.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 22c508b..b02854c 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -715,6 +715,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_rng = readl_relaxed(base + REG_MMU_VLD_PA_RNG);
clk_disable_unprepare(data->bclk);
return 0;
}
@@ -739,6 +740,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_rng, 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 db12424..dedf05c 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_rng;
};
enum mtk_iommu_plat {
--
1.9.1
WARNING: multiple messages have this Message-ID (diff)
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: Evan Green <evgreen@chromium.org>, 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, yingjoe.chen@mediatek.com,
yong.wu@mediatek.com, youlin.pei@mediatek.com,
Nicolas Boichat <drinkcat@chromium.org>,
anan.sun@mediatek.com, Matthias Kaehlcke <mka@chromium.org>
Subject: [PATCH v6 18/22] iommu/mediatek: Fix VLD_PA_RNG register backup when suspend
Date: Sun, 17 Feb 2019 17:04:56 +0800 [thread overview]
Message-ID: <1550394300-17420-19-git-send-email-yong.wu@mediatek.com> (raw)
In-Reply-To: <1550394300-17420-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>
Reviewed-by: Evan Green <evgreen@chromium.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 22c508b..b02854c 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -715,6 +715,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_rng = readl_relaxed(base + REG_MMU_VLD_PA_RNG);
clk_disable_unprepare(data->bclk);
return 0;
}
@@ -739,6 +740,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_rng, 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 db12424..dedf05c 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_rng;
};
enum mtk_iommu_plat {
--
1.9.1
WARNING: multiple messages have this Message-ID (diff)
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>,
srv_heupstream@mediatek.com, Will Deacon <will.deacon@arm.com>,
linux-kernel@vger.kernel.org, Evan Green <evgreen@chromium.org>,
Tomasz Figa <tfiga@google.com>,
iommu@lists.linux-foundation.org,
Matthias Kaehlcke <mka@chromium.org>,
linux-mediatek@lists.infradead.org, yong.wu@mediatek.com,
yingjoe.chen@mediatek.com, anan.sun@mediatek.com,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v6 18/22] iommu/mediatek: Fix VLD_PA_RNG register backup when suspend
Date: Sun, 17 Feb 2019 17:04:56 +0800 [thread overview]
Message-ID: <1550394300-17420-19-git-send-email-yong.wu@mediatek.com> (raw)
In-Reply-To: <1550394300-17420-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>
Reviewed-by: Evan Green <evgreen@chromium.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 22c508b..b02854c 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -715,6 +715,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_rng = readl_relaxed(base + REG_MMU_VLD_PA_RNG);
clk_disable_unprepare(data->bclk);
return 0;
}
@@ -739,6 +740,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_rng, 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 db12424..dedf05c 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_rng;
};
enum mtk_iommu_plat {
--
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-02-17 9:09 UTC|newest]
Thread overview: 108+ 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 ` Yong Wu
2019-02-17 9:04 ` Yong Wu
2019-02-17 9:04 ` [PATCH v6 01/22] dt-bindings: mediatek: Add binding for mt8183 IOMMU and SMI Yong Wu
2019-02-17 9:04 ` Yong Wu
2019-02-17 9:04 ` Yong Wu
2019-02-18 15:44 ` Rob Herring
2019-02-18 15:44 ` Rob Herring
2019-02-18 15:44 ` Rob Herring
2019-02-19 23:28 ` Evan Green
2019-02-19 23:28 ` Evan Green
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 ` Yong Wu
2019-02-17 9:04 ` 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 ` Yong Wu
2019-02-17 9:04 ` 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 ` Yong Wu
2019-02-17 9:04 ` 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
2019-02-17 9:04 ` Yong Wu
2019-02-17 9:04 ` Yong Wu
2019-02-17 9:04 ` [PATCH v6 06/22] iommu/io-pgtable-arm-v7s: Extend MediaTek 4GB Mode Yong Wu
2019-02-17 9:04 ` Yong Wu
2019-02-17 9:04 ` Yong Wu
2019-02-19 23:29 ` Evan Green
2019-02-19 23:29 ` Evan Green
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 ` Yong Wu
2019-02-17 9:04 ` 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 ` Yong Wu
2019-02-17 9:04 ` Yong Wu
2019-02-17 9:04 ` [PATCH v6 09/22] iommu/mediatek: Refine protect memory definition Yong Wu
2019-02-17 9:04 ` Yong Wu
2019-02-17 9:04 ` Yong Wu
2019-02-19 23:30 ` Evan Green
2019-02-19 23:30 ` Evan Green
2019-02-19 23:30 ` Evan Green
2019-02-17 9:04 ` [PATCH v6 10/22] iommu/mediatek: Move reset_axi into plat_data Yong Wu
2019-02-17 9:04 ` Yong Wu
2019-02-17 9:04 ` Yong Wu
2019-02-19 23:30 ` Evan Green
2019-02-19 23:30 ` Evan Green
2019-02-19 23:30 ` Evan Green
2019-02-17 9:04 ` [PATCH v6 11/22] iommu/mediatek: Move vld_pa_rng " Yong Wu
2019-02-17 9:04 ` Yong Wu
2019-02-17 9:04 ` Yong Wu
2019-02-19 23:31 ` Evan Green
2019-02-19 23:31 ` Evan Green
2019-02-19 23:31 ` Evan Green
2019-02-17 9:04 ` [PATCH v6 12/22] memory: mtk-smi: Add gals support Yong Wu
2019-02-17 9:04 ` Yong Wu
2019-02-17 9:04 ` Yong Wu
2019-03-13 9:25 ` Yong Wu
2019-03-13 9:25 ` Yong Wu
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-17 9:04 ` Yong Wu
2019-02-17 9:04 ` Yong Wu
2019-02-19 23:31 ` Evan Green
2019-02-19 23:31 ` Evan Green
2019-02-19 23:31 ` Evan Green
2019-02-17 9:04 ` [PATCH v6 14/22] iommu/mediatek: Add mmu1 support Yong Wu
2019-02-17 9:04 ` Yong Wu
2019-02-17 9:04 ` Yong Wu
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 ` Yong Wu
2019-02-17 9:04 ` Yong Wu
2019-02-17 9:04 ` [PATCH v6 16/22] memory: mtk-smi: Add bus_sel for mt8183 Yong Wu
2019-02-17 9:04 ` Yong Wu
2019-02-17 9:04 ` Yong Wu
2019-02-19 23:31 ` Evan Green
2019-02-19 23:31 ` Evan Green
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-17 9:04 ` Yong Wu
2019-02-17 9:04 ` Yong Wu
2019-02-19 23:32 ` Evan Green
2019-02-19 23:32 ` Evan Green
2019-02-19 23:32 ` Evan Green
2019-02-17 9:04 ` Yong Wu [this message]
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 ` Yong Wu
2019-02-17 9:04 ` [PATCH v6 19/22] iommu/mediatek: Add shutdown callback Yong Wu
2019-02-17 9:04 ` Yong Wu
2019-02-17 9:04 ` Yong Wu
2019-02-17 9:04 ` [PATCH v6 20/22] iommu/mediatek: Rename enable_4GB to dram_is_4gb Yong Wu
2019-02-17 9:04 ` Yong Wu
2019-02-17 9:04 ` Yong Wu
2019-02-19 23:32 ` Evan Green
2019-02-19 23:32 ` Evan Green
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-17 9:04 ` Yong Wu
2019-02-17 9:04 ` Yong Wu
2019-02-19 23:33 ` Evan Green
2019-02-19 23:33 ` Evan Green
2019-02-19 23:33 ` Evan Green
2019-02-20 9:17 ` Yong Wu
2019-02-20 9:17 ` Yong Wu
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
2019-02-17 9:05 ` Yong Wu
2019-02-17 9:05 ` 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-19-git-send-email-yong.wu@mediatek.com \
--to=yong.wu@mediatek.com \
--cc=anan.sun@mediatek.com \
--cc=devicetree@vger.kernel.org \
--cc=drinkcat@chromium.org \
--cc=evgreen@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=mka@chromium.org \
--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 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.