Skip to contentSkip to conversation

dt-bindings: iommu: mediatek: add binding documentation for MT8365 SoC

PATCH In review Fabien Parent 5 participants 10 messages May 30, 2022 – Jul 20, 2022

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/3 dt-bindings: iommu: mediatek: add binding documentation for MT8365 SoC

Add IOMMU binding documentation for the MT8365 SoC.

---
 .../bindings/iommu/mediatek,iommu.yaml        |  2 +
 include/dt-bindings/memory/mt8365-larb-port.h | 96 +++++++++++++++++++
 2 files changed, 98 insertions(+)
 create mode 100644 include/dt-bindings/memory/mt8365-larb-port.h
Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml +2 -0
index 97e8c471a5e8..5ba688365da5 100644
@@ -77,6 +77,7 @@ properties:
           - mediatek,mt8173-m4u  # generation two
           - mediatek,mt8183-m4u  # generation two
           - mediatek,mt8192-m4u  # generation two
+          - mediatek,mt8365-m4u  # generation two
 
       - description: mt7623 generation one
         items:
@@ -120,6 +121,7 @@ properties:
       dt-binding/memory/mt8173-larb-port.h for mt8173,
       dt-binding/memory/mt8183-larb-port.h for mt8183,
       dt-binding/memory/mt8192-larb-port.h for mt8192.
+      dt-binding/memory/mt8365-larb-port.h for mt8365.
 
   power-domains:
     maxItems: 1
include/dt-bindings/memory/mt8365-larb-port.h new file +96 -0

96 lines not on this page · raw message

Signature · 1 line
2.36.1
#1 lore raw

PATCH 2/3 iommu: mtk_iommu: add support for 6-bit encoded port IDs

Until now the port ID was always encoded as a 5-bit data. On MT8365, the port ID is encoded as a 6-bit data. This requires to rework the macros F_MMU_INT_ID_LARB_ID, and F_MMU_INT_ID_PORT_ID in order to support 5-bit and 6-bit encoded port IDs.

---
 drivers/iommu/mtk_iommu.c | 17 +++++++++++++----
 drivers/iommu/mtk_iommu.h |  1 +
 2 files changed, 14 insertions(+), 4 deletions(-)
drivers/iommu/mtk_iommu.c +13 -4
index 6fd75a60abd6..b692347d8d56 100644
@@ -103,8 +103,10 @@
 #define REG_MMU1_INT_ID				0x154
 #define F_MMU_INT_ID_COMM_ID(a)			(((a) >> 9) & 0x7)
 #define F_MMU_INT_ID_SUB_COMM_ID(a)		(((a) >> 7) & 0x3)
-#define F_MMU_INT_ID_LARB_ID(a)			(((a) >> 7) & 0x7)
-#define F_MMU_INT_ID_PORT_ID(a)			(((a) >> 2) & 0x1f)
+#define F_MMU_INT_ID_LARB_ID(a, port_width)	\
+				((a) >> ((port_width + 2) & 0x7))
+#define F_MMU_INT_ID_PORT_ID(a, port_width)	\
+				(((a) >> 2) & GENMASK(port_width - 1, 0))
 
 #define MTK_PROTECT_PA_ALIGN			256
 
@@ -291,12 +293,13 @@ static irqreturn_t mtk_iommu_isr(int irq, void *dev_id)
 		fault_pa |= (u64)pa34_32 << 32;
 	}
 
-	fault_port = F_MMU_INT_ID_PORT_ID(regval);
+	fault_port = F_MMU_INT_ID_PORT_ID(regval, data->plat_data->port_width);
 	if (MTK_IOMMU_HAS_FLAG(data->plat_data, HAS_SUB_COMM)) {
 		fault_larb = F_MMU_INT_ID_COMM_ID(regval);
 		sub_comm = F_MMU_INT_ID_SUB_COMM_ID(regval);
 	} else {
-		fault_larb = F_MMU_INT_ID_LARB_ID(regval);
+		fault_larb = F_MMU_INT_ID_LARB_ID(regval,
+						  data->plat_data->port_width);
 	}
 	fault_larb = data->plat_data->larbid_remap[fault_larb][sub_comm];
 
@@ -1034,6 +1037,7 @@ static const struct mtk_iommu_plat_data mt2712_data = {
 	.iova_region  = single_domain,
 	.iova_region_nr = ARRAY_SIZE(single_domain),
 	.larbid_remap = {{0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}},
+	.port_width   = 5,
 };
 
 static const struct mtk_iommu_plat_data mt6779_data = {
@@ -1043,6 +1047,7 @@ static const struct mtk_iommu_plat_data mt6779_data = {
 	.iova_region   = single_domain,
 	.iova_region_nr = ARRAY_SIZE(single_domain),
 	.larbid_remap  = {{0}, {1}, {2}, {3}, {5}, {7, 8}, {10}, {9}},
+	.port_width    = 5,
 };
 
 static const struct mtk_iommu_plat_data mt8167_data = {
@@ -1052,6 +1057,7 @@ static const struct mtk_iommu_plat_data mt8167_data = {
 	.iova_region  = single_domain,
 	.iova_region_nr = ARRAY_SIZE(single_domain),
 	.larbid_remap = {{0}, {1}, {2}}, /* Linear mapping. */
+	.port_width   = 5,
 };
 
 static const struct mtk_iommu_plat_data mt8173_data = {
@@ -1062,6 +1068,7 @@ static const struct mtk_iommu_plat_data mt8173_data = {
 	.iova_region  = single_domain,
 	.iova_region_nr = ARRAY_SIZE(single_domain),
 	.larbid_remap = {{0}, {1}, {2}, {3}, {4}, {5}}, /* Linear mapping. */
+	.port_width   = 5,
 };
 
 static const struct mtk_iommu_plat_data mt8183_data = {
@@ -1071,6 +1078,7 @@ static const struct mtk_iommu_plat_data mt8183_data = {
 	.iova_region  = single_domain,
 	.iova_region_nr = ARRAY_SIZE(single_domain),
 	.larbid_remap = {{0}, {4}, {5}, {6}, {7}, {2}, {3}, {1}},
+	.port_width   = 5,
 };
 
 static const struct mtk_iommu_plat_data mt8192_data = {
@@ -1082,6 +1090,7 @@ static const struct mtk_iommu_plat_data mt8192_data = {
 	.iova_region_nr = ARRAY_SIZE(mt8192_multi_dom),
 	.larbid_remap   = {{0}, {1}, {4, 5}, {7}, {2}, {9, 11, 19, 20},
 			   {0, 14, 16}, {0, 13, 18, 17}},
+	.port_width     = 5,
 };
 
 static const struct of_device_id mtk_iommu_of_ids[] = {
drivers/iommu/mtk_iommu.h +1 -0
index b742432220c5..84cecaf6d61c 100644
@@ -54,6 +54,7 @@ struct mtk_iommu_plat_data {
 	enum mtk_iommu_plat m4u_plat;
 	u32                 flags;
 	u32                 inv_sel_reg;
+	u8                  port_width;
 
 	unsigned int				iova_region_nr;
 	const struct mtk_iommu_iova_region	*iova_region;
Signature · 6 lines
2.36.1

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
maintainer
#2 lore raw

Re: [PATCH 2/3] iommu: mtk_iommu: add support for 6-bit encoded port IDs

Hi Fabien,

Thanks for very much for this patch.

Retitle to iommu/mediatek: Xxx

Quoted 28 lines · Fabien Parent

Until now the port ID was always encoded as a 5-bit data. On MT8365, the port ID is encoded as a 6-bit data. This requires to rework the macros F_MMU_INT_ID_LARB_ID, and F_MMU_INT_ID_PORT_ID in order to support 5-bit and 6-bit encoded port IDs.

---
 drivers/iommu/mtk_iommu.c | 17 +++++++++++++----
 drivers/iommu/mtk_iommu.h |  1 +
 2 files changed, 14 insertions(+), 4 deletions(-)
drivers/iommu/mtk_iommu.c +4 -2
index 6fd75a60abd6..b692347d8d56 100644
@@ -103,8 +103,10 @@
 #define REG_MMU1_INT_ID				0x154
 #define F_MMU_INT_ID_COMM_ID(a)			(((a) >> 9) &
 0x7)
 #define F_MMU_INT_ID_SUB_COMM_ID(a)		(((a) >> 7) & 0x3)
-#define F_MMU_INT_ID_LARB_ID(a)			(((a) >> 7) &
 0x7)
-#define F_MMU_INT_ID_PORT_ID(a)			(((a) >> 2) &
 0x1f)
+#define F_MMU_INT_ID_LARB_ID(a, port_width)	\
+				((a) >> ((port_width + 2) & 0x7))
+#define F_MMU_INT_ID_PORT_ID(a, port_width)	\
+				(((a) >> 2) & GENMASK(port_width - 1,
Quoted 1 line

0))

Add () for port_width.

Quoted 83 lines

#define MTK_PROTECT_PA_ALIGN 256

drivers/iommu/mtk_iommu.c +3 -2
@@ -291,12 +293,13 @@ static irqreturn_t mtk_iommu_isr(int irq, void
 *dev_id)
 		fault_pa |= (u64)pa34_32 << 32;
 	}
 
-	fault_port = F_MMU_INT_ID_PORT_ID(regval);
+	fault_port = F_MMU_INT_ID_PORT_ID(regval, data->plat_data-
 >port_width);
 	if (MTK_IOMMU_HAS_FLAG(data->plat_data, HAS_SUB_COMM)) {
 		fault_larb = F_MMU_INT_ID_COMM_ID(regval);
 		sub_comm = F_MMU_INT_ID_SUB_COMM_ID(regval);
 	} else {
-		fault_larb = F_MMU_INT_ID_LARB_ID(regval);
+		fault_larb = F_MMU_INT_ID_LARB_ID(regval,
+						  data->plat_data-
 >port_width);
drivers/iommu/mtk_iommu.c +0 -0
 	}
 	fault_larb = data->plat_data-
Quoted 1 line

larbid_remap[fault_larb][sub_comm];

drivers/iommu/mtk_iommu.c +1 -0
@@ -1034,6 +1037,7 @@ static const struct mtk_iommu_plat_data
 mt2712_data = {
 	.iova_region  = single_domain,
 	.iova_region_nr = ARRAY_SIZE(single_domain),
 	.larbid_remap = {{0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}},
+	.port_width   = 5,
 };
 

static const struct mtk_iommu_plat_data mt6779_data = {

drivers/iommu/mtk_iommu.c +1 -0
@@ -1043,6 +1047,7 @@ static const struct mtk_iommu_plat_data
 mt6779_data = {
 	.iova_region   = single_domain,
 	.iova_region_nr = ARRAY_SIZE(single_domain),
 	.larbid_remap  = {{0}, {1}, {2}, {3}, {5}, {7, 8}, {10}, {9}},
+	.port_width    = 5,
 };
 

static const struct mtk_iommu_plat_data mt8167_data = {

drivers/iommu/mtk_iommu.c +1 -0
@@ -1052,6 +1057,7 @@ static const struct mtk_iommu_plat_data
 mt8167_data = {
 	.iova_region  = single_domain,
 	.iova_region_nr = ARRAY_SIZE(single_domain),
 	.larbid_remap = {{0}, {1}, {2}}, /* Linear mapping. */
+	.port_width   = 5,
 };
 

static const struct mtk_iommu_plat_data mt8173_data = {

drivers/iommu/mtk_iommu.c +0 -0
@@ -1062,6 +1068,7 @@ static const struct mtk_iommu_plat_data
 mt8173_data = {
 	.iova_region  = single_domain,
 	.iova_region_nr = ARRAY_SIZE(single_domain),
 	.larbid_remap = {{0}, {1}, {2}, {3}, {4}, {5}}, /* Linear

mapping. */

drivers/iommu/mtk_iommu.c +2 -0
+	.port_width   = 5,
 };
 
 static const struct mtk_iommu_plat_data mt8183_data = {
@@ -1071,6 +1078,7 @@ static const struct mtk_iommu_plat_data
 mt8183_data = {
 	.iova_region  = single_domain,
 	.iova_region_nr = ARRAY_SIZE(single_domain),
 	.larbid_remap = {{0}, {4}, {5}, {6}, {7}, {2}, {3}, {1}},
+	.port_width   = 5,
 };
 

static const struct mtk_iommu_plat_data mt8192_data = {

drivers/iommu/mtk_iommu.c +1 -0
@@ -1082,6 +1090,7 @@ static const struct mtk_iommu_plat_data
 mt8192_data = {
 	.iova_region_nr = ARRAY_SIZE(mt8192_multi_dom),
 	.larbid_remap   = {{0}, {1}, {4, 5}, {7}, {2}, {9, 11, 19, 20},
 			   {0, 14, 16}, {0, 13, 18, 17}},
+	.port_width     = 5,
 };
 

static const struct of_device_id mtk_iommu_of_ids[] = {

drivers/iommu/mtk_iommu.h +0 -0
index b742432220c5..84cecaf6d61c 100644

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

Quoted 4 lines
drivers/iommu/mtk_iommu.h +1 -0
@@ -54,6 +54,7 @@ struct mtk_iommu_plat_data {
 	enum mtk_iommu_plat m4u_plat;
 	u32                 flags;
 	u32                 inv_sel_reg;
+	u8                  port_width;

Please help rename to int_id_port_width for more detailed from the register name (REG_MMU0_INT_ID).

Quoted 6 lines
drivers/iommu/mtk_iommu.h +0 -0
 	unsigned int				iova_region_nr;
 	const struct mtk_iommu_iova_region	*iova_region;
Signature · 1 line
2.36.1
#3 lore raw

PATCH 3/3 iommu: mtk_iommu: add support for MT8365 SoC

In reply to Fabien Parent

Add IOMMU support for MT8365 SoC.

---
 drivers/iommu/mtk_iommu.c | 11 +++++++++++
 drivers/iommu/mtk_iommu.h |  1 +
 2 files changed, 12 insertions(+)
drivers/iommu/mtk_iommu.c +11 -0
index b692347d8d56..039b8f9d5022 100644
@@ -1093,6 +1093,16 @@ static const struct mtk_iommu_plat_data mt8192_data = {
 	.port_width     = 5,
 };
 
+static const struct mtk_iommu_plat_data mt8365_data = {
+	.m4u_plat     = M4U_MT8365,
+	.flags	      = RESET_AXI,
+	.inv_sel_reg  = REG_MMU_INV_SEL_GEN1,
+	.iova_region  = single_domain,
+	.iova_region_nr = ARRAY_SIZE(single_domain),
+	.larbid_remap = {{0}, {1}, {2}, {3}, {4}, {5}}, /* Linear mapping. */
+	.port_width   = 6,
+};
+
 static const struct of_device_id mtk_iommu_of_ids[] = {
 	{ .compatible = "mediatek,mt2712-m4u", .data = &mt2712_data},
 	{ .compatible = "mediatek,mt6779-m4u", .data = &mt6779_data},
@@ -1100,6 +1110,7 @@ static const struct of_device_id mtk_iommu_of_ids[] = {
 	{ .compatible = "mediatek,mt8173-m4u", .data = &mt8173_data},
 	{ .compatible = "mediatek,mt8183-m4u", .data = &mt8183_data},
 	{ .compatible = "mediatek,mt8192-m4u", .data = &mt8192_data},
+	{ .compatible = "mediatek,mt8365-m4u", .data = &mt8365_data},
 	{}
 };
 
drivers/iommu/mtk_iommu.h +1 -0
index 84cecaf6d61c..cb174fa6f2ab 100644
@@ -46,6 +46,7 @@ enum mtk_iommu_plat {
 	M4U_MT8173,
 	M4U_MT8183,
 	M4U_MT8192,
+	M4U_MT8365,
 };
 
 struct mtk_iommu_iova_region;
Signature · 6 lines
2.36.1

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Reviewed-by Tested-by on v1 3/3
#4 lore raw

Re: [PATCH 3/3] iommu: mtk_iommu: add support for MT8365 SoC

Hi Fabien,

Thank you for the fix.

The kernel would panic if you boot with this patchset because bank_nr and bank_enable are not set in mt8365_data.

Please add this change:

drivers/iommu/mtk_iommu.c +2 -0
@@ -1538,6 +1538,8 @@ static const struct mtk_iommu_plat_data mt8365_data = {
 	.m4u_plat     = M4U_MT8365,
 	.flags	      = RESET_AXI,
 	.inv_sel_reg  = REG_MMU_INV_SEL_GEN1,
+	.banks_num    = 1,
+	.banks_enable = {true},
 	.iova_region  = single_domain,
 	.iova_region_nr = ARRAY_SIZE(single_domain),
 	.larbid_remap = {{0}, {1}, {2}, {3}, {4}, {5}}, /* Linear mapping. */

With this change, please add my:

Regards,
Amjad

maintainer
#5 lore raw
In reply to Fabien Parent
Quoted 9 lines · Fabien Parent

Add IOMMU binding documentation for the MT8365 SoC.

---
 .../bindings/iommu/mediatek,iommu.yaml        |  2 +
 include/dt-bindings/memory/mt8365-larb-port.h | 96
+++++++++++++++++++
 2 files changed, 98 insertions(+)
 create mode 100644 include/dt-bindings/memory/mt8365-larb-port.h

[snip...]

include/dt-bindings/memory/mt8365-larb-port.h line 18

Quoted 13 lines
include/dt-bindings/memory/mt8365-larb-port.h new file +13 -0
+#ifndef _DT_BINDINGS_MEMORY_MT8365_LARB_PORT_H_
+#define _DT_BINDINGS_MEMORY_MT8365_LARB_PORT_H_
+
+#include <dt-bindings/memory/mtk-memory-port.h>
+
+#define M4U_LARB0_ID			0
+#define M4U_LARB1_ID			1
+#define M4U_LARB2_ID			2
+#define M4U_LARB3_ID			3
+#define M4U_LARB4_ID			4
+#define M4U_LARB5_ID			5
+#define M4U_LARB6_ID			6
+#define M4U_LARB7_ID			7

Remove these. they are no used, right?

Quoted 4 lines
include/dt-bindings/memory/mt8365-larb-port.h new file +4 -0
+
+/* larb0 */
+#define M4U_PORT_DISP_OVL0		MTK_M4U_ID(0, 0)
+#define M4U_PORT_DISP_OVL0_2L	MTK_M4U_ID(0, 1)

[...]

include/dt-bindings/memory/mt8365-larb-port.h line 94

Quoted 4 lines
include/dt-bindings/memory/mt8365-larb-port.h new file +3 -0
+/* larb4 */
+#define M4U_PORT_APU_READ		MTK_M4U_ID(0, 0)
+#define M4U_PORT_APU_WRITE		MTK_M4U_ID(0, 1)

Please remove these two APU definitions. currently these are not supported.

Thanks.

Quoted 2 lines
(quoted diff) +2 -0
+
+#endif
#6 lore raw
Quoted 13 lines · Yong Wu
Quoted 9 lines · Fabien Parent

Add IOMMU binding documentation for the MT8365 SoC.

---
  .../bindings/iommu/mediatek,iommu.yaml        |  2 +
  include/dt-bindings/memory/mt8365-larb-port.h | 96
+++++++++++++++++++
  2 files changed, 98 insertions(+)

create mode 100644 include/dt-bindings/memory/mt8365-larb-port.h

[snip...]

Quoted 15 lines

include/dt-bindings/memory/mt8365-larb-port.h line 18

Quoted 13 lines
include/dt-bindings/memory/mt8365-larb-port.h new file +13 -0
+#ifndef _DT_BINDINGS_MEMORY_MT8365_LARB_PORT_H_
+#define _DT_BINDINGS_MEMORY_MT8365_LARB_PORT_H_
+
+#include <dt-bindings/memory/mtk-memory-port.h>
+
+#define M4U_LARB0_ID			0
+#define M4U_LARB1_ID			1
+#define M4U_LARB2_ID			2
+#define M4U_LARB3_ID			3
+#define M4U_LARB4_ID			4
+#define M4U_LARB5_ID			5
+#define M4U_LARB6_ID			6
+#define M4U_LARB7_ID			7

Remove these. they are no used, right?

AIOT and customers are using the modules and their related IOMMU modules.
DISP0, VENC, VDEC, ISP (CAMSYS), and APU (as far as I know, which should be VP6?) were all supported.

Quoted 9 lines
Quoted 5 lines
include/dt-bindings/memory/mt8365-larb-port.h new file +4 -0
+
+/* larb0 */
+#define M4U_PORT_DISP_OVL0		MTK_M4U_ID(0, 0)
+#define M4U_PORT_DISP_OVL0_2L	MTK_M4U_ID(0, 1)

[...]

Quoted 1 line
Quoted 6 lines

include/dt-bindings/memory/mt8365-larb-port.h line 94

Quoted 3 lines
include/dt-bindings/memory/mt8365-larb-port.h new file +3 -0
+/* larb4 */
+#define M4U_PORT_APU_READ		MTK_M4U_ID(0, 0)
+#define M4U_PORT_APU_WRITE		MTK_M4U_ID(0, 1)

Please remove these two APU definitions. currently these are not supported.

Kidd, please help to check if APU use these definitions with Yong. However, I think these are all available to the customers.

Thanks
Macpaul Lin

#7 lore raw
Quoted 30 lines · Macpaul Lin
Quoted 13 lines · Yong Wu
Quoted 9 lines · Fabien Parent

Add IOMMU binding documentation for the MT8365 SoC.

---
  .../bindings/iommu/mediatek,iommu.yaml        |  2 + include/dt-bindings/memory/mt8365-larb-port.h | 96
+++++++++++++++++++

  2 files changed, 98 insertions(+)

  create mode 100644 include/dt-bindings/memory/mt8365-larb-port.h

[snip...]

Quoted 15 lines

include/dt-bindings/memory/mt8365-larb-port.h line 18

Quoted 13 lines
include/dt-bindings/memory/mt8365-larb-port.h new file +13 -0
+#ifndef _DT_BINDINGS_MEMORY_MT8365_LARB_PORT_H_
+#define _DT_BINDINGS_MEMORY_MT8365_LARB_PORT_H_
+
+#include <dt-bindings/memory/mtk-memory-port.h>
+
+#define M4U_LARB0_ID            0
+#define M4U_LARB1_ID            1
+#define M4U_LARB2_ID            2
+#define M4U_LARB3_ID            3
+#define M4U_LARB4_ID            4
+#define M4U_LARB5_ID            5
+#define M4U_LARB6_ID            6
+#define M4U_LARB7_ID            7

Remove these. they are no used, right?

Quoted 2 lines

AIOT and customers are using the modules and their related IOMMU modules.
DISP0, VENC, VDEC, ISP (CAMSYS), and APU (as far as I know, which should be VP6?) were all supported.

Dear Yong,
How about to replace the following definitions?

For example, replace
#define M4U_PORT_DISP_OVL0 MTK_M4U_ID(0, 0)
to
#define M4U_PORT_DISP_OVL0 MTK_M4U_ID(M4U_LARB0_ID , 0)

Quoted 16 lines
Quoted 9 lines
Quoted 5 lines
include/dt-bindings/memory/mt8365-larb-port.h new file +4 -0
+
+/* larb0 */
+#define M4U_PORT_DISP_OVL0        MTK_M4U_ID(0, 0)
+#define M4U_PORT_DISP_OVL0_2L    MTK_M4U_ID(0, 1)

[...]

Quoted 1 line
Quoted 6 lines

include/dt-bindings/memory/mt8365-larb-port.h line 94

Quoted 3 lines
include/dt-bindings/memory/mt8365-larb-port.h new file +3 -0
+/* larb4 */
+#define M4U_PORT_APU_READ        MTK_M4U_ID(0, 0)
+#define M4U_PORT_APU_WRITE        MTK_M4U_ID(0, 1)

Please remove these two APU definitions. currently these are not supported.

Quoted 5 lines

Kidd, please help to check if APU use these definitions with Yong. However, I think these are all available to the customers.

Thanks
Macpaul Lin

Thanks
Macpaul Lin

maintainer
#8 lore raw
Quoted 38 lines · Macpaul Lin
Quoted 31 lines · Macpaul Lin
Quoted 14 lines · Yong Wu
Quoted 10 lines · Fabien Parent

Add IOMMU binding documentation for the MT8365 SoC.

---
  .../bindings/iommu/mediatek,iommu.yaml        |  2 +
  include/dt-bindings/memory/mt8365-larb-port.h | 96
+++++++++++++++++++
  2 files changed, 98 insertions(+)

create mode 100644 include/dt-bindings/memory/mt8365-larb-
port.h

[snip...]

Quoted 15 lines

include/dt-bindings/memory/mt8365-larb-port.h line 18

Quoted 13 lines
include/dt-bindings/memory/mt8365-larb-port.h new file +13 -0
+#ifndef _DT_BINDINGS_MEMORY_MT8365_LARB_PORT_H_
+#define _DT_BINDINGS_MEMORY_MT8365_LARB_PORT_H_
+
+#include <dt-bindings/memory/mtk-memory-port.h>
+
+#define M4U_LARB0_ID            0
+#define M4U_LARB1_ID            1
+#define M4U_LARB2_ID            2
+#define M4U_LARB3_ID            3
+#define M4U_LARB4_ID            4
+#define M4U_LARB5_ID            5
+#define M4U_LARB6_ID            6
+#define M4U_LARB7_ID            7

Remove these. they are no used, right?

Quoted 5 lines

AIOT and customers are using the modules and their related IOMMU modules.
DISP0, VENC, VDEC, ISP (CAMSYS), and APU (as far as I know, which should
be VP6?) were all supported.

Quoted 7 lines

Dear Yong,
How about to replace the following definitions?

For example, replace
#define M4U_PORT_DISP_OVL0 MTK_M4U_ID(0, 0)
to
#define M4U_PORT_DISP_OVL0 MTK_M4U_ID(M4U_LARB0_ID , 0)

Yes. It is ok.

Quoted 25 lines
Quoted 17 lines
Quoted 10 lines
Quoted 6 lines
include/dt-bindings/memory/mt8365-larb-port.h new file +4 -0
+
+/* larb0 */
+#define M4U_PORT_DISP_OVL0        MTK_M4U_ID(0, 0)
+#define M4U_PORT_DISP_OVL0_2L    MTK_M4U_ID(0, 1)

[...]

Quoted 1 line
Quoted 6 lines

include/dt-bindings/memory/mt8365-larb-port.h line 94

Quoted 3 lines
include/dt-bindings/memory/mt8365-larb-port.h new file +3 -0
+/* larb4 */
+#define M4U_PORT_APU_READ        MTK_M4U_ID(0, 0)
+#define M4U_PORT_APU_WRITE        MTK_M4U_ID(0, 1)

Please remove these two APU definitions. currently these are not supported.

Quoted 5 lines

Kidd, please help to check if APU use these definitions with Yong. However, I think these are all available to the customers.

Thanks
Macpaul Lin

Thanks
Macpaul Lin

maintainer
#9 lore raw
In reply to Fabien Parent
Quoted 35 lines · Fabien Parent

Add IOMMU binding documentation for the MT8365 SoC.

---
 .../bindings/iommu/mediatek,iommu.yaml        |  2 +
 include/dt-bindings/memory/mt8365-larb-port.h | 96 +++++++++++++++++++
 2 files changed, 98 insertions(+)
 create mode 100644 include/dt-bindings/memory/mt8365-larb-port.h
Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml +2 -0
index 97e8c471a5e8..5ba688365da5 100644
@@ -77,6 +77,7 @@ properties:
           - mediatek,mt8173-m4u  # generation two
           - mediatek,mt8183-m4u  # generation two
           - mediatek,mt8192-m4u  # generation two
+          - mediatek,mt8365-m4u  # generation two
 
       - description: mt7623 generation one
         items:
@@ -120,6 +121,7 @@ properties:
       dt-binding/memory/mt8173-larb-port.h for mt8173,
       dt-binding/memory/mt8183-larb-port.h for mt8183,
       dt-binding/memory/mt8192-larb-port.h for mt8192.
+      dt-binding/memory/mt8365-larb-port.h for mt8365.
 
   power-domains:
     maxItems: 1
include/dt-bindings/memory/mt8365-larb-port.h new file +0 -0
new file mode 100644
index 000000000000..e7d5637aa38e

include/dt-bindings/memory/mt8365-larb-port.h line 1

Quoted 1 line
include/dt-bindings/memory/mt8365-larb-port.h new file +1 -0
@@ -0,0 +1,96 @@
+/* SPDX-License-Identifier: GPL-2.0 */

Dual license please.

Rob
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu