Skip to content

Commit b9475b3

Browse files
YongWu-HFjoergroedel
authored andcommitted
iommu/mediatek: Fix VLD_PA_RNG register backup when suspend
The register VLD_PA_RNG(0x118) was forgot to backup while adding 4GB mode support for mt2712. this patch add it. Fixes: 30e2fcc ("iommu/mediatek: Enlarge the validate PA range for 4GB mode") Signed-off-by: Yong Wu <[email protected]> Reviewed-by: Evan Green <[email protected]> Reviewed-by: Matthias Brugger <[email protected]> Signed-off-by: Joerg Roedel <[email protected]>
1 parent 567e58c commit b9475b3

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

drivers/iommu/mtk_iommu.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -742,6 +742,7 @@ static int __maybe_unused mtk_iommu_suspend(struct device *dev)
742742
reg->int_control0 = readl_relaxed(base + REG_MMU_INT_CONTROL0);
743743
reg->int_main_control = readl_relaxed(base + REG_MMU_INT_MAIN_CONTROL);
744744
reg->ivrp_paddr = readl_relaxed(base + REG_MMU_IVRP_PADDR);
745+
reg->vld_pa_rng = readl_relaxed(base + REG_MMU_VLD_PA_RNG);
745746
clk_disable_unprepare(data->bclk);
746747
return 0;
747748
}
@@ -766,6 +767,7 @@ static int __maybe_unused mtk_iommu_resume(struct device *dev)
766767
writel_relaxed(reg->int_control0, base + REG_MMU_INT_CONTROL0);
767768
writel_relaxed(reg->int_main_control, base + REG_MMU_INT_MAIN_CONTROL);
768769
writel_relaxed(reg->ivrp_paddr, base + REG_MMU_IVRP_PADDR);
770+
writel_relaxed(reg->vld_pa_rng, base + REG_MMU_VLD_PA_RNG);
769771
if (m4u_dom)
770772
writel(m4u_dom->cfg.arm_v7s_cfg.ttbr[0] & MMU_PT_ADDR_MASK,
771773
base + REG_MMU_PT_BASE_ADDR);

drivers/iommu/mtk_iommu.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ struct mtk_iommu_suspend_reg {
2424
u32 int_control0;
2525
u32 int_main_control;
2626
u32 ivrp_paddr;
27+
u32 vld_pa_rng;
2728
};
2829

2930
enum mtk_iommu_plat {

0 commit comments

Comments
 (0)