Skip to content

Commit 8cd1e61

Browse files
YongWu-HFjoergroedel
authored andcommitted
iommu/mediatek: Add IOMMU_TYPE flag
Add IOMMU_TYPE definition. In the mt8195, we have another IOMMU_TYPE: infra iommu, also there will be another APU_IOMMU, thus, use 2bits for the IOMMU_TYPE. 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-17-yong.wu@mediatek.com Signed-off-by: Joerg Roedel <jroedel@suse.de>
1 parent 9ec30c0 commit 8cd1e61

1 file changed

Lines changed: 10 additions & 2 deletions

File tree

drivers/iommu/mtk_iommu.c

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,17 @@
126126
#define SHARE_PGTABLE BIT(10) /* 2 HW share pgtable */
127127
#define DCM_DISABLE BIT(11)
128128
#define STD_AXI_MODE BIT(12) /* For non MM iommu */
129+
/* 2 bits: iommu type */
130+
#define MTK_IOMMU_TYPE_MM (0x0 << 13)
131+
#define MTK_IOMMU_TYPE_INFRA (0x1 << 13)
132+
#define MTK_IOMMU_TYPE_MASK (0x3 << 13)
129133

130-
#define MTK_IOMMU_HAS_FLAG(pdata, _x) \
131-
((((pdata)->flags) & (_x)) == (_x))
134+
#define MTK_IOMMU_HAS_FLAG_MASK(pdata, _x, mask) \
135+
((((pdata)->flags) & (mask)) == (_x))
136+
137+
#define MTK_IOMMU_HAS_FLAG(pdata, _x) MTK_IOMMU_HAS_FLAG_MASK(pdata, _x, _x)
138+
#define MTK_IOMMU_IS_TYPE(pdata, _x) MTK_IOMMU_HAS_FLAG_MASK(pdata, _x,\
139+
MTK_IOMMU_TYPE_MASK)
132140

133141
struct mtk_iommu_domain {
134142
struct io_pgtable_cfg cfg;

0 commit comments

Comments
 (0)