Skip to content

Commit a43e767

Browse files
YongWu-HFjoergroedel
authored andcommitted
iommu/mediatek: mt8195: Add iova_region_larb_msk
Add iova_region_larb_msk for mt8195. We separate the 16GB iova regions by each device's larbid/portid. Refer to include/dt-bindings/memory/mt8195-memory-port.h Signed-off-by: Yong Wu <yong.wu@mediatek.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Link: https://lore.kernel.org/r/20230411093144.2690-7-yong.wu@mediatek.com Signed-off-by: Joerg Roedel <jroedel@suse.de>
1 parent 6b1317f commit a43e767

1 file changed

Lines changed: 17 additions & 0 deletions

File tree

drivers/iommu/mtk_iommu.c

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1587,6 +1587,21 @@ static const struct mtk_iommu_plat_data mt8195_data_infra = {
15871587
.iova_region_nr = ARRAY_SIZE(single_domain),
15881588
};
15891589

1590+
static const unsigned int mt8195_larb_region_msk[MT8192_MULTI_REGION_NR_MAX][MTK_LARB_NR_MAX] = {
1591+
[0] = {~0, ~0, ~0, ~0}, /* Region0: all ports for larb0/1/2/3 */
1592+
[1] = {0, 0, 0, 0, 0, 0, 0, 0,
1593+
0, 0, 0, 0, 0, 0, 0, 0,
1594+
0, 0, 0, ~0, ~0, ~0, ~0, ~0, /* Region1: larb19/20/21/22/23/24 */
1595+
~0},
1596+
[2] = {0, 0, 0, 0, ~0, ~0, ~0, ~0, /* Region2: the other larbs. */
1597+
~0, ~0, ~0, ~0, ~0, ~0, ~0, ~0,
1598+
~0, ~0, 0, 0, 0, 0, 0, 0,
1599+
0, ~0, ~0, ~0, ~0},
1600+
[3] = {0},
1601+
[4] = {[18] = BIT(0) | BIT(1)}, /* Only larb18 port0/1 */
1602+
[5] = {[18] = BIT(2) | BIT(3)}, /* Only larb18 port2/3 */
1603+
};
1604+
15901605
static const struct mtk_iommu_plat_data mt8195_data_vdo = {
15911606
.m4u_plat = M4U_MT8195,
15921607
.flags = HAS_BCLK | HAS_SUB_COMM_2BITS | OUT_ORDER_WR_EN |
@@ -1597,6 +1612,7 @@ static const struct mtk_iommu_plat_data mt8195_data_vdo = {
15971612
.banks_enable = {true},
15981613
.iova_region = mt8192_multi_dom,
15991614
.iova_region_nr = ARRAY_SIZE(mt8192_multi_dom),
1615+
.iova_region_larb_msk = mt8195_larb_region_msk,
16001616
.larbid_remap = {{2, 0}, {21}, {24}, {7}, {19}, {9, 10, 11},
16011617
{13, 17, 15/* 17b */, 25}, {5}},
16021618
};
@@ -1611,6 +1627,7 @@ static const struct mtk_iommu_plat_data mt8195_data_vpp = {
16111627
.banks_enable = {true},
16121628
.iova_region = mt8192_multi_dom,
16131629
.iova_region_nr = ARRAY_SIZE(mt8192_multi_dom),
1630+
.iova_region_larb_msk = mt8195_larb_region_msk,
16141631
.larbid_remap = {{1}, {3},
16151632
{22, MTK_INVALID_LARBID, MTK_INVALID_LARBID, MTK_INVALID_LARBID, 23},
16161633
{8}, {20}, {12},

0 commit comments

Comments
 (0)