lkml.org 
[lkml]   [2019]   [Aug]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v9 13/21] iommu/mediatek: Move vld_pa_rng into plat_data
    Date
    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@mediatek.com>
    Reviewed-by: Evan Green <evgreen@chromium.org>
    Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
    ---
    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 fce7b6d..790bad8 100644
    --- a/drivers/iommu/mtk_iommu.c
    +++ b/drivers/iommu/mtk_iommu.c
    @@ -540,7 +540,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->has_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].
    @@ -739,6 +739,7 @@ static int __maybe_unused mtk_iommu_resume(struct device *dev)
    .m4u_plat = M4U_MT2712,
    .has_4gb_mode = true,
    .has_bclk = true,
    + .has_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 8d3b525..973d6e0 100644
    --- a/drivers/iommu/mtk_iommu.h
    +++ b/drivers/iommu/mtk_iommu.h
    @@ -38,6 +38,7 @@ struct mtk_iommu_plat_data {

    /* HW will use the EMI clock if there isn't the "bclk". */
    bool has_bclk;
    + bool has_vld_pa_rng;
    bool reset_axi;
    unsigned char larbid_remap[MTK_LARB_NR_MAX];
    };
    --
    1.9.1
    \
     
     \ /
      Last update: 2019-08-10 10:01    [W:5.998 / U:0.172 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site