Skip to content

Commit d265a4a

Browse files
YongWu-HFjoergroedel
authored andcommitted
iommu/mediatek: Add a flag STD_AXI_MODE
Add a new flag STD_AXI_MODE which is prepared for infra and apu iommu which use the standard axi mode. All the current SoC don't use this flag. Signed-off-by: Yong Wu <yong.wu@mediatek.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com> Link: https://lore.kernel.org/r/20220503071427.2285-13-yong.wu@mediatek.com Signed-off-by: Joerg Roedel <jroedel@suse.de>
1 parent 9a87005 commit d265a4a

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

drivers/iommu/mtk_iommu.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@
122122
#define IOVA_34_EN BIT(8)
123123
#define SHARE_PGTABLE BIT(9) /* 2 HW share pgtable */
124124
#define DCM_DISABLE BIT(10)
125+
#define STD_AXI_MODE BIT(11) /* For non MM iommu */
125126

126127
#define MTK_IOMMU_HAS_FLAG(pdata, _x) \
127128
((((pdata)->flags) & (_x)) == (_x))
@@ -785,7 +786,8 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)
785786
regval = 0;
786787
} else {
787788
regval = readl_relaxed(data->base + REG_MMU_MISC_CTRL);
788-
regval &= ~F_MMU_STANDARD_AXI_MODE_MASK;
789+
if (!MTK_IOMMU_HAS_FLAG(data->plat_data, STD_AXI_MODE))
790+
regval &= ~F_MMU_STANDARD_AXI_MODE_MASK;
789791
if (MTK_IOMMU_HAS_FLAG(data->plat_data, OUT_ORDER_WR_EN))
790792
regval &= ~F_MMU_IN_ORDER_WR_EN_MASK;
791793
}

0 commit comments

Comments
 (0)