Skip to content

Commit 86580ec

Browse files
AngeloGioacchino Del Regnojoergroedel
authored andcommitted
iommu/mediatek: Introduce new flag TF_PORT_TO_ADDR_MT8173
In preparation for adding support for MT6795, add a new flag named TF_PORT_TO_ADDR_MT8173 and use that instead of checking for m4u_plat type in mtk_iommu_hw_init() to avoid seeing a long list of m4u_plat checks there in the future. Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Reviewed-by: Yong Wu <yong.wu@mediatek.com> Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com> Link: https://lore.kernel.org/r/20220913151148.412312-3-angelogioacchino.delregno@collabora.com Signed-off-by: Joerg Roedel <jroedel@suse.de>
1 parent 4e5f846 commit 86580ec

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

drivers/iommu/mtk_iommu.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@
138138
#define PM_CLK_AO BIT(15)
139139
#define IFA_IOMMU_PCIE_SUPPORT BIT(16)
140140
#define PGTABLE_PA_35_EN BIT(17)
141+
#define TF_PORT_TO_ADDR_MT8173 BIT(18)
141142

142143
#define MTK_IOMMU_HAS_FLAG_MASK(pdata, _x, mask) \
143144
((((pdata)->flags) & (mask)) == (_x))
@@ -955,7 +956,7 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data, unsigned int ban
955956
* Global control settings are in bank0. May re-init these global registers
956957
* since no sure if there is bank0 consumers.
957958
*/
958-
if (data->plat_data->m4u_plat == M4U_MT8173) {
959+
if (MTK_IOMMU_HAS_FLAG(data->plat_data, TF_PORT_TO_ADDR_MT8173)) {
959960
regval = F_MMU_PREFETCH_RT_REPLACE_MOD |
960961
F_MMU_TF_PROT_TO_PROGRAM_ADDR_MT8173;
961962
} else {
@@ -1427,7 +1428,8 @@ static const struct mtk_iommu_plat_data mt8167_data = {
14271428
static const struct mtk_iommu_plat_data mt8173_data = {
14281429
.m4u_plat = M4U_MT8173,
14291430
.flags = HAS_4GB_MODE | HAS_BCLK | RESET_AXI |
1430-
HAS_LEGACY_IVRP_PADDR | MTK_IOMMU_TYPE_MM,
1431+
HAS_LEGACY_IVRP_PADDR | MTK_IOMMU_TYPE_MM |
1432+
TF_PORT_TO_ADDR_MT8173,
14311433
.inv_sel_reg = REG_MMU_INV_SEL_GEN1,
14321434
.banks_num = 1,
14331435
.banks_enable = {true},

0 commit comments

Comments
 (0)