dt-bindings: iommu: Add binding for MediaTek MT8167 IOMMU
Subsystems (5)
PATCH v3 1/3 dt-bindings: iommu: Add binding for MediaTek MT8167 IOMMU
This commit adds IOMMU binding documentation and larb port definitions for the MT8167 SoC.
---
V3: Added mt8167-larb-port.h file for iommu port definitions
V2: no change
--- .../bindings/iommu/mediatek,iommu.txt | 1 + include/dt-bindings/memory/mt8167-larb-port.h | 49 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 include/dt-bindings/memory/mt8167-larb-port.h
Documentation/devicetree/bindings/iommu/mediatek,iommu.txt +1 -0
@@ -61,6 +61,7 @@ Required properties: "mediatek,mt6779-m4u" for mt6779 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.
include/dt-bindings/memory/mt8167-larb-port.h new file +49 -0
49 lines not on this page · raw message
Signature · 7 lines
2.28.0 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v3 2/3 iommu/mediatek: add flag for legacy ivrp paddr
Add a new flag in order to select which IVRP_PADDR format is used by an SoC.
---
v3: set LEGACY_IVRP_PADDR as a flag instead of platform data
v2: new patch
--- drivers/iommu/mtk_iommu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/iommu/mtk_iommu.c +4 -2
@@ -116,6 +116,7 @@#define OUT_ORDER_WR_EN BIT(4)#define HAS_SUB_COMM BIT(5)#define WR_THROT_EN BIT(6) +#define HAS_LEGACY_IVRP_PADDR BIT(7)#define MTK_IOMMU_HAS_FLAG (pdata, _x) \ ((((pdata)->flags) & (_x)) == (_x))
@@ -582,7 +583,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 (MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_LEGACY_IVRP_PADDR )) regval = (data->protect_base >>1 ) | (data->enable_4GB <<31 );else regval = lower_32_bits(data->protect_base) |
@@ -818,7 +819,8 @@ static const struct mtk_iommu_plat_data mt6779_data = {static const struct mtk_iommu_plat_data mt8173_data = { .m4u_plat =M4U_MT8173 , - .flags =HAS_4GB_MODE |HAS_BCLK |RESET_AXI , + .flags =HAS_4GB_MODE |HAS_BCLK |RESET_AXI | +HAS_LEGACY_IVRP_PADDR , .inv_sel_reg =REG_MMU_INV_SEL_GEN1 , .larbid_remap = {{0 }, {1 }, {2 }, {3 }, {4 }, {5 }},/* Linear mapping. */ };
Signature · 7 lines
2.28.0 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
Re: [PATCH v3 2/3] iommu/mediatek: add flag for legacy ivrp paddr
Quoted 4 lines · Fabien Parent
Add a new flag in order to select which
IVRP_PADDRformat is used by an SoC.Signed-off-by Fabien Parent <[email protected]>
Quoted 31 lines
---
v3: set
LEGACY_IVRP_PADDRas a flag instead of platform data
v2: new patch--- drivers/iommu/mtk_iommu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/iommu/mtk_iommu.c +2
-1@@ -116,6 +116,7 @@#define OUT_ORDER_WR_EN BIT(4)#define HAS_SUB_COMM BIT(5)#define WR_THROT_EN BIT(6) +#define HAS_LEGACY_IVRP_PADDR BIT(7)#define MTK_IOMMU_HAS_FLAG (pdata, _x) \ ((((pdata)->flags) & (_x)) == (_x))@@ -582,7 +583,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 (MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_LEGACY_IVRP_PADDR )) regval = (data->protect_base >>1 ) | (data->enable_4GB <<31 );else regval = lower_32_bits(data->protect_base) |
drivers/iommu/mtk_iommu.c static const struct mtk_iommu_plat_data mt6779_data = { · line 826
Quoted 9 lines
drivers/iommu/mtk_iommu.c +2
-1@@ -818,7 +819,8 @@ static const struct mtk_iommu_plat_data mt6779_data = {static const struct mtk_iommu_plat_data mt8173_data = { .m4u_plat =M4U_MT8173 , - .flags =HAS_4GB_MODE |HAS_BCLK |RESET_AXI , + .flags =HAS_4GB_MODE |HAS_BCLK |RESET_AXI | +HAS_LEGACY_IVRP_PADDR , .inv_sel_reg =REG_MMU_INV_SEL_GEN1 , .larbid_remap = {{0 }, {1 }, {2 }, {3 }, {4 }, {5 }},/* Linear mapping. */ };
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v3 3/3 iommu/mediatek: add support for MT8167
In reply to Fabien ParentAdd support for the IOMMU on MT8167
---
V3:
* use LEGACY_IVRP_PADDR flag instead of using a platform data member
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 | 8 ++++++++ drivers/iommu/mtk_iommu.h | 1 + 2 files changed, 9 insertions(+)
drivers/iommu/mtk_iommu.c +8 -0
@@ -817,6 +817,13 @@ static const struct mtk_iommu_plat_data mt6779_data = { .larbid_remap = {{0}, {1}, {2}, {3}, {5}, {7, 8}, {10}, {9}}, }; +static const struct mtk_iommu_plat_data mt8167_data = { + .m4u_plat = M4U_MT8167, + .flags = HAS_4GB_MODE | RESET_AXI | HAS_LEGACY_IVRP_PADDR, + .inv_sel_reg = REG_MMU_INV_SEL_GEN1, + .larbid_remap = {{0}, {1}, {2}}, /* Linear mapping. */ +}; + static const struct mtk_iommu_plat_data mt8173_data = { .m4u_plat = M4U_MT8173, .flags = HAS_4GB_MODE | HAS_BCLK | RESET_AXI |
@@ -835,6 +842,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,mt6779-m4u" , .data = &mt6779_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
@@ -39,6 +39,7 @@ enum mtk_iommu_plat {M4U_MT2701 ,M4U_MT2712 ,M4U_MT6779 , +M4U_MT8167 ,M4U_MT8173 , M4U_MT8183, };
Signature · 7 lines
2.28.0 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
Re: [PATCH v3 3/3] iommu/mediatek: add support for MT8167
Quoted 8 lines · Fabien Parent
Add support for the IOMMU on MT8167
Signed-off-by Fabien Parent <[email protected]>---
V3:
* useLEGACY_IVRP_PADDRflag instead of using a platform data member
Forgot to mention a change here: .larbid_remap has been fixed to only contain the number of larb present on MT8167
Quoted 48 lines
V2:
* removed if based onm4u_plat, and using instead the newhas_legacy_ivrp_paddrmember that was introduced in patch 2.--- drivers/iommu/mtk_iommu.c | 8 ++++++++ drivers/iommu/mtk_iommu.h | 1 + 2 files changed, 9 insertions(+)drivers/iommu/mtk_iommu.c +8
-0@@ -817,6 +817,13 @@ static const struct mtk_iommu_plat_data mt6779_data = { .larbid_remap = {{0}, {1}, {2}, {3}, {5}, {7, 8}, {10}, {9}}, }; +static const struct mtk_iommu_plat_data mt8167_data = { + .m4u_plat = M4U_MT8167, + .flags = HAS_4GB_MODE | RESET_AXI | HAS_LEGACY_IVRP_PADDR, + .inv_sel_reg = REG_MMU_INV_SEL_GEN1, + .larbid_remap = {{0}, {1}, {2}}, /* Linear mapping. */ +}; + static const struct mtk_iommu_plat_data mt8173_data = { .m4u_plat = M4U_MT8173, .flags = HAS_4GB_MODE | HAS_BCLK | RESET_AXI |@@ -835,6 +842,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,mt6779-m4u" , .data = &mt6779_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
-1@@ -39,6 +39,7 @@ enum mtk_iommu_plat {M4U_MT2701 ,M4U_MT2712 ,M4U_MT6779 , +M4U_MT8167 ,M4U_MT8173 , M4U_MT8183, }; --
Quoted 2 lines
2.28.0
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Yong Wu
maintainerRe: [PATCH v3 3/3] iommu/mediatek: add support for MT8167
In reply to Fabien ParentQuoted 21 lines · Fabien Parent
Add support for the IOMMU on MT8167
Signed-off-by Fabien Parent <[email protected]>---
V3:
* useLEGACY_IVRP_PADDRflag instead of using a platform data member
V2:
* removed if based onm4u_plat, and using instead the newhas_legacy_ivrp_paddrmember that was introduced in patch 2.--- drivers/iommu/mtk_iommu.c | 8 ++++++++ drivers/iommu/mtk_iommu.h | 1 + 2 files changed, 9 insertions(+)drivers/iommu/mtk_iommu.c +0
-0
drivers/iommu/mtk_iommu.c static const struct mtk_iommu_plat_data mt6779_data = { · line 822
Quoted 6 lines
drivers/iommu/mtk_iommu.c +3
-0@@ -817,6 +817,13 @@ static const struct mtk_iommu_plat_data mt6779_data = { .larbid_remap = {{0}, {1}, {2}, {3}, {5}, {7, 8}, {10}, {9}}, }; +static const struct mtk_iommu_plat_data mt8167_data = { + .m4u_plat = M4U_MT8167, + .flags = HAS_4GB_MODE | RESET_AXI | HAS_LEGACY_IVRP_PADDR,
The 4GB mode flow was improved at[1] which has just been applied.
If you add 4gb_mode flag but don't have "mt8167-infracfg", the probe may be failed.
[1]
https://lore.kernel.org/linux-iommu/[email protected]/T/#m613e9926735d07ad004fddbbcedaa50b5afacca1
Quoted 20 lines
drivers/iommu/mtk_iommu.c +5
-0+ .inv_sel_reg = REG_MMU_INV_SEL_GEN1, + .larbid_remap = {{0}, {1}, {2}}, /* Linear mapping. */ +}; +static const struct mtk_iommu_plat_data mt8173_data = { .m4u_plat =M4U_MT8173 , .flags = HAS_4GB_MODE | HAS_BCLK | RESET_AXI |@@ -835,6 +842,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,mt6779-m4u" , .data = &mt6779_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 +0
-0
drivers/iommu/mtk_iommu.h enum mtk_iommu_plat { · line 45
Quoted 7 lines
drivers/iommu/mtk_iommu.h +1
-0@@ -39,6 +39,7 @@ enum mtk_iommu_plat {M4U_MT2701 ,M4U_MT2712 ,M4U_MT6779 , +M4U_MT8167 ,M4U_MT8173 , M4U_MT8183, };
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Re: [PATCH v3 3/3] iommu/mediatek: add support for MT8167
Quoted 8 lines
drivers/iommu/mtk_iommu.c static const struct mtk_iommu_plat_data mt6779_data = { · line 822
Quoted 3 lines
drivers/iommu/mtk_iommu.c +3
-0+static const struct mtk_iommu_plat_data mt8167_data = { + .m4u_plat =M4U_MT8167 , + .flags =HAS_4GB_MODE |RESET_AXI |HAS_LEGACY_IVRP_PADDR ,The 4GB mode flow was improved at[1] which has just been applied.
If you add 4gb_mode flag but don't have "mt8167-infracfg", the probe may be failed.
Looking back at the datasheet I don't think HAS_4GB_MODE should have been enabled for MT8167 anyway. I just removed it and retested the patch. I will fix it in v4. Thanks
Yong Wu
maintainerQuoted 21 lines · Fabien Parent
This commit adds IOMMU binding documentation and larb port definitions for the MT8167 SoC.
Signed-off-by Fabien Parent <[email protected]>Acked-by Rob Herring <[email protected]>---
V3: Added
mt8167-larb-port.hfile for iommu port definitions
V2: no change--- .../bindings/iommu/mediatek,iommu.txt | 1 + include/dt-bindings/memory/mt8167-larb-port.h | 49 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 include/dt-bindings/memory/mt8167-larb-port.hDocumentation/devicetree/bindings/iommu/mediatek,iommu.txt +0
-0
Documentation/devicetree/bindings/iommu/mediatek,iommu.txt Required properties: · line 67
Quoted 7 lines
Documentation/devicetree/bindings/iommu/mediatek,iommu.txt +1
-0@@ -61,6 +61,7 @@ Required properties: "mediatek,mt6779-m4u" for mt6779 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.
Please also add this line in the iommu-cells property:
dt-bindings/memory/mt8167-larb-port.h for mt8167.
include/dt-bindings/memory/mt8167-larb-port.h line 4
Quoted 10 lines
include/dt-bindings/memory/mt8167-larb-port.h new file +4
-0@@ -0,0 +1,49 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2020 BayLibre, SAS +* Author: Fabien Parent <[email protected]>
If I'm not wrong, the first version was created by:
Honghui Zhang <[email protected]>
the original author should be kept.
Quoted 45 lines
include/dt-bindings/memory/mt8167-larb-port.h new file +45
-0+*/ +#ifndef __DTS_IOMMU_PORT_MT8167_H +#define __DTS_IOMMU_PORT_MT8167_H + +#define MTK_M4U_ID (larb, port) (((larb) << 5) | (port)) + +#define M4U_LARB0_ID 0 +#define M4U_LARB1_ID 1 +#define M4U_LARB2_ID 2 + +/* larb0 */ +#define M4U_PORT_DISP_OVL0 MTK_M4U_ID(M4U_LARB0_ID, 0) +#define M4U_PORT_DISP_RDMA0 MTK_M4U_ID(M4U_LARB0_ID, 1) +#define M4U_PORT_DISP_WDMA0 MTK_M4U_ID(M4U_LARB0_ID, 2) +#define M4U_PORT_DISP_RDMA1 MTK_M4U_ID(M4U_LARB0_ID, 3) +#define M4U_PORT_MDP_RDMA MTK_M4U_ID(M4U_LARB0_ID, 4) +#define M4U_PORT_MDP_WDMA MTK_M4U_ID(M4U_LARB0_ID, 5) +#define M4U_PORT_MDP_WROT MTK_M4U_ID(M4U_LARB0_ID, 6) +#define M4U_PORT_DISP_FAKE MTK_M4U_ID(M4U_LARB0_ID, 7) + +/* IMG larb1*/ +#define M4U_PORT_CAM_IMGO MTK_M4U_ID(M4U_LARB1_ID, 0) +#define M4U_PORT_CAM_IMG2O MTK_M4U_ID(M4U_LARB1_ID, 1) +#define M4U_PORT_CAM_LSCI MTK_M4U_ID(M4U_LARB1_ID, 2) +#define M4U_PORT_CAM_ESFKO MTK_M4U_ID(M4U_LARB1_ID, 3) +#define M4U_PORT_CAM_AAO MTK_M4U_ID(M4U_LARB1_ID, 4) +#define M4U_PORT_VENC_REC MTK_M4U_ID(M4U_LARB1_ID, 5) +#define M4U_PORT_VENC_BSDMA MTK_M4U_ID(M4U_LARB1_ID, 6) +#define M4U_PORT_VENC_RD_COMV MTK_M4U_ID(M4U_LARB1_ID, 7) +#define M4U_PORT_CAM_IMGI MTK_M4U_ID(M4U_LARB1_ID, 8) +#define M4U_PORT_VENC_CUR_LUMA MTK_M4U_ID(M4U_LARB1_ID, 9) +#define M4U_PORT_VENC_CUR_CHROMA MTK_M4U_ID(M4U_LARB1_ID, 10) +#define M4U_PORT_VENC_REF_LUMA MTK_M4U_ID(M4U_LARB1_ID, 11) +#define M4U_PORT_VENC_REF_CHROMA MTK_M4U_ID(M4U_LARB1_ID, 12) + +/* VDEC larb2*/ +#define M4U_PORT_HW_VDEC_MC_EXT MTK_M4U_ID(M4U_LARB2_ID, 0) +#define M4U_PORT_HW_VDEC_PP_EXT MTK_M4U_ID(M4U_LARB2_ID, 1) +#define M4U_PORT_HW_VDEC_VLD_EXT MTK_M4U_ID(M4U_LARB2_ID, 2) +#define M4U_PORT_HW_VDEC_AVC_MV_EXT MTK_M4U_ID(M4U_LARB2_ID, 3) +#define M4U_PORT_HW_VDEC_PRED_RD_EXT MTK_M4U_ID(M4U_LARB2_ID, 4) +#define M4U_PORT_HW_VDEC_PRED_WR_EXT MTK_M4U_ID(M4U_LARB2_ID, 5) +#define M4U_PORT_HW_VDEC_PPWRAP_EXT MTK_M4U_ID(M4U_LARB2_ID, 6) + +#endif