Skip to contentSkip to conversation

dt-bindings: iommu: Add binding for MediaTek MT8167 IOMMU

PATCH Superseded Fabien Parent 2 participants 6 messages Mar 2, 2020 – Mar 4, 2020

Subsystems (4)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/3 dt-bindings: iommu: Add binding for MediaTek MT8167 IOMMU

This commit adds IOMMU binding documentation for the MT8167 SoC.

---

V2: no change

---
 Documentation/devicetree/bindings/iommu/mediatek,iommu.txt | 1 +
 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/iommu/mediatek,iommu.txt +1 -0
index ce59a505f5a4..eee9116cf9bb 100644
@@ -60,6 +60,7 @@ Required properties:
 	"mediatek,mt2712-m4u" for mt2712 which uses generation two m4u HW.
 	"mediatek,mt7623-m4u", "mediatek,mt2701-m4u" for mt7623 which uses
 						     generation one m4u HW.
+	"mediatek,mt8167-m4u" for mt8167 which uses generation two m4u HW.
 	"mediatek,mt8173-m4u" for mt8173 which uses generation two m4u HW.
 	"mediatek,mt8183-m4u" for mt8183 which uses generation two m4u HW.
 - reg : m4u register base and size.
Signature · 1 line
2.25.0
#1 lore raw

PATCH v2 2/3 iommu/mediatek: add pdata member for legacy ivrp paddr

Add a new platform data member in order to select which IVRP_PADDR format is used by an SoC.

---

v2: new patch

---
 drivers/iommu/mtk_iommu.c | 3 ++-
 drivers/iommu/mtk_iommu.h | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/iommu/mtk_iommu.c +2 -1
index 95945f467c03..78cb14ab7dd0 100644
@@ -569,7 +569,7 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)
 		F_INT_PRETETCH_TRANSATION_FIFO_FAULT;
 	writel_relaxed(regval, data->base + REG_MMU_INT_MAIN_CONTROL);
 
-	if (data->plat_data->m4u_plat == M4U_MT8173)
+	if (data->plat_data->has_legacy_ivrp_paddr)
 		regval = (data->protect_base >> 1) | (data->enable_4GB << 31);
 	else
 		regval = lower_32_bits(data->protect_base) |
@@ -786,6 +786,7 @@ static const struct mtk_iommu_plat_data mt8173_data = {
 	.m4u_plat     = M4U_MT8173,
 	.has_4gb_mode = true,
 	.has_bclk     = true,
+	.has_legacy_ivrp_paddr = true;
 	.reset_axi    = true,
 	.larbid_remap = {0, 1, 2, 3, 4, 5}, /* Linear mapping. */
 };
drivers/iommu/mtk_iommu.h +1 -0
index ea949a324e33..4696ba027a71 100644
@@ -42,6 +42,7 @@ struct mtk_iommu_plat_data {
 	bool                has_bclk;
 	bool                has_vld_pa_rng;
 	bool                reset_axi;
+	bool                has_legacy_ivrp_paddr;
 	unsigned char       larbid_remap[MTK_LARB_NR_MAX];
 };
 
Signature · 1 line
2.25.0
maintainer Reviewed-by on v2 2/3
#2 lore raw

Re: [PATCH v2 2/3] iommu/mediatek: add pdata member for legacy ivrp paddr

Quoted 39 lines · Fabien Parent

Add a new platform data member in order to select which IVRP_PADDR format is used by an SoC.

---

v2: new patch

---
 drivers/iommu/mtk_iommu.c | 3 ++-
 drivers/iommu/mtk_iommu.h | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/iommu/mtk_iommu.c +2 -1
index 95945f467c03..78cb14ab7dd0 100644
@@ -569,7 +569,7 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)
 		F_INT_PRETETCH_TRANSATION_FIFO_FAULT;
 	writel_relaxed(regval, data->base + REG_MMU_INT_MAIN_CONTROL);
 
-	if (data->plat_data->m4u_plat == M4U_MT8173)
+	if (data->plat_data->has_legacy_ivrp_paddr)
 		regval = (data->protect_base >> 1) | (data->enable_4GB << 31);
 	else
 		regval = lower_32_bits(data->protect_base) |
@@ -786,6 +786,7 @@ static const struct mtk_iommu_plat_data mt8173_data = {
 	.m4u_plat     = M4U_MT8173,
 	.has_4gb_mode = true,
 	.has_bclk     = true,
+	.has_legacy_ivrp_paddr = true;
 	.reset_axi    = true,
 	.larbid_remap = {0, 1, 2, 3, 4, 5}, /* Linear mapping. */
 };
drivers/iommu/mtk_iommu.h +0 -0
index ea949a324e33..4696ba027a71 100644

drivers/iommu/mtk_iommu.h struct mtk_iommu_plat_data { · line 45

Quoted 4 lines
drivers/iommu/mtk_iommu.h +1 -0
@@ -42,6 +42,7 @@ struct mtk_iommu_plat_data {
 	bool                has_bclk;
 	bool                has_vld_pa_rng;
 	bool                reset_axi;
+	bool                has_legacy_ivrp_paddr;

I'd like to put this before "has_vld_pa_rng" alphabetically.

Other than this,

Quoted 3 lines
drivers/iommu/mtk_iommu.h +0 -0
 	unsigned char       larbid_remap[MTK_LARB_NR_MAX];
 };
 
maintainer
#3 lore raw

Re: [PATCH v2 2/3] iommu/mediatek: add pdata member for legacy ivrp paddr

Quoted 22 lines · Yong Wu
Quoted 21 lines · Fabien Parent

Add a new platform data member in order to select which IVRP_PADDR format is used by an SoC.

---

v2: new patch

---
 drivers/iommu/mtk_iommu.c | 3 ++-
 drivers/iommu/mtk_iommu.h | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/iommu/mtk_iommu.c +0 -0
index 95945f467c03..78cb14ab7dd0 100644
@@ -569,7 +569,7 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)
 		F_INT_PRETETCH_TRANSATION_FIFO_FAULT;
 	writel_relaxed(regval, data->base + REG_MMU_INT_MAIN_CONTROL);
 
Quoted 10 lines

drivers/iommu/mtk_iommu.c static const struct mtk_iommu_plat_data mt8173_data = { · line 789

Quoted 10 lines
drivers/iommu/mtk_iommu.c +2 -1
-	if (data->plat_data->m4u_plat == M4U_MT8173)
+	if (data->plat_data->has_legacy_ivrp_paddr)
 		regval = (data->protect_base >> 1) | (data->enable_4GB << 31);
 	else
 		regval = lower_32_bits(data->protect_base) |
@@ -786,6 +786,7 @@ static const struct mtk_iommu_plat_data mt8173_data = {
 	.m4u_plat     = M4U_MT8173,
 	.has_4gb_mode = true,
 	.has_bclk     = true,
+	.has_legacy_ivrp_paddr = true;

,

Quoted 19 lines

drivers/iommu/mtk_iommu.h struct mtk_iommu_plat_data { · line 45

Quoted 12 lines
drivers/iommu/mtk_iommu.c +0 -0
 	.reset_axi    = true,
 	.larbid_remap = {0, 1, 2, 3, 4, 5}, /* Linear mapping. */
 };
drivers/iommu/mtk_iommu.h +1 -0
index ea949a324e33..4696ba027a71 100644
@@ -42,6 +42,7 @@ struct mtk_iommu_plat_data {
 	bool                has_bclk;
 	bool                has_vld_pa_rng;
 	bool                reset_axi;
+	bool                has_legacy_ivrp_paddr;

I'd like to put this before "has_vld_pa_rng" alphabetically.

Other than this,

Quoted 8 lines

drivers/iommu/mtk_iommu.h struct mtk_iommu_plat_data { · line 48

Quoted 3 lines
drivers/iommu/mtk_iommu.h +0 -0
 	unsigned char       larbid_remap[MTK_LARB_NR_MAX];
 };
 

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#4 lore raw

PATCH v2 3/3 iommu/mediatek: add support for MT8167

In reply to Fabien Parent

Add support for the IOMMU on MT8167

---

V2:
* removed if based on m4u_plat, and using instead the new has_legacy_ivrp_paddr member that was introduced in patch 2.

---
 drivers/iommu/mtk_iommu.c | 9 +++++++++
 drivers/iommu/mtk_iommu.h | 1 +
 2 files changed, 10 insertions(+)
drivers/iommu/mtk_iommu.c +9 -0
index 78cb14ab7dd0..25b7ad1647ba 100644
@@ -782,6 +782,14 @@ static const struct mtk_iommu_plat_data mt2712_data = {
 	.larbid_remap = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9},
 };
 
+static const struct mtk_iommu_plat_data mt8167_data = {
+	.m4u_plat     = M4U_MT8167,
+	.has_4gb_mode = true,
+	.has_legacy_ivrp_paddr = true;
+	.reset_axi    = true,
+	.larbid_remap = {0, 1, 2, 3, 4, 5}, /* Linear mapping. */
+};
+
 static const struct mtk_iommu_plat_data mt8173_data = {
 	.m4u_plat     = M4U_MT8173,
 	.has_4gb_mode = true,
@@ -799,6 +807,7 @@ static const struct mtk_iommu_plat_data mt8183_data = {
 
 static const struct of_device_id mtk_iommu_of_ids[] = {
 	{ .compatible = "mediatek,mt2712-m4u", .data = &mt2712_data},
+	{ .compatible = "mediatek,mt8167-m4u", .data = &mt8167_data},
 	{ .compatible = "mediatek,mt8173-m4u", .data = &mt8173_data},
 	{ .compatible = "mediatek,mt8183-m4u", .data = &mt8183_data},
 	{}
drivers/iommu/mtk_iommu.h +1 -0
index 4696ba027a71..72f874ec9e9c 100644
@@ -30,6 +30,7 @@ struct mtk_iommu_suspend_reg {
 enum mtk_iommu_plat {
 	M4U_MT2701,
 	M4U_MT2712,
+	M4U_MT8167,
 	M4U_MT8173,
 	M4U_MT8183,
 };
Signature · 1 line
2.25.0
maintainer Reviewed-by on v2 3/3
#5 lore raw

Re: [PATCH v2 3/3] iommu/mediatek: add support for MT8167

Quoted 19 lines · Fabien Parent

Add support for the IOMMU on MT8167

---

V2:
* removed if based on m4u_plat, and using instead the new has_legacy_ivrp_paddr member that was introduced in patch 2.

---
 drivers/iommu/mtk_iommu.c | 9 +++++++++
 drivers/iommu/mtk_iommu.h | 1 +
 2 files changed, 10 insertions(+)
drivers/iommu/mtk_iommu.c +0 -0
index 78cb14ab7dd0..25b7ad1647ba 100644

drivers/iommu/mtk_iommu.c static const struct mtk_iommu_plat_data mt2712_data = { · line 790

Quoted 9 lines
drivers/iommu/mtk_iommu.c +6 -0
@@ -782,6 +782,14 @@ static const struct mtk_iommu_plat_data mt2712_data = {
 	.larbid_remap = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9},
 };
 
+static const struct mtk_iommu_plat_data mt8167_data = {
+	.m4u_plat     = M4U_MT8167,
+	.has_4gb_mode = true,
+	.has_legacy_ivrp_paddr = true;
+	.reset_axi    = true,
+	.larbid_remap = {0, 1, 2, 3, 4, 5}, /* Linear mapping. */

Normally we put the file include/dt-bindings/memory/mt8167-larb-port.h into the first binding patch.

If we have that file, we will know there is only 3 larbs in mt8167. thus, here should be: larbid_remap = {0, 1, 2}

Other than this,

Quoted 25 lines
drivers/iommu/mtk_iommu.c +3 -0
+};
+
 static const struct mtk_iommu_plat_data mt8173_data = {
 	.m4u_plat     = M4U_MT8173,
 	.has_4gb_mode = true,
@@ -799,6 +807,7 @@ static const struct mtk_iommu_plat_data mt8183_data = {
 
 static const struct of_device_id mtk_iommu_of_ids[] = {
 	{ .compatible = "mediatek,mt2712-m4u", .data = &mt2712_data},
+	{ .compatible = "mediatek,mt8167-m4u", .data = &mt8167_data},
 	{ .compatible = "mediatek,mt8173-m4u", .data = &mt8173_data},
 	{ .compatible = "mediatek,mt8183-m4u", .data = &mt8183_data},
 	{}
drivers/iommu/mtk_iommu.h +1 -0
index 4696ba027a71..72f874ec9e9c 100644
@@ -30,6 +30,7 @@ struct mtk_iommu_suspend_reg {
 enum mtk_iommu_plat {
 	M4U_MT2701,
 	M4U_MT2712,
+	M4U_MT8167,
 	M4U_MT8173,
 	M4U_MT8183,
 };