Skip to content

Commit ef68a19

Browse files
YongWu-HFjoergroedel
authored andcommitted
iommu/mediatek: Add mt8195 support
mt8195 has 3 IOMMU, containing 2 MM IOMMUs, one is for vdo, the other is for vpp. and 1 INFRA IOMMU. 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-24-yong.wu@mediatek.com Signed-off-by: Joerg Roedel <jroedel@suse.de>
1 parent e762907 commit ef68a19

2 files changed

Lines changed: 42 additions & 0 deletions

File tree

drivers/iommu/mtk_iommu.c

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1233,13 +1233,54 @@ static const struct mtk_iommu_plat_data mt8192_data = {
12331233
{0, 14, 16}, {0, 13, 18, 17}},
12341234
};
12351235

1236+
static const struct mtk_iommu_plat_data mt8195_data_infra = {
1237+
.m4u_plat = M4U_MT8195,
1238+
.flags = WR_THROT_EN | DCM_DISABLE | STD_AXI_MODE | PM_CLK_AO |
1239+
MTK_IOMMU_TYPE_INFRA | IFA_IOMMU_PCIE_SUPPORT,
1240+
.pericfg_comp_str = "mediatek,mt8195-pericfg_ao",
1241+
.inv_sel_reg = REG_MMU_INV_SEL_GEN2,
1242+
.iova_region = single_domain,
1243+
.iova_region_nr = ARRAY_SIZE(single_domain),
1244+
};
1245+
1246+
static const struct mtk_iommu_plat_data mt8195_data_vdo = {
1247+
.m4u_plat = M4U_MT8195,
1248+
.flags = HAS_BCLK | HAS_SUB_COMM_2BITS | OUT_ORDER_WR_EN |
1249+
WR_THROT_EN | IOVA_34_EN | SHARE_PGTABLE | MTK_IOMMU_TYPE_MM,
1250+
.hw_list = &m4ulist,
1251+
.inv_sel_reg = REG_MMU_INV_SEL_GEN2,
1252+
.iova_region = mt8192_multi_dom,
1253+
.iova_region_nr = ARRAY_SIZE(mt8192_multi_dom),
1254+
.larbid_remap = {{2, 0}, {21}, {24}, {7}, {19}, {9, 10, 11},
1255+
{13, 17, 15/* 17b */, 25}, {5}},
1256+
};
1257+
1258+
static const struct mtk_iommu_plat_data mt8195_data_vpp = {
1259+
.m4u_plat = M4U_MT8195,
1260+
.flags = HAS_BCLK | HAS_SUB_COMM_3BITS | OUT_ORDER_WR_EN |
1261+
WR_THROT_EN | IOVA_34_EN | SHARE_PGTABLE | MTK_IOMMU_TYPE_MM,
1262+
.hw_list = &m4ulist,
1263+
.inv_sel_reg = REG_MMU_INV_SEL_GEN2,
1264+
.iova_region = mt8192_multi_dom,
1265+
.iova_region_nr = ARRAY_SIZE(mt8192_multi_dom),
1266+
.larbid_remap = {{1}, {3},
1267+
{22, MTK_INVALID_LARBID, MTK_INVALID_LARBID, MTK_INVALID_LARBID, 23},
1268+
{8}, {20}, {12},
1269+
/* 16: 16a; 29: 16b; 30: CCUtop0; 31: CCUtop1 */
1270+
{14, 16, 29, 26, 30, 31, 18},
1271+
{4, MTK_INVALID_LARBID, MTK_INVALID_LARBID, MTK_INVALID_LARBID, 6}},
1272+
};
1273+
12361274
static const struct of_device_id mtk_iommu_of_ids[] = {
12371275
{ .compatible = "mediatek,mt2712-m4u", .data = &mt2712_data},
12381276
{ .compatible = "mediatek,mt6779-m4u", .data = &mt6779_data},
12391277
{ .compatible = "mediatek,mt8167-m4u", .data = &mt8167_data},
12401278
{ .compatible = "mediatek,mt8173-m4u", .data = &mt8173_data},
12411279
{ .compatible = "mediatek,mt8183-m4u", .data = &mt8183_data},
12421280
{ .compatible = "mediatek,mt8192-m4u", .data = &mt8192_data},
1281+
{ .compatible = "mediatek,mt8195-iommu-infra", .data = &mt8195_data_infra},
1282+
{ .compatible = "mediatek,mt8195-iommu-vdo", .data = &mt8195_data_vdo},
1283+
{ .compatible = "mediatek,mt8195-iommu-vpp", .data = &mt8195_data_vpp},
12431284
{}
12441285
};
12451286

drivers/iommu/mtk_iommu.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ enum mtk_iommu_plat {
4646
M4U_MT8173,
4747
M4U_MT8183,
4848
M4U_MT8192,
49+
M4U_MT8195,
4950
};
5051

5152
struct mtk_iommu_iova_region;

0 commit comments

Comments
 (0)