| Message ID | 20230602090227.7264-6-yong.wu@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | MT8188 IOMMU SUPPORT | expand |
On 02/06/2023 11:02, Yong Wu wrote: > MT8188 has 3 IOMMU, containing 2 MM IOMMUs, one is for vdo, the other > is for vpp. and 1 INFRA IOMMU. Reviewed-by: Alexandre Mergnat <amergnat@baylibre.com>
On Fri, Jun 2, 2023 at 5:04 PM Yong Wu <yong.wu@mediatek.com> wrote: > > From: "Chengci.Xu" <chengci.xu@mediatek.com> > > MT8188 has 3 IOMMU, containing 2 MM IOMMUs, one is for vdo, the other > is for vpp. and 1 INFRA IOMMU. > > Signed-off-by: Chengci.Xu <chengci.xu@mediatek.com> > Signed-off-by: Yong Wu <yong.wu@mediatek.com> > Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > --- > drivers/iommu/mtk_iommu.c | 49 +++++++++++++++++++++++++++++++++++++++ > 1 file changed, 49 insertions(+) > > diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c > index 9c89cf894a4d..5c66af0c45a8 100644 > --- a/drivers/iommu/mtk_iommu.c > +++ b/drivers/iommu/mtk_iommu.c > @@ -170,6 +170,7 @@ enum mtk_iommu_plat { > M4U_MT8173, > M4U_MT8183, > M4U_MT8186, > + M4U_MT8188, > M4U_MT8192, > M4U_MT8195, > M4U_MT8365, > @@ -1593,6 +1594,51 @@ static const struct mtk_iommu_plat_data mt8186_data_mm = { > .iova_region_larb_msk = mt8186_larb_region_msk, > }; > > +static const struct mtk_iommu_plat_data mt8188_data_infra = { > + .m4u_plat = M4U_MT8188, > + .flags = WR_THROT_EN | DCM_DISABLE | STD_AXI_MODE | PM_CLK_AO | > + MTK_IOMMU_TYPE_INFRA | IFA_IOMMU_PCIE_SUPPORT | > + PGTABLE_PA_35_EN | CFG_IFA_MASTER_IN_ATF, FWIW, CFG_IFA_MASTER_IN_ATF should not be tied to the compatible string, but set via a DT property. The IOMMU controls are secured by firmware. It is not a property intrinsically tied to the hardware. If on some other project there is no such security requirement and the IOMMU is opened up to non-secure world, and ATF not even having support for the SMC call, this becomes unusable and hard to rectify without introducing a new compatible string. ChenYu > + .inv_sel_reg = REG_MMU_INV_SEL_GEN2, > + .banks_num = 1, > + .banks_enable = {true}, > + .iova_region = single_domain, > + .iova_region_nr = ARRAY_SIZE(single_domain), > +}; > + > +static const struct mtk_iommu_plat_data mt8188_data_vdo = { > + .m4u_plat = M4U_MT8188, > + .flags = HAS_BCLK | HAS_SUB_COMM_3BITS | OUT_ORDER_WR_EN | > + WR_THROT_EN | IOVA_34_EN | SHARE_PGTABLE | > + PGTABLE_PA_35_EN | MTK_IOMMU_TYPE_MM, > + .hw_list = &m4ulist, > + .inv_sel_reg = REG_MMU_INV_SEL_GEN2, > + .banks_num = 1, > + .banks_enable = {true}, > + .iova_region = mt8192_multi_dom, > + .iova_region_nr = ARRAY_SIZE(mt8192_multi_dom), > + .larbid_remap = {{2}, {0}, {21}, {0}, {19}, {9, 10, > + 11 /* 11a */, 25 /* 11c */}, > + {13, 0, 29 /* 16b */, 30 /* 17b */, 0}, {5}}, > +}; > + > +static const struct mtk_iommu_plat_data mt8188_data_vpp = { > + .m4u_plat = M4U_MT8188, > + .flags = HAS_BCLK | HAS_SUB_COMM_3BITS | OUT_ORDER_WR_EN | > + WR_THROT_EN | IOVA_34_EN | SHARE_PGTABLE | > + PGTABLE_PA_35_EN | MTK_IOMMU_TYPE_MM, > + .hw_list = &m4ulist, > + .inv_sel_reg = REG_MMU_INV_SEL_GEN2, > + .banks_num = 1, > + .banks_enable = {true}, > + .iova_region = mt8192_multi_dom, > + .iova_region_nr = ARRAY_SIZE(mt8192_multi_dom), > + .larbid_remap = {{1}, {3}, {23}, {7}, {MTK_INVALID_LARBID}, > + {12, 15, 24 /* 11b */}, {14, MTK_INVALID_LARBID, > + 16 /* 16a */, 17 /* 17a */, MTK_INVALID_LARBID, > + 27, 28 /* ccu0 */, MTK_INVALID_LARBID}, {4, 6}}, > +}; > + > static const unsigned int mt8192_larb_region_msk[MT8192_MULTI_REGION_NR_MAX][MTK_LARB_NR_MAX] = { > [0] = {~0, ~0}, /* Region0: larb0/1 */ > [1] = {0, 0, 0, 0, ~0, ~0, 0, ~0}, /* Region1: larb4/5/7 */ > @@ -1701,6 +1747,9 @@ 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,mt8186-iommu-mm", .data = &mt8186_data_mm}, /* mm: m4u */ > + { .compatible = "mediatek,mt8188-iommu-infra", .data = &mt8188_data_infra}, > + { .compatible = "mediatek,mt8188-iommu-vdo", .data = &mt8188_data_vdo}, > + { .compatible = "mediatek,mt8188-iommu-vpp", .data = &mt8188_data_vpp}, > { .compatible = "mediatek,mt8192-m4u", .data = &mt8192_data}, > { .compatible = "mediatek,mt8195-iommu-infra", .data = &mt8195_data_infra}, > { .compatible = "mediatek,mt8195-iommu-vdo", .data = &mt8195_data_vdo}, > -- > 2.25.1 > >
On Tue, 2023-08-08 at 17:53 +0800, Chen-Yu Tsai wrote: > > External email : Please do not click links or open attachments until > you have verified the sender or the content. > On Fri, Jun 2, 2023 at 5:04 PM Yong Wu <yong.wu@mediatek.com> wrote: > > > > From: "Chengci.Xu" <chengci.xu@mediatek.com> > > > > MT8188 has 3 IOMMU, containing 2 MM IOMMUs, one is for vdo, the > other > > is for vpp. and 1 INFRA IOMMU. > > > > Signed-off-by: Chengci.Xu <chengci.xu@mediatek.com> > > Signed-off-by: Yong Wu <yong.wu@mediatek.com> > > Reviewed-by: AngeloGioacchino Del Regno < > angelogioacchino.delregno@collabora.com> > > --- > > drivers/iommu/mtk_iommu.c | 49 > +++++++++++++++++++++++++++++++++++++++ > > 1 file changed, 49 insertions(+) > > > > diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c > > index 9c89cf894a4d..5c66af0c45a8 100644 > > --- a/drivers/iommu/mtk_iommu.c > > +++ b/drivers/iommu/mtk_iommu.c > > @@ -170,6 +170,7 @@ enum mtk_iommu_plat { > > M4U_MT8173, > > M4U_MT8183, > > M4U_MT8186, > > + M4U_MT8188, > > M4U_MT8192, > > M4U_MT8195, > > M4U_MT8365, > > @@ -1593,6 +1594,51 @@ static const struct mtk_iommu_plat_data > mt8186_data_mm = { > > .iova_region_larb_msk = mt8186_larb_region_msk, > > }; > > > > +static const struct mtk_iommu_plat_data mt8188_data_infra = { > > + .m4u_plat = M4U_MT8188, > > + .flags = WR_THROT_EN | DCM_DISABLE | > STD_AXI_MODE | PM_CLK_AO | > > + MTK_IOMMU_TYPE_INFRA | > IFA_IOMMU_PCIE_SUPPORT | > > + PGTABLE_PA_35_EN | > CFG_IFA_MASTER_IN_ATF, > > FWIW, CFG_IFA_MASTER_IN_ATF should not be tied to the compatible > string, > but set via a DT property. The IOMMU controls are secured by > firmware. > It is not a property intrinsically tied to the hardware. The flag CFG_IFA_MASTER_IN_ATF means the registers which enable/disable iommu are in the secure world. If the master like pcie want to enable iommu, we have to enter secure world to configure it. It should be HW intrinsical, right? > > If on some other project there is no such security requirement and > the > IOMMU is opened up to non-secure world, and ATF not even having > support > for the SMC call, this becomes unusable and hard to rectify without > introducing a new compatible string. > > ChenYu > > > + .inv_sel_reg = REG_MMU_INV_SEL_GEN2, > > + .banks_num = 1, > > + .banks_enable = {true}, > > + .iova_region = single_domain, > > + .iova_region_nr = ARRAY_SIZE(single_domain), > > +}; > > + > > +static const struct mtk_iommu_plat_data mt8188_data_vdo = { > > + .m4u_plat = M4U_MT8188, > > + .flags = HAS_BCLK | HAS_SUB_COMM_3BITS | > OUT_ORDER_WR_EN | > > + WR_THROT_EN | IOVA_34_EN | SHARE_PGTABLE > | > > + PGTABLE_PA_35_EN | MTK_IOMMU_TYPE_MM, > > + .hw_list = &m4ulist, > > + .inv_sel_reg = REG_MMU_INV_SEL_GEN2, > > + .banks_num = 1, > > + .banks_enable = {true}, > > + .iova_region = mt8192_multi_dom, > > + .iova_region_nr = ARRAY_SIZE(mt8192_multi_dom), > > + .larbid_remap = {{2}, {0}, {21}, {0}, {19}, {9, 10, > > + 11 /* 11a */, 25 /* 11c */}, > > + {13, 0, 29 /* 16b */, 30 /* 17b */, 0}, > {5}}, > > +}; > > + > > +static const struct mtk_iommu_plat_data mt8188_data_vpp = { > > + .m4u_plat = M4U_MT8188, > > + .flags = HAS_BCLK | HAS_SUB_COMM_3BITS | > OUT_ORDER_WR_EN | > > + WR_THROT_EN | IOVA_34_EN | SHARE_PGTABLE > | > > + PGTABLE_PA_35_EN | MTK_IOMMU_TYPE_MM, > > + .hw_list = &m4ulist, > > + .inv_sel_reg = REG_MMU_INV_SEL_GEN2, > > + .banks_num = 1, > > + .banks_enable = {true}, > > + .iova_region = mt8192_multi_dom, > > + .iova_region_nr = ARRAY_SIZE(mt8192_multi_dom), > > + .larbid_remap = {{1}, {3}, {23}, {7}, > {MTK_INVALID_LARBID}, > > + {12, 15, 24 /* 11b */}, {14, > MTK_INVALID_LARBID, > > + 16 /* 16a */, 17 /* 17a */, > MTK_INVALID_LARBID, > > + 27, 28 /* ccu0 */, MTK_INVALID_LARBID}, > {4, 6}}, > > +}; > > + > > static const unsigned int > mt8192_larb_region_msk[MT8192_MULTI_REGION_NR_MAX][MTK_LARB_NR_MAX] = > { > > [0] = {~0, ~0}, /* Region0: larb0/1 > */ > > [1] = {0, 0, 0, 0, ~0, ~0, 0, ~0}, /* Region1: > larb4/5/7 */ > > @@ -1701,6 +1747,9 @@ 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,mt8186-iommu-mm", .data = > &mt8186_data_mm}, /* mm: m4u */ > > + { .compatible = "mediatek,mt8188-iommu-infra", .data = > &mt8188_data_infra}, > > + { .compatible = "mediatek,mt8188-iommu-vdo", .data = > &mt8188_data_vdo}, > > + { .compatible = "mediatek,mt8188-iommu-vpp", .data = > &mt8188_data_vpp}, > > { .compatible = "mediatek,mt8192-m4u", .data = > &mt8192_data}, > > { .compatible = "mediatek,mt8195-iommu-infra", .data = > &mt8195_data_infra}, > > { .compatible = "mediatek,mt8195-iommu-vdo", .data = > &mt8195_data_vdo}, > > -- > > 2.25.1 > > > > >
On Thu, Aug 10, 2023 at 8:23 PM Yong Wu (吴勇) <Yong.Wu@mediatek.com> wrote: > > On Tue, 2023-08-08 at 17:53 +0800, Chen-Yu Tsai wrote: > > > > External email : Please do not click links or open attachments until > > you have verified the sender or the content. > > On Fri, Jun 2, 2023 at 5:04 PM Yong Wu <yong.wu@mediatek.com> wrote: > > > > > > From: "Chengci.Xu" <chengci.xu@mediatek.com> > > > > > > MT8188 has 3 IOMMU, containing 2 MM IOMMUs, one is for vdo, the > > other > > > is for vpp. and 1 INFRA IOMMU. > > > > > > Signed-off-by: Chengci.Xu <chengci.xu@mediatek.com> > > > Signed-off-by: Yong Wu <yong.wu@mediatek.com> > > > Reviewed-by: AngeloGioacchino Del Regno < > > angelogioacchino.delregno@collabora.com> > > > --- > > > drivers/iommu/mtk_iommu.c | 49 > > +++++++++++++++++++++++++++++++++++++++ > > > 1 file changed, 49 insertions(+) > > > > > > diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c > > > index 9c89cf894a4d..5c66af0c45a8 100644 > > > --- a/drivers/iommu/mtk_iommu.c > > > +++ b/drivers/iommu/mtk_iommu.c > > > @@ -170,6 +170,7 @@ enum mtk_iommu_plat { > > > M4U_MT8173, > > > M4U_MT8183, > > > M4U_MT8186, > > > + M4U_MT8188, > > > M4U_MT8192, > > > M4U_MT8195, > > > M4U_MT8365, > > > @@ -1593,6 +1594,51 @@ static const struct mtk_iommu_plat_data > > mt8186_data_mm = { > > > .iova_region_larb_msk = mt8186_larb_region_msk, > > > }; > > > > > > +static const struct mtk_iommu_plat_data mt8188_data_infra = { > > > + .m4u_plat = M4U_MT8188, > > > + .flags = WR_THROT_EN | DCM_DISABLE | > > STD_AXI_MODE | PM_CLK_AO | > > > + MTK_IOMMU_TYPE_INFRA | > > IFA_IOMMU_PCIE_SUPPORT | > > > + PGTABLE_PA_35_EN | > > CFG_IFA_MASTER_IN_ATF, > > > > FWIW, CFG_IFA_MASTER_IN_ATF should not be tied to the compatible > > string, > > but set via a DT property. The IOMMU controls are secured by > > firmware. > > It is not a property intrinsically tied to the hardware. > > The flag CFG_IFA_MASTER_IN_ATF means the registers which enable/disable > iommu are in the secure world. If the master like pcie want to enable > iommu, we have to enter secure world to configure it. It should be HW > intrinsical, right? If I understand correctly, this is forced by setting some registers. The registers are set by the firmware at boot time. So if a different firmware that doesn't set the registers is used, then the IOMMU is available to non-secure kernel, correct? That's why I said that it should not be tied to a particular hardware platform, but set using a boolean device tree property. > > > > If on some other project there is no such security requirement and > > the > > IOMMU is opened up to non-secure world, and ATF not even having > > support > > for the SMC call, this becomes unusable and hard to rectify without > > introducing a new compatible string. > > > > ChenYu > > > > > + .inv_sel_reg = REG_MMU_INV_SEL_GEN2, > > > + .banks_num = 1, > > > + .banks_enable = {true}, > > > + .iova_region = single_domain, > > > + .iova_region_nr = ARRAY_SIZE(single_domain), > > > +}; > > > + > > > +static const struct mtk_iommu_plat_data mt8188_data_vdo = { > > > + .m4u_plat = M4U_MT8188, > > > + .flags = HAS_BCLK | HAS_SUB_COMM_3BITS | > > OUT_ORDER_WR_EN | > > > + WR_THROT_EN | IOVA_34_EN | SHARE_PGTABLE > > | > > > + PGTABLE_PA_35_EN | MTK_IOMMU_TYPE_MM, > > > + .hw_list = &m4ulist, > > > + .inv_sel_reg = REG_MMU_INV_SEL_GEN2, > > > + .banks_num = 1, > > > + .banks_enable = {true}, > > > + .iova_region = mt8192_multi_dom, > > > + .iova_region_nr = ARRAY_SIZE(mt8192_multi_dom), > > > + .larbid_remap = {{2}, {0}, {21}, {0}, {19}, {9, 10, > > > + 11 /* 11a */, 25 /* 11c */}, > > > + {13, 0, 29 /* 16b */, 30 /* 17b */, 0}, > > {5}}, > > > +}; > > > + > > > +static const struct mtk_iommu_plat_data mt8188_data_vpp = { > > > + .m4u_plat = M4U_MT8188, > > > + .flags = HAS_BCLK | HAS_SUB_COMM_3BITS | > > OUT_ORDER_WR_EN | > > > + WR_THROT_EN | IOVA_34_EN | SHARE_PGTABLE > > | > > > + PGTABLE_PA_35_EN | MTK_IOMMU_TYPE_MM, > > > + .hw_list = &m4ulist, > > > + .inv_sel_reg = REG_MMU_INV_SEL_GEN2, > > > + .banks_num = 1, > > > + .banks_enable = {true}, > > > + .iova_region = mt8192_multi_dom, > > > + .iova_region_nr = ARRAY_SIZE(mt8192_multi_dom), > > > + .larbid_remap = {{1}, {3}, {23}, {7}, > > {MTK_INVALID_LARBID}, > > > + {12, 15, 24 /* 11b */}, {14, > > MTK_INVALID_LARBID, > > > + 16 /* 16a */, 17 /* 17a */, > > MTK_INVALID_LARBID, > > > + 27, 28 /* ccu0 */, MTK_INVALID_LARBID}, > > {4, 6}}, > > > +}; > > > + > > > static const unsigned int > > mt8192_larb_region_msk[MT8192_MULTI_REGION_NR_MAX][MTK_LARB_NR_MAX] = > > { > > > [0] = {~0, ~0}, /* Region0: larb0/1 > > */ > > > [1] = {0, 0, 0, 0, ~0, ~0, 0, ~0}, /* Region1: > > larb4/5/7 */ > > > @@ -1701,6 +1747,9 @@ 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,mt8186-iommu-mm", .data = > > &mt8186_data_mm}, /* mm: m4u */ > > > + { .compatible = "mediatek,mt8188-iommu-infra", .data = > > &mt8188_data_infra}, > > > + { .compatible = "mediatek,mt8188-iommu-vdo", .data = > > &mt8188_data_vdo}, > > > + { .compatible = "mediatek,mt8188-iommu-vpp", .data = > > &mt8188_data_vpp}, > > > { .compatible = "mediatek,mt8192-m4u", .data = > > &mt8192_data}, > > > { .compatible = "mediatek,mt8195-iommu-infra", .data = > > &mt8195_data_infra}, > > > { .compatible = "mediatek,mt8195-iommu-vdo", .data = > > &mt8195_data_vdo}, > > > -- > > > 2.25.1 > > > > > > > >
On Fri, 2023-08-11 at 11:30 +0800, Chen-Yu Tsai wrote: > > External email : Please do not click links or open attachments until > you have verified the sender or the content. > On Thu, Aug 10, 2023 at 8:23 PM Yong Wu (吴勇) <Yong.Wu@mediatek.com> > wrote: > > > > On Tue, 2023-08-08 at 17:53 +0800, Chen-Yu Tsai wrote: > > > > > > External email : Please do not click links or open attachments > until > > > you have verified the sender or the content. > > > On Fri, Jun 2, 2023 at 5:04 PM Yong Wu <yong.wu@mediatek.com> > wrote: > > > > > > > > From: "Chengci.Xu" <chengci.xu@mediatek.com> > > > > > > > > MT8188 has 3 IOMMU, containing 2 MM IOMMUs, one is for vdo, the > > > other > > > > is for vpp. and 1 INFRA IOMMU. > > > > > > > > Signed-off-by: Chengci.Xu <chengci.xu@mediatek.com> > > > > Signed-off-by: Yong Wu <yong.wu@mediatek.com> > > > > Reviewed-by: AngeloGioacchino Del Regno < > > > angelogioacchino.delregno@collabora.com> > > > > --- > > > > drivers/iommu/mtk_iommu.c | 49 > > > +++++++++++++++++++++++++++++++++++++++ > > > > 1 file changed, 49 insertions(+) > > > > > > > > diff --git a/drivers/iommu/mtk_iommu.c > b/drivers/iommu/mtk_iommu.c > > > > index 9c89cf894a4d..5c66af0c45a8 100644 > > > > --- a/drivers/iommu/mtk_iommu.c > > > > +++ b/drivers/iommu/mtk_iommu.c > > > > @@ -170,6 +170,7 @@ enum mtk_iommu_plat { > > > > M4U_MT8173, > > > > M4U_MT8183, > > > > M4U_MT8186, > > > > + M4U_MT8188, > > > > M4U_MT8192, > > > > M4U_MT8195, > > > > M4U_MT8365, > > > > @@ -1593,6 +1594,51 @@ static const struct mtk_iommu_plat_data > > > mt8186_data_mm = { > > > > .iova_region_larb_msk = mt8186_larb_region_msk, > > > > }; > > > > > > > > +static const struct mtk_iommu_plat_data mt8188_data_infra = { > > > > + .m4u_plat = M4U_MT8188, > > > > + .flags = WR_THROT_EN | DCM_DISABLE | > > > STD_AXI_MODE | PM_CLK_AO | > > > > + MTK_IOMMU_TYPE_INFRA | > > > IFA_IOMMU_PCIE_SUPPORT | > > > > + PGTABLE_PA_35_EN | > > > CFG_IFA_MASTER_IN_ATF, > > > > > > FWIW, CFG_IFA_MASTER_IN_ATF should not be tied to the compatible > > > string, > > > but set via a DT property. The IOMMU controls are secured by > > > firmware. > > > It is not a property intrinsically tied to the hardware. > > > > The flag CFG_IFA_MASTER_IN_ATF means the registers which > enable/disable > > iommu are in the secure world. If the master like pcie want to > enable > > iommu, we have to enter secure world to configure it. It should be > HW > > intrinsical, right? > > If I understand correctly, this is forced by setting some registers. > The registers are set by the firmware at boot time. The register will be set before the masters that have the "iommus=" property probe. If the master doesn't have "iommus=" property in its dtsi node, this register won't be set, then its iommu will be disabled and it has to access continuous buffer. > > So if a different firmware that doesn't set the registers is used, > then the IOMMU is available to non-secure kernel, correct? No. The meaning of this register is whether to enable iommu. If the register are not set, the IOMMU for that master is disabled. > > That's why I said that it should not be tied to a particular hardware > platform, but set using a boolean device tree property. > > > > > > > If on some other project there is no such security requirement > and > > > the > > > IOMMU is opened up to non-secure world, and ATF not even having > > > support > > > for the SMC call, this becomes unusable and hard to rectify > without > > > introducing a new compatible string. > > > > > > ChenYu > > >
On Mon, Aug 14, 2023 at 3:14 PM Yong Wu (吴勇) <Yong.Wu@mediatek.com> wrote: > > On Fri, 2023-08-11 at 11:30 +0800, Chen-Yu Tsai wrote: > > > > External email : Please do not click links or open attachments until > > you have verified the sender or the content. > > On Thu, Aug 10, 2023 at 8:23 PM Yong Wu (吴勇) <Yong.Wu@mediatek.com> > > wrote: > > > > > > On Tue, 2023-08-08 at 17:53 +0800, Chen-Yu Tsai wrote: > > > > > > > > External email : Please do not click links or open attachments > > until > > > > you have verified the sender or the content. > > > > On Fri, Jun 2, 2023 at 5:04 PM Yong Wu <yong.wu@mediatek.com> > > wrote: > > > > > > > > > > From: "Chengci.Xu" <chengci.xu@mediatek.com> > > > > > > > > > > MT8188 has 3 IOMMU, containing 2 MM IOMMUs, one is for vdo, the > > > > other > > > > > is for vpp. and 1 INFRA IOMMU. > > > > > > > > > > Signed-off-by: Chengci.Xu <chengci.xu@mediatek.com> > > > > > Signed-off-by: Yong Wu <yong.wu@mediatek.com> > > > > > Reviewed-by: AngeloGioacchino Del Regno < > > > > angelogioacchino.delregno@collabora.com> > > > > > --- > > > > > drivers/iommu/mtk_iommu.c | 49 > > > > +++++++++++++++++++++++++++++++++++++++ > > > > > 1 file changed, 49 insertions(+) > > > > > > > > > > diff --git a/drivers/iommu/mtk_iommu.c > > b/drivers/iommu/mtk_iommu.c > > > > > index 9c89cf894a4d..5c66af0c45a8 100644 > > > > > --- a/drivers/iommu/mtk_iommu.c > > > > > +++ b/drivers/iommu/mtk_iommu.c > > > > > @@ -170,6 +170,7 @@ enum mtk_iommu_plat { > > > > > M4U_MT8173, > > > > > M4U_MT8183, > > > > > M4U_MT8186, > > > > > + M4U_MT8188, > > > > > M4U_MT8192, > > > > > M4U_MT8195, > > > > > M4U_MT8365, > > > > > @@ -1593,6 +1594,51 @@ static const struct mtk_iommu_plat_data > > > > mt8186_data_mm = { > > > > > .iova_region_larb_msk = mt8186_larb_region_msk, > > > > > }; > > > > > > > > > > +static const struct mtk_iommu_plat_data mt8188_data_infra = { > > > > > + .m4u_plat = M4U_MT8188, > > > > > + .flags = WR_THROT_EN | DCM_DISABLE | > > > > STD_AXI_MODE | PM_CLK_AO | > > > > > + MTK_IOMMU_TYPE_INFRA | > > > > IFA_IOMMU_PCIE_SUPPORT | > > > > > + PGTABLE_PA_35_EN | > > > > CFG_IFA_MASTER_IN_ATF, > > > > > > > > FWIW, CFG_IFA_MASTER_IN_ATF should not be tied to the compatible > > > > string, > > > > but set via a DT property. The IOMMU controls are secured by > > > > firmware. > > > > It is not a property intrinsically tied to the hardware. > > > > > > The flag CFG_IFA_MASTER_IN_ATF means the registers which > > enable/disable > > > iommu are in the secure world. If the master like pcie want to > > enable > > > iommu, we have to enter secure world to configure it. It should be > > HW > > > intrinsical, right? > > > > If I understand correctly, this is forced by setting some registers. > > The registers are set by the firmware at boot time. > > The register will be set before the masters that have the "iommus=" > property probe. If the master doesn't have "iommus=" property in its > dtsi node, this register won't be set, then its iommu will be disabled > and it has to access continuous buffer. > > > > > So if a different firmware that doesn't set the registers is used, > > then the IOMMU is available to non-secure kernel, correct? > > No. The meaning of this register is whether to enable iommu. If the > register are not set, the IOMMU for that master is disabled. For clarity, I'm referring to PERI_MST_PROT [1], not the registers in the IOMMU or LARBs. So not any of the registers used in this patch. If that register doesn't restrict access to IOMMU register space to secure only, then I assume it is controlled by fuses? [1] https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/be457248c6b0a7f3c61bd95af58372938d13decd/plat/mediatek/drivers/iommu/mt8188/mtk_iommu_plat.c#93 > > > > That's why I said that it should not be tied to a particular hardware > > platform, but set using a boolean device tree property. > > > > > > > > > > If on some other project there is no such security requirement > > and > > > > the > > > > IOMMU is opened up to non-secure world, and ATF not even having > > > > support > > > > for the SMC call, this becomes unusable and hard to rectify > > without > > > > introducing a new compatible string. > > > > > > > > ChenYu > > > >
On Mon, 2023-08-14 at 16:21 +0800, Chen-Yu Tsai wrote: > > External email : Please do not click links or open attachments until > you have verified the sender or the content. > On Mon, Aug 14, 2023 at 3:14 PM Yong Wu (吴勇) <Yong.Wu@mediatek.com> > wrote: > > > > On Fri, 2023-08-11 at 11:30 +0800, Chen-Yu Tsai wrote: > > > > > > External email : Please do not click links or open attachments > until > > > you have verified the sender or the content. > > > On Thu, Aug 10, 2023 at 8:23 PM Yong Wu (吴勇) < > Yong.Wu@mediatek.com> > > > wrote: > > > > > > > > On Tue, 2023-08-08 at 17:53 +0800, Chen-Yu Tsai wrote: > > > > > > > > > > External email : Please do not click links or open > attachments > > > until > > > > > you have verified the sender or the content. > > > > > On Fri, Jun 2, 2023 at 5:04 PM Yong Wu <yong.wu@mediatek.com > > > > > wrote: > > > > > > > > > > > > From: "Chengci.Xu" <chengci.xu@mediatek.com> > > > > > > > > > > > > MT8188 has 3 IOMMU, containing 2 MM IOMMUs, one is for vdo, > the > > > > > other > > > > > > is for vpp. and 1 INFRA IOMMU. > > > > > > > > > > > > Signed-off-by: Chengci.Xu <chengci.xu@mediatek.com> > > > > > > Signed-off-by: Yong Wu <yong.wu@mediatek.com> > > > > > > Reviewed-by: AngeloGioacchino Del Regno < > > > > > angelogioacchino.delregno@collabora.com> > > > > > > --- > > > > > > drivers/iommu/mtk_iommu.c | 49 > > > > > +++++++++++++++++++++++++++++++++++++++ > > > > > > 1 file changed, 49 insertions(+) > > > > > > > > > > > > diff --git a/drivers/iommu/mtk_iommu.c > > > b/drivers/iommu/mtk_iommu.c > > > > > > index 9c89cf894a4d..5c66af0c45a8 100644 > > > > > > --- a/drivers/iommu/mtk_iommu.c > > > > > > +++ b/drivers/iommu/mtk_iommu.c > > > > > > @@ -170,6 +170,7 @@ enum mtk_iommu_plat { > > > > > > M4U_MT8173, > > > > > > M4U_MT8183, > > > > > > M4U_MT8186, > > > > > > + M4U_MT8188, > > > > > > M4U_MT8192, > > > > > > M4U_MT8195, > > > > > > M4U_MT8365, > > > > > > @@ -1593,6 +1594,51 @@ static const struct > mtk_iommu_plat_data > > > > > mt8186_data_mm = { > > > > > > .iova_region_larb_msk = mt8186_larb_region_msk, > > > > > > }; > > > > > > > > > > > > +static const struct mtk_iommu_plat_data mt8188_data_infra > = { > > > > > > + .m4u_plat = M4U_MT8188, > > > > > > + .flags = WR_THROT_EN | DCM_DISABLE | > > > > > STD_AXI_MODE | PM_CLK_AO | > > > > > > + MTK_IOMMU_TYPE_INFRA | > > > > > IFA_IOMMU_PCIE_SUPPORT | > > > > > > + PGTABLE_PA_35_EN | > > > > > CFG_IFA_MASTER_IN_ATF, > > > > > > > > > > FWIW, CFG_IFA_MASTER_IN_ATF should not be tied to the > compatible > > > > > string, > > > > > but set via a DT property. The IOMMU controls are secured by > > > > > firmware. > > > > > It is not a property intrinsically tied to the hardware. > > > > > > > > The flag CFG_IFA_MASTER_IN_ATF means the registers which > > > enable/disable > > > > iommu are in the secure world. If the master like pcie want to > > > enable > > > > iommu, we have to enter secure world to configure it. It should > be > > > HW > > > > intrinsical, right? > > > > > > If I understand correctly, this is forced by setting some > registers. > > > The registers are set by the firmware at boot time. > > > > The register will be set before the masters that have the "iommus=" > > property probe. If the master doesn't have "iommus=" property in > its > > dtsi node, this register won't be set, then its iommu will be > disabled > > and it has to access continuous buffer. > > > > > > > > So if a different firmware that doesn't set the registers is > used, > > > then the IOMMU is available to non-secure kernel, correct? > > > > No. The meaning of this register is whether to enable iommu. If the > > register are not set, the IOMMU for that master is disabled. > > For clarity, I'm referring to PERI_MST_PROT [1], not the registers in > the > IOMMU or LARBs. So not any of the registers used in this patch. > > If that register doesn't restrict access to IOMMU register space to > secure > only, then I assume it is controlled by fuses? Thanks for the clarification. Understand this now. If that register doesn't restrict this, the register for enabling the iommu could be accessed in normal world. > [1] > https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/be457248c6b0a7f3c61bd95af58372938d13decd/plat/mediatek/drivers/iommu/mt8188/mtk_iommu_plat.c#93 > > > > > > > That's why I said that it should not be tied to a particular > hardware > > > platform, but set using a boolean device tree property. > > > > > > > > > > > > > If on some other project there is no such security > requirement > > > and > > > > > the > > > > > IOMMU is opened up to non-secure world, and ATF not even > having > > > > > support > > > > > for the SMC call, this becomes unusable and hard to rectify > > > without > > > > > introducing a new compatible string. Then this make sense. Sorry, I don't know if such project exist, I guess no, right? we could add it when necessary? Thanks. > > > > > > > > > > ChenYu > > > > >
On Thu, Aug 17, 2023 at 4:03 PM Yong Wu (吴勇) <Yong.Wu@mediatek.com> wrote: > > On Mon, 2023-08-14 at 16:21 +0800, Chen-Yu Tsai wrote: > > > > External email : Please do not click links or open attachments until > > you have verified the sender or the content. > > On Mon, Aug 14, 2023 at 3:14 PM Yong Wu (吴勇) <Yong.Wu@mediatek.com> > > wrote: > > > > > > On Fri, 2023-08-11 at 11:30 +0800, Chen-Yu Tsai wrote: > > > > > > > > External email : Please do not click links or open attachments > > until > > > > you have verified the sender or the content. > > > > On Thu, Aug 10, 2023 at 8:23 PM Yong Wu (吴勇) < > > Yong.Wu@mediatek.com> > > > > wrote: > > > > > > > > > > On Tue, 2023-08-08 at 17:53 +0800, Chen-Yu Tsai wrote: > > > > > > > > > > > > External email : Please do not click links or open > > attachments > > > > until > > > > > > you have verified the sender or the content. > > > > > > On Fri, Jun 2, 2023 at 5:04 PM Yong Wu <yong.wu@mediatek.com > > > > > > > wrote: > > > > > > > > > > > > > > From: "Chengci.Xu" <chengci.xu@mediatek.com> > > > > > > > > > > > > > > MT8188 has 3 IOMMU, containing 2 MM IOMMUs, one is for vdo, > > the > > > > > > other > > > > > > > is for vpp. and 1 INFRA IOMMU. > > > > > > > > > > > > > > Signed-off-by: Chengci.Xu <chengci.xu@mediatek.com> > > > > > > > Signed-off-by: Yong Wu <yong.wu@mediatek.com> > > > > > > > Reviewed-by: AngeloGioacchino Del Regno < > > > > > > angelogioacchino.delregno@collabora.com> > > > > > > > --- > > > > > > > drivers/iommu/mtk_iommu.c | 49 > > > > > > +++++++++++++++++++++++++++++++++++++++ > > > > > > > 1 file changed, 49 insertions(+) > > > > > > > > > > > > > > diff --git a/drivers/iommu/mtk_iommu.c > > > > b/drivers/iommu/mtk_iommu.c > > > > > > > index 9c89cf894a4d..5c66af0c45a8 100644 > > > > > > > --- a/drivers/iommu/mtk_iommu.c > > > > > > > +++ b/drivers/iommu/mtk_iommu.c > > > > > > > @@ -170,6 +170,7 @@ enum mtk_iommu_plat { > > > > > > > M4U_MT8173, > > > > > > > M4U_MT8183, > > > > > > > M4U_MT8186, > > > > > > > + M4U_MT8188, > > > > > > > M4U_MT8192, > > > > > > > M4U_MT8195, > > > > > > > M4U_MT8365, > > > > > > > @@ -1593,6 +1594,51 @@ static const struct > > mtk_iommu_plat_data > > > > > > mt8186_data_mm = { > > > > > > > .iova_region_larb_msk = mt8186_larb_region_msk, > > > > > > > }; > > > > > > > > > > > > > > +static const struct mtk_iommu_plat_data mt8188_data_infra > > = { > > > > > > > + .m4u_plat = M4U_MT8188, > > > > > > > + .flags = WR_THROT_EN | DCM_DISABLE | > > > > > > STD_AXI_MODE | PM_CLK_AO | > > > > > > > + MTK_IOMMU_TYPE_INFRA | > > > > > > IFA_IOMMU_PCIE_SUPPORT | > > > > > > > + PGTABLE_PA_35_EN | > > > > > > CFG_IFA_MASTER_IN_ATF, > > > > > > > > > > > > FWIW, CFG_IFA_MASTER_IN_ATF should not be tied to the > > compatible > > > > > > string, > > > > > > but set via a DT property. The IOMMU controls are secured by > > > > > > firmware. > > > > > > It is not a property intrinsically tied to the hardware. > > > > > > > > > > The flag CFG_IFA_MASTER_IN_ATF means the registers which > > > > enable/disable > > > > > iommu are in the secure world. If the master like pcie want to > > > > enable > > > > > iommu, we have to enter secure world to configure it. It should > > be > > > > HW > > > > > intrinsical, right? > > > > > > > > If I understand correctly, this is forced by setting some > > registers. > > > > The registers are set by the firmware at boot time. > > > > > > The register will be set before the masters that have the "iommus=" > > > property probe. If the master doesn't have "iommus=" property in > > its > > > dtsi node, this register won't be set, then its iommu will be > > disabled > > > and it has to access continuous buffer. > > > > > > > > > > > So if a different firmware that doesn't set the registers is > > used, > > > > then the IOMMU is available to non-secure kernel, correct? > > > > > > No. The meaning of this register is whether to enable iommu. If the > > > register are not set, the IOMMU for that master is disabled. > > > > For clarity, I'm referring to PERI_MST_PROT [1], not the registers in > > the > > IOMMU or LARBs. So not any of the registers used in this patch. > > > > If that register doesn't restrict access to IOMMU register space to > > secure > > only, then I assume it is controlled by fuses? > > Thanks for the clarification. Understand this now. If that register > doesn't restrict this, the register for enabling the iommu could be > accessed in normal world. > > > [1] > > https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/be457248c6b0a7f3c61bd95af58372938d13decd/plat/mediatek/drivers/iommu/mt8188/mtk_iommu_plat.c#93 > > > > > > > > > > That's why I said that it should not be tied to a particular > > hardware > > > > platform, but set using a boolean device tree property. > > > > > > > > > > > > > > > > If on some other project there is no such security > > requirement > > > > and > > > > > > the > > > > > > IOMMU is opened up to non-secure world, and ATF not even > > having > > > > > > support > > > > > > for the SMC call, this becomes unusable and hard to rectify > > > > without > > > > > > introducing a new compatible string. > > Then this make sense. Sorry, I don't know if such project exist, I > guess no, right? we could add it when necessary? I guess that works. It would be a negative property, such as "mediatek,iommu-is-non-secure". However, since this lock down is orthogonal to the SoC model, it would be better to model it as such from the beginning. ChenYu
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c index 9c89cf894a4d..5c66af0c45a8 100644 --- a/drivers/iommu/mtk_iommu.c +++ b/drivers/iommu/mtk_iommu.c @@ -170,6 +170,7 @@ enum mtk_iommu_plat { M4U_MT8173, M4U_MT8183, M4U_MT8186, + M4U_MT8188, M4U_MT8192, M4U_MT8195, M4U_MT8365, @@ -1593,6 +1594,51 @@ static const struct mtk_iommu_plat_data mt8186_data_mm = { .iova_region_larb_msk = mt8186_larb_region_msk, }; +static const struct mtk_iommu_plat_data mt8188_data_infra = { + .m4u_plat = M4U_MT8188, + .flags = WR_THROT_EN | DCM_DISABLE | STD_AXI_MODE | PM_CLK_AO | + MTK_IOMMU_TYPE_INFRA | IFA_IOMMU_PCIE_SUPPORT | + PGTABLE_PA_35_EN | CFG_IFA_MASTER_IN_ATF, + .inv_sel_reg = REG_MMU_INV_SEL_GEN2, + .banks_num = 1, + .banks_enable = {true}, + .iova_region = single_domain, + .iova_region_nr = ARRAY_SIZE(single_domain), +}; + +static const struct mtk_iommu_plat_data mt8188_data_vdo = { + .m4u_plat = M4U_MT8188, + .flags = HAS_BCLK | HAS_SUB_COMM_3BITS | OUT_ORDER_WR_EN | + WR_THROT_EN | IOVA_34_EN | SHARE_PGTABLE | + PGTABLE_PA_35_EN | MTK_IOMMU_TYPE_MM, + .hw_list = &m4ulist, + .inv_sel_reg = REG_MMU_INV_SEL_GEN2, + .banks_num = 1, + .banks_enable = {true}, + .iova_region = mt8192_multi_dom, + .iova_region_nr = ARRAY_SIZE(mt8192_multi_dom), + .larbid_remap = {{2}, {0}, {21}, {0}, {19}, {9, 10, + 11 /* 11a */, 25 /* 11c */}, + {13, 0, 29 /* 16b */, 30 /* 17b */, 0}, {5}}, +}; + +static const struct mtk_iommu_plat_data mt8188_data_vpp = { + .m4u_plat = M4U_MT8188, + .flags = HAS_BCLK | HAS_SUB_COMM_3BITS | OUT_ORDER_WR_EN | + WR_THROT_EN | IOVA_34_EN | SHARE_PGTABLE | + PGTABLE_PA_35_EN | MTK_IOMMU_TYPE_MM, + .hw_list = &m4ulist, + .inv_sel_reg = REG_MMU_INV_SEL_GEN2, + .banks_num = 1, + .banks_enable = {true}, + .iova_region = mt8192_multi_dom, + .iova_region_nr = ARRAY_SIZE(mt8192_multi_dom), + .larbid_remap = {{1}, {3}, {23}, {7}, {MTK_INVALID_LARBID}, + {12, 15, 24 /* 11b */}, {14, MTK_INVALID_LARBID, + 16 /* 16a */, 17 /* 17a */, MTK_INVALID_LARBID, + 27, 28 /* ccu0 */, MTK_INVALID_LARBID}, {4, 6}}, +}; + static const unsigned int mt8192_larb_region_msk[MT8192_MULTI_REGION_NR_MAX][MTK_LARB_NR_MAX] = { [0] = {~0, ~0}, /* Region0: larb0/1 */ [1] = {0, 0, 0, 0, ~0, ~0, 0, ~0}, /* Region1: larb4/5/7 */ @@ -1701,6 +1747,9 @@ 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,mt8186-iommu-mm", .data = &mt8186_data_mm}, /* mm: m4u */ + { .compatible = "mediatek,mt8188-iommu-infra", .data = &mt8188_data_infra}, + { .compatible = "mediatek,mt8188-iommu-vdo", .data = &mt8188_data_vdo}, + { .compatible = "mediatek,mt8188-iommu-vpp", .data = &mt8188_data_vpp}, { .compatible = "mediatek,mt8192-m4u", .data = &mt8192_data}, { .compatible = "mediatek,mt8195-iommu-infra", .data = &mt8195_data_infra}, { .compatible = "mediatek,mt8195-iommu-vdo", .data = &mt8195_data_vdo},