MT6779 IOMMU SUPPORT
Subsystems (6)
v5 cover MT6779 IOMMU SUPPORT
This patchset adds mt6779 iommu support.
mt6779 has two iommus, they are MM_IOMMU(M4U) and APU_IOMMU which used ARM Short-Descriptor translation format. The mt6779's MM_IOMMU-SMI and APU_IOMMU HW diagram is as below, it is only a brief diagram:
EMI
|
--------------------------------------
| |
MM_IOMMU APU_IOMMU
| |
SMI_COMMOM----------- APU_BUS
| | |
SMI_LARB(0~11) | |
| | |
| | --------------
| | | | |
Multimedia engine CCU VPU MDLA EMDA All the connections are hardware fixed, software can not adjust it.
Compared with mt8183, SMI_BUS_ID width has changed from 10 to 12. SMI Larb number is described in bit[11:7], Port number is described in bit[6:2]. In addition, there are some registers has changed in mt6779, so we need to redefine and reuse them.
The patchset only used MM_IOMMU, so we only add MM_IOMMU basic function, such as smi_larb port definition, registers definition and hardware initialization.
change notes:
v5:
1. Split "iommu/mediatek: Add mt6779 IOMMU basic support(patch v4)" to three patches(from PATCH v5 08/10 to PATCH v5 10/10).
2. Use macro definitions to replace bool values in mtk_iommu_plat_data structure
v4:
1. Rebase on v5.8-rc1.
2. Fix coding style.
3. Add F_MMU_IN_DRDER_WR_EN definition in MISC_CTRL to improve performance.
https://lkml.org/lkml/2020/6/16/1741
v3:
1. Rebase on v5.7-rc1.
2. Remove unused port definition,ex:APU and CCU port in mt6779-larb-port.h.
3. Remove "change single domain to multiple domain" part(from PATCH v2 09/19 to PATCH v2 19/19).
4. Redesign mt6779 basic part
(1)Add some register definition and reuse them.
(2)Redesign smi larb bus ID to analyze IOMMU translation fault.
(3)Only init MM_IOMMU and not use APU_IOMMU.
http://lists.infradead.org/pipermail/linux-mediatek/2020-May/029811.html
v2:
1. Rebase on v5.5-rc1.
2. Delete M4U_PORT_UNKNOWN define because of not use it.
3. Correct coding format.
4. Rename offset=0x48 register.
5. Split "iommu/mediatek: Add mt6779 IOMMU basic support(patch v1)" to several patches(patch v2).
http://lists.infradead.org/pipermail/linux-mediatek/2020-January/026131.html
v1:
http://lists.infradead.org/pipermail/linux-mediatek/2019-November/024567.html
Chao Hao (10):
dt-bindings: mediatek: Add bindings for MT6779 iommu/mediatek: Rename the register STANDARD_AXI_MODE(0x48) to MISC_CTRL iommu/mediatek: Modify the usage of mtk_iommu_plat_data structure iommu/mediatek: Setting MISC_CTRL register
iommu/mediatek: Move inv_sel_reg into the plat_data iommu/mediatek: Add sub_comm id in translation fault iommu/mediatek: Add REG_MMU_WR_LEN register definition iommu/mediatek: Extend protect pa alignment value iommu/mediatek: Modify MMU_CTRL register setting iommu/mediatek: Add mt6779 basic support
.../bindings/iommu/mediatek,iommu.txt | 2 + drivers/iommu/mtk_iommu.c | 100 ++++++--- drivers/iommu/mtk_iommu.h | 26 ++- include/dt-bindings/memory/mt6779-larb-port.h | 206 ++++++++++++++++++ include/soc/mediatek/smi.h | 2 + 5 files changed, 299 insertions(+), 37 deletions(-)
--
2.18.0
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v5 1/10 dt-bindings: mediatek: Add bindings for MT6779
This patch adds description for MT6779 IOMMU.
MT6779 has two iommus, they are mm_iommu and apu_iommu which both use ARM Short-Descriptor translation format.
In addition, mm_iommu and apu_iommu are two independent HW instance , we need to set them separately.
The MT6779 IOMMU hardware diagram is as below, it is only a brief diagram about iommu, it don't focus on the part of smi_larb, so I don't describe the smi_larb detailedly.
EMI
|
--------------------------------------
| |
MM_IOMMU APU_IOMMU
| |
SMI_COMMOM----------- APU_BUS
| | |
SMI_LARB(0~11) | |
| | |
| | --------------
| | | | |Multimedia engine CCU VPU MDLA EMDA
All the connections are hardware fixed, software can not adjust it.
--- .../bindings/iommu/mediatek,iommu.txt | 2 + include/dt-bindings/memory/mt6779-larb-port.h | 206 ++++++++++++++++++ 2 files changed, 208 insertions(+) create mode 100644 include/dt-bindings/memory/mt6779-larb-port.h
Documentation/devicetree/bindings/iommu/mediatek,iommu.txt +2 -0
@@ -58,6 +58,7 @@ Required properties: - compatible : must be one of the following string: "mediatek,mt2701-m4u" for mt2701 which uses generation one m4u HW. "mediatek,mt2712-m4u" for mt2712 which uses generation two m4u HW. + "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,mt8173-m4u" for mt8173 which uses generation two m4u HW.
@@ -78,6 +79,7 @@ Required properties: Specifies the mtk_m4u_id as defined in dt-binding/memory/mt2701-larb-port.h for mt2701, mt7623 dt-binding/memory/mt2712-larb-port.h for mt2712, + dt-binding/memory/mt6779-larb-port.h for mt6779, dt-binding/memory/mt8173-larb-port.h for mt8173, and dt-binding/memory/mt8183-larb-port.h for mt8183.
include/dt-bindings/memory/mt6779-larb-port.h new file +206 -0
206 lines not on this page · raw message
Signature · 5 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v5 2/10 iommu/mediatek: Rename the register STANDARD_AXI_MODE(0x48) to MISC_CTRL
In reply to Chao HaoFor iommu offset=0x48 register, only the previous mt8173/mt8183 use the name STANDARD_AXI_MODE, all the latest SoC extend the register more feature by different bits, for example: axi_mode, in_order_en, coherent_en and so on. So rename REG_MMU_MISC_CTRL may be more proper.
This patch only rename the register name, no functional change.
--- drivers/iommu/mtk_iommu.c | 14 +++++++------- drivers/iommu/mtk_iommu.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/iommu/mtk_iommu.c +7 -7
@@ -41,7 +41,7 @@#define F_INVLD_EN0 BIT(0)#define F_INVLD_EN1 BIT(1) -#define REG_MMU_STANDARD_AXI_MODE 0x048 +#define REG_MMU_MISC_CTRL 0x048#define REG_MMU_DCM_DIS 0x050#define REG_MMU_CTRL_REG 0x110
@@ -573,8 +573,10 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) }writel_relaxed (0 , data->base +REG_MMU_DCM_DIS ); -if (data->plat_data->reset_axi) -writel_relaxed (0 , data->base +REG_MMU_STANDARD_AXI_MODE ); +if (data->plat_data->reset_axi) { +/* The register is called STANDARD_AXI_MODE in this case */ +writel_relaxed (0 , data->base +REG_MMU_MISC_CTRL ); + }if (devm_request_irq (data->dev, data->irq, mtk_iommu_isr,0 ,dev_name (data->dev), (void *)data)) {
@@ -718,8 +720,7 @@ static int __maybe_unused mtk_iommu_suspend(struct device *dev)struct mtk_iommu_suspend_reg *reg = &data->reg;void __iomem *base = data->base; - reg->standard_axi_mode =readl_relaxed (base + -REG_MMU_STANDARD_AXI_MODE ); + reg->misc_ctrl =readl_relaxed (base +REG_MMU_MISC_CTRL ); reg->dcm_dis =readl_relaxed (base +REG_MMU_DCM_DIS ); reg->ctrl_reg =readl_relaxed (base +REG_MMU_CTRL_REG ); reg->int_control0 =readl_relaxed (base +REG_MMU_INT_CONTROL0 );
@@ -743,8 +744,7 @@ static int __maybe_unused mtk_iommu_resume(struct device *dev)dev_err (data->dev,"Failed to enable clk(%d) in resume\n" , ret);return ret; } -writel_relaxed (reg->standard_axi_mode, - base +REG_MMU_STANDARD_AXI_MODE ); +writel_relaxed (reg->misc_ctrl, base +REG_MMU_MISC_CTRL );writel_relaxed (reg->dcm_dis, base +REG_MMU_DCM_DIS );writel_relaxed (reg->ctrl_reg, base +REG_MMU_CTRL_REG );writel_relaxed (reg->int_control0, base +REG_MMU_INT_CONTROL0 );
drivers/iommu/mtk_iommu.h +1 -1
@@ -18,7 +18,7 @@#include <soc/mediatek/smi.h> struct mtk_iommu_suspend_reg { -u32 standard_axi_mode; +u32 misc_ctrl;u32 dcm_dis;u32 ctrl_reg;u32 int_control0;
Signature · 5 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerRe: [PATCH v5 02/10] iommu/mediatek: Rename the register STANDARD_AXI_MODE(0x48) to MISC_CTRL
Quoted 14 lines · Chao Hao
For iommu offset=0x48 register, only the previous mt8173/mt8183 use the name
STANDARD_AXI_MODE, all the latest SoC extend the register more feature by different bits, for example:axi_mode,in_order_en,coherent_enand so on. So renameREG_MMU_MISC_CTRLmay be more proper.This patch only rename the register name, no functional change.
Signed-off-by Chao Hao <[email protected]>Reviewed-by Yong Wu <[email protected]>Reviewed-by Matthias Brugger <[email protected]>--- drivers/iommu/mtk_iommu.c | 14 +++++++------- drivers/iommu/mtk_iommu.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-)
...
drivers/iommu/mtk_iommu.h line 21
Quoted 10 lines
drivers/iommu/mtk_iommu.h +1
-1@@ -18,7 +18,7 @@#include <soc/mediatek/smi.h> struct mtk_iommu_suspend_reg { -u32 standard_axi_mode; +u32 misc_ctrl;
Here will cause build fail for v1:
drivers/iommu/mtk_iommu_v1.c:675:20: error: 'struct mtk_iommu_suspend_reg' has no member named 'standard_axi_mode'
writel_relaxed(reg->standard_axi_mode,
^
We could change something like:
union {
u32 standard_axi_mode; /* only for v1 */
u32 misc_ctrl; /* only for v2 */
};drivers/iommu/mtk_iommu.h line 24
Quoted 3 lines
drivers/iommu/mtk_iommu.h +0
-0u32 dcm_dis;u32 ctrl_reg;u32 int_control0;
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v5 02/10] iommu/mediatek: Rename the register STANDARD_AXI_MODE(0x48) to MISC_CTRL
Quoted 34 lines · Yong Wu
Quoted 14 lines · Chao Hao
For iommu offset=0x48 register, only the previous mt8173/mt8183 use the name
STANDARD_AXI_MODE, all the latest SoC extend the register more feature by different bits, for example:axi_mode,in_order_en,coherent_enand so on. So renameREG_MMU_MISC_CTRLmay be more proper.This patch only rename the register name, no functional change.
Signed-off-by Chao Hao <[email protected]>Reviewed-by Yong Wu <[email protected]>Reviewed-by Matthias Brugger <[email protected]>--- drivers/iommu/mtk_iommu.c | 14 +++++++------- drivers/iommu/mtk_iommu.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-)...
drivers/iommu/mtk_iommu.h line 21
Quoted 10 lines
drivers/iommu/mtk_iommu.h +1
-1@@ -18,7 +18,7 @@#include <soc/mediatek/smi.h> struct mtk_iommu_suspend_reg { -u32 standard_axi_mode; +u32 misc_ctrl;Here will cause build fail for v1:
drivers/iommu/mtk_iommu_v1.c:675:20: error: 'structmtk_iommu_suspend_reg' has no member named 'standard_axi_mode'
writel_relaxed(reg->standard_axi_mode,
Quoted 12 lines
^We could change something like:
union { u32 standard_axi_mode; /* only for v1 */ u32 misc_ctrl; /* only for v2 */ };Quoted 3 lines
drivers/iommu/mtk_iommu.h +0
-0u32 dcm_dis;u32 ctrl_reg;u32 int_control0;
ok, I will fix it in next version, thanks
Quoted 1 line
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v5 3/10 iommu/mediatek: Modify the usage of mtk_iommu_plat_data structure
In reply to Chao HaoGiven the fact that we are adding more and more plat_data bool values, it would make sense to use a u32 flags register and add the appropriate macro definitions to set and check for a flag present.
No functional change.
--- drivers/iommu/mtk_iommu.c | 23 ++++++++++++----------- drivers/iommu/mtk_iommu.h | 16 ++++++++++------ 2 files changed, 22 insertions(+), 17 deletions(-)
drivers/iommu/mtk_iommu.c +12 -11
@@ -563,7 +563,8 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)upper_32_bits (data->protect_base);writel_relaxed (regval, data->base +REG_MMU_IVRP_PADDR ); -if (data->enable_4GB && data->plat_data->has_vld_pa_rng) { +if (data->enable_4GB && +MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_VLD_PA_RNG )) {/* * If 4GB mode is enabled, the validate PA range is from * 0x1_0000_0000 to 0x1_ffff_ffff. here record bit[32:30].
@@ -573,7 +574,7 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) }writel_relaxed (0 , data->base +REG_MMU_DCM_DIS ); -if (data->plat_data->reset_axi) { +if (MTK_IOMMU_HAS_FLAG (data->plat_data,RESET_AXI )) {/* The register is called STANDARD_AXI_MODE in this case */ writel_relaxed (0 , data->base +REG_MMU_MISC_CTRL ); }
@@ -618,7 +619,7 @@ static int mtk_iommu_probe(struct platform_device *pdev)/* Whether the current dram is over 4GB */ data->enable_4GB = !!(max_pfn > (BIT_ULL (32 ) >>PAGE_SHIFT )); -if (!data->plat_data->has_4gb_mode) +if (!MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_4GB_MODE )) data->enable_4GB = false; res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );
@@ -631,7 +632,7 @@ static int mtk_iommu_probe(struct platform_device *pdev)if (data->irq <0 )return data->irq; -if (data->plat_data->has_bclk) { +if (MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_BCLK )) { data->bclk =devm_clk_get (dev,"bclk" );if (IS_ERR (data->bclk))return PTR_ERR (data->bclk);
@@ -763,23 +764,23 @@ static const struct dev_pm_ops mtk_iommu_pm_ops = {static const struct mtk_iommu_plat_data mt2712_data = { .m4u_plat =M4U_MT2712 , - .has_4gb_mode = true, - .has_bclk = true, - .has_vld_pa_rng = true, + .flags =HAS_4GB_MODE | +HAS_BCLK | +HAS_VLD_PA_RNG , .larbid_remap = {0 ,1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 }, };static const struct mtk_iommu_plat_data mt8173_data = { .m4u_plat =M4U_MT8173 , - .has_4gb_mode = true, - .has_bclk = true, - .reset_axi = true, + .flags =HAS_4GB_MODE | +HAS_BCLK | +RESET_AXI , .larbid_remap = {0 ,1 ,2 ,3 ,4 ,5 },/* Linear mapping. */ };static const struct mtk_iommu_plat_data mt8183_data = { .m4u_plat =M4U_MT8183 , - .reset_axi = true, + .flags =RESET_AXI , .larbid_remap = {0 ,4 ,5 ,6 ,7 ,2 ,3 ,1 }, };
drivers/iommu/mtk_iommu.h +10 -6
@@ -17,6 +17,15 @@#include <linux/spinlock.h> #include <soc/mediatek/smi.h> +#define HAS_4GB_MODE BIT(0) +/* HW will use the EMI clock if there isn't the "bclk". */ +#define HAS_BCLK BIT(1) +#define HAS_VLD_PA_RNG BIT(2) +#define RESET_AXI BIT(3) + +#define MTK_IOMMU_HAS_FLAG (pdata, _x) \ + ((((pdata)->flags) & (_x)) == (_x)) +struct mtk_iommu_suspend_reg {u32 misc_ctrl;u32 dcm_dis;
@@ -36,12 +45,7 @@ enum mtk_iommu_plat {struct mtk_iommu_plat_data {enum mtk_iommu_plat m4u_plat; -bool has_4gb_mode; - -/* HW will use the EMI clock if there isn't the "bclk". */ -bool has_bclk; -bool has_vld_pa_rng; -bool reset_axi; +u32 flags;unsigned char larbid_remap[MTK_LARB_NR_MAX ]; };
Signature · 5 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v5 03/10] iommu/mediatek: Modify the usage of mtk_iommu_plat_data structure
Quoted 7 lines · Chao Hao
Given the fact that we are adding more and more
plat_databool values, it would make sense to use a u32 flags register and add the appropriate macro definitions to set and check for a flag present.
No functional change.Suggested-by Matthias Brugger <[email protected]>Signed-off-by Chao Hao <[email protected]>
Quoted 102 lines
--- drivers/iommu/mtk_iommu.c | 23 ++++++++++++----------- drivers/iommu/mtk_iommu.h | 16 ++++++++++------ 2 files changed, 22 insertions(+), 17 deletions(-)drivers/iommu/mtk_iommu.c +12
-11@@ -563,7 +563,8 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)upper_32_bits (data->protect_base);writel_relaxed (regval, data->base +REG_MMU_IVRP_PADDR ); -if (data->enable_4GB && data->plat_data->has_vld_pa_rng) { +if (data->enable_4GB && +MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_VLD_PA_RNG )) {/* * If 4GB mode is enabled, the validate PA range is from * 0x1_0000_0000 to 0x1_ffff_ffff. here record bit[32:30]. @@ -573,7 +574,7 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) }writel_relaxed (0 , data->base +REG_MMU_DCM_DIS ); -if (data->plat_data->reset_axi) { +if (MTK_IOMMU_HAS_FLAG (data->plat_data,RESET_AXI )) {/* The register is called STANDARD_AXI_MODE in this case */ writel_relaxed (0 , data->base +REG_MMU_MISC_CTRL ); }@@ -618,7 +619,7 @@ static int mtk_iommu_probe(struct platform_device *pdev)/* Whether the current dram is over 4GB */ data->enable_4GB = !!(max_pfn > (BIT_ULL (32 ) >>PAGE_SHIFT )); -if (!data->plat_data->has_4gb_mode) +if (!MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_4GB_MODE )) data->enable_4GB = false; res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );@@ -631,7 +632,7 @@ static int mtk_iommu_probe(struct platform_device *pdev)if (data->irq <0 )return data->irq; -if (data->plat_data->has_bclk) { +if (MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_BCLK )) { data->bclk =devm_clk_get (dev,"bclk" );if (IS_ERR (data->bclk))return PTR_ERR (data->bclk);@@ -763,23 +764,23 @@ static const struct dev_pm_ops mtk_iommu_pm_ops = {static const struct mtk_iommu_plat_data mt2712_data = { .m4u_plat =M4U_MT2712 , - .has_4gb_mode = true, - .has_bclk = true, - .has_vld_pa_rng = true, + .flags =HAS_4GB_MODE | +HAS_BCLK | +HAS_VLD_PA_RNG , .larbid_remap = {0 ,1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 }, };static const struct mtk_iommu_plat_data mt8173_data = { .m4u_plat =M4U_MT8173 , - .has_4gb_mode = true, - .has_bclk = true, - .reset_axi = true, + .flags =HAS_4GB_MODE | +HAS_BCLK | +RESET_AXI , .larbid_remap = {0 ,1 ,2 ,3 ,4 ,5 },/* Linear mapping. */ };static const struct mtk_iommu_plat_data mt8183_data = { .m4u_plat =M4U_MT8183 , - .reset_axi = true, + .flags =RESET_AXI , .larbid_remap = {0 ,4 ,5 ,6 ,7 ,2 ,3 ,1 }, };drivers/iommu/mtk_iommu.h +9
-0@@ -17,6 +17,15 @@#include <linux/spinlock.h> #include <soc/mediatek/smi.h> +#define HAS_4GB_MODE BIT(0) +/* HW will use the EMI clock if there isn't the "bclk". */ +#define HAS_BCLK BIT(1) +#define HAS_VLD_PA_RNG BIT(2) +#define RESET_AXI BIT(3) + +#define MTK_IOMMU_HAS_FLAG (pdata, _x) \ + ((((pdata)->flags) & (_x)) == (_x)) +struct mtk_iommu_suspend_reg {u32 misc_ctrl;u32 dcm_dis;@@ -36,12 +45,7 @@ enum mtk_iommu_plat {struct mtk_iommu_plat_data {enum mtk_iommu_plat m4u_plat;
drivers/iommu/mtk_iommu.h enum mtk_iommu_plat { · line 51
Quoted 10 lines
drivers/iommu/mtk_iommu.h +1
-6-bool has_4gb_mode; - -/* HW will use the EMI clock if there isn't the "bclk". */ -bool has_bclk; -bool has_vld_pa_rng; -bool reset_axi; +u32 flags;unsigned char larbid_remap[MTK_LARB_NR_MAX ]; };
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerRe: [PATCH v5 03/10] iommu/mediatek: Modify the usage of mtk_iommu_plat_data structure
In reply to Chao HaoHi Chao,
This is also ok for me. Only two format nitpick.
Quoted 8 lines · Chao Hao
Given the fact that we are adding more and more
plat_databool values, it would make sense to use a u32 flags register and add the appropriate macro definitions to set and check for a flag present.
No functional change.Suggested-by Matthias Brugger <[email protected]>Signed-off-by Chao Hao <[email protected]>---
[snip]
drivers/iommu/mtk_iommu.c static const struct dev_pm_ops mtk_iommu_pm_ops = { · line 769
Quoted 8 lines
static const struct
mtk_iommu_plat_datamt2712_data= {drivers/iommu/mtk_iommu.c +3
-3.m4u_plat = M4U_MT2712, - .has_4gb_mode = true, - .has_bclk = true, - .has_vld_pa_rng = true, + .flags =HAS_4GB_MODE | +HAS_BCLK | + HAS_VLD_PA_RNG,
short enough. we can put it in one line?
Quoted 27 lines
drivers/iommu/mtk_iommu.c +4
-4.larbid_remap = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, };static const struct mtk_iommu_plat_data mt8173_data = { .m4u_plat =M4U_MT8173 , - .has_4gb_mode = true, - .has_bclk = true, - .reset_axi = true, + .flags =HAS_4GB_MODE | +HAS_BCLK | +RESET_AXI , .larbid_remap = {0 ,1 ,2 ,3 ,4 ,5 },/* Linear mapping. */ };static const struct mtk_iommu_plat_data mt8183_data = { .m4u_plat =M4U_MT8183 , - .reset_axi = true, + .flags =RESET_AXI , .larbid_remap = {0 ,4 ,5 ,6 ,7 ,2 ,3 ,1 }, };drivers/iommu/mtk_iommu.h +0
-0@@ -17,6 +17,15 @@#include <linux/spinlock.h>
drivers/iommu/mtk_iommu.h line 27
Quoted 10 lines
drivers/iommu/mtk_iommu.h +8
-0#include <soc/mediatek/smi.h> +#define HAS_4GB_MODE BIT(0) +/* HW will use the EMI clock if there isn't the "bclk". */ +#define HAS_BCLK BIT(1) +#define HAS_VLD_PA_RNG BIT(2) +#define RESET_AXI BIT(3) + +#define MTK_IOMMU_HAS_FLAG (pdata, _x) \ + ((((pdata)->flags) & (_x)) == (_x))
If these definitions are not used in mtk_iommu_v1.c(also no this plan), then we can put them in the mtk_iommu.c.
BTW, the patch title "modify the usage of mtk_iommu_plat_data structure" isn't so clear, we could write what the detailed modification is. something like:
iommu/mediatek: Use a u32 flags to describe different HW features
Quoted 18 lines
drivers/iommu/mtk_iommu.h +2
-6+struct mtk_iommu_suspend_reg {u32 misc_ctrl;u32 dcm_dis;@@ -36,12 +45,7 @@ enum mtk_iommu_plat {struct mtk_iommu_plat_data {enum mtk_iommu_plat m4u_plat; -bool has_4gb_mode; - -/* HW will use the EMI clock if there isn't the "bclk". */ -bool has_bclk; -bool has_vld_pa_rng; -bool reset_axi; +u32 flags;unsigned char larbid_remap[MTK_LARB_NR_MAX ]; };
Re: [PATCH v5 03/10] iommu/mediatek: Modify the usage of mtk_iommu_plat_data structure
Quoted 16 lines · Yong Wu
Hi Chao,
This is also ok for me. Only two format nitpick.
Quoted 8 lines · Chao Hao
Given the fact that we are adding more and more
plat_databool values, it would make sense to use a u32 flags register and add the appropriate macro definitions to set and check for a flag present.
No functional change.Suggested-by Matthias Brugger <[email protected]>Signed-off-by Chao Hao <[email protected]>---
[snip]
Quoted 10 lines
drivers/iommu/mtk_iommu.c static const struct dev_pm_ops mtk_iommu_pm_ops = { · line 769
Quoted 8 lines
static const struct
mtk_iommu_plat_datamt2712_data= {drivers/iommu/mtk_iommu.c +3
-3.m4u_plat = M4U_MT2712, - .has_4gb_mode = true, - .has_bclk = true, - .has_vld_pa_rng = true, + .flags =HAS_4GB_MODE | +HAS_BCLK | + HAS_VLD_PA_RNG,short enough. we can put it in one line?
ok, I will try to put it in one line in next version, thanks
Quoted 30 lines
Quoted 30 lines
drivers/iommu/mtk_iommu.c +4
-4.larbid_remap = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, };static const struct mtk_iommu_plat_data mt8173_data = { .m4u_plat =M4U_MT8173 , - .has_4gb_mode = true, - .has_bclk = true, - .reset_axi = true, + .flags =HAS_4GB_MODE | +HAS_BCLK | +RESET_AXI , .larbid_remap = {0 ,1 ,2 ,3 ,4 ,5 },/* Linear mapping. */ };static const struct mtk_iommu_plat_data mt8183_data = { .m4u_plat =M4U_MT8183 , - .reset_axi = true, + .flags =RESET_AXI , .larbid_remap = {0 ,4 ,5 ,6 ,7 ,2 ,3 ,1 }, };drivers/iommu/mtk_iommu.h +0
-0@@ -17,6 +17,15 @@#include <linux/spinlock.h> #include <soc/mediatek/smi.h>
Quoted 12 lines
drivers/iommu/mtk_iommu.h line 27
Quoted 8 lines
drivers/iommu/mtk_iommu.h +8
-0+#define HAS_4GB_MODE BIT(0) +/* HW will use the EMI clock if there isn't the "bclk". */ +#define HAS_BCLK BIT(1) +#define HAS_VLD_PA_RNG BIT(2) +#define RESET_AXI BIT(3) + +#define MTK_IOMMU_HAS_FLAG (pdata, _x) \ + ((((pdata)->flags) & (_x)) == (_x))If these definitions are not used in
mtk_iommu_v1.c(also no this plan), then we can put them in themtk_iommu.c.
ok, mtk_iommu_v1.c doesn't use these definitions. I will move them to mtk_iommu.c in next version, thanks.
Quoted 6 lines
BTW, the patch title "modify the usage of
mtk_iommu_plat_datastructure" isn't so clear, we could write what the detailed modification is. something like:
iommu/mediatek: Use a u32 flags to describe different HW features
got it , thanks for you advice.
Quoted 20 lines
Quoted 18 lines
drivers/iommu/mtk_iommu.h +2
-6+struct mtk_iommu_suspend_reg {u32 misc_ctrl;u32 dcm_dis;@@ -36,12 +45,7 @@ enum mtk_iommu_plat {struct mtk_iommu_plat_data {enum mtk_iommu_plat m4u_plat; -bool has_4gb_mode; - -/* HW will use the EMI clock if there isn't the "bclk". */ -bool has_bclk; -bool has_vld_pa_rng; -bool reset_axi; +u32 flags;unsigned char larbid_remap[MTK_LARB_NR_MAX ]; };
PATCH v5 4/10 iommu/mediatek: Setting MISC_CTRL register
In reply to Chao HaoAdd F_MMU_IN_ORDER_WR_EN and F_MMU_STANDARD_AXI_MODE_BIT definition in MISC_CTRL register.F_MMU_STANDARD_AXI_MODE_BIT:
If we set F_MMU_STANDARD_AXI_MODE_BIT(bit[3][19] = 0, not follow
standard AXI protocol), iommu will send urgent read command firstly compare with normal read command to improve performance. F_MMU_IN_ORDER_WR_EN:
If we set F_MMU_IN_ORDER_WR_EN(bit[1][17] = 0, out-of-order write), iommu
will re-order write command and send more higher priority write command instead of sending write command in order. The feature be controlled by OUT_ORDER_EN macro definition.
--- drivers/iommu/mtk_iommu.c | 12 +++++++++++- drivers/iommu/mtk_iommu.h | 1 + 2 files changed, 12 insertions(+), 1 deletion(-)
drivers/iommu/mtk_iommu.c +11 -1
@@ -42,6 +42,9 @@#define F_INVLD_EN1 BIT(1)#define REG_MMU_MISC_CTRL 0x048 +#define F_MMU_IN_ORDER_WR_EN (BIT(1) | BIT(17)) +#define F_MMU_STANDARD_AXI_MODE_BIT (BIT(3) | BIT(19)) +#define REG_MMU_DCM_DIS 0x050#define REG_MMU_CTRL_REG 0x110
@@ -574,10 +577,17 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) }writel_relaxed (0 , data->base +REG_MMU_DCM_DIS ); + regval =readl_relaxed (data->base +REG_MMU_MISC_CTRL );if (MTK_IOMMU_HAS_FLAG (data->plat_data,RESET_AXI )) {/* The register is called STANDARD_AXI_MODE in this case */ -writel_relaxed (0 , data->base +REG_MMU_MISC_CTRL ); + regval =0 ; + }else { +/* For mm_iommu, it can improve performance by the setting */ + regval &= ~F_MMU_STANDARD_AXI_MODE_BIT ; +if (MTK_IOMMU_HAS_FLAG (data->plat_data,OUT_ORDER_EN )) + regval &= ~F_MMU_IN_ORDER_WR_EN ; } +writel_relaxed (regval, data->base +REG_MMU_MISC_CTRL );if (devm_request_irq (data->dev, data->irq, mtk_iommu_isr,0 ,dev_name (data->dev), (void *)data)) {
drivers/iommu/mtk_iommu.h +1 -0
@@ -22,6 +22,7 @@#define HAS_BCLK BIT(1)#define HAS_VLD_PA_RNG BIT(2)#define RESET_AXI BIT(3) +#define OUT_ORDER_EN BIT(4)#define MTK_IOMMU_HAS_FLAG (pdata, _x) \ ((((pdata)->flags) & (_x)) == (_x))
Signature · 5 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Matthias Brugger
maintainerRe: [PATCH v5 04/10] iommu/mediatek: Setting MISC_CTRL register
Quoted 6 lines · Chao Hao
Add
F_MMU_IN_ORDER_WR_ENandF_MMU_STANDARD_AXI_MODE_BITdefinition inMISC_CTRLregister.F_MMU_STANDARD_AXI_MODE_BIT:
If we set F_MMU_STANDARD_AXI_MODE_BIT(bit[3][19] = 0, not follow
standard AXI protocol), iommu will send urgent read command firstly compare with normal read command to improve performance.
Can you please help me to understand the phrase. Sorry I'm not a AXI specialist. Does this mean that you will send a 'urgent read command' which is not described in the specifications instead of a normal read command?
Quoted 19 lines
F_MMU_IN_ORDER_WR_EN:
If we setF_MMU_IN_ORDER_WR_EN(bit[1][17] = 0, out-of-order write), iommu
will re-order write command and send more higher priority write command instead of sending write command in order. The feature be controlled byOUT_ORDER_ENmacro definition.Cc Matthias Brugger <[email protected]>Suggested-by Yong Wu <[email protected]>Signed-off-by Chao Hao <[email protected]>--- drivers/iommu/mtk_iommu.c | 12 +++++++++++- drivers/iommu/mtk_iommu.h | 1 + 2 files changed, 12 insertions(+), 1 deletion(-)drivers/iommu/mtk_iommu.c +0
-0
drivers/iommu/mtk_iommu.c line 46
Quoted 5 lines
drivers/iommu/mtk_iommu.c +2
-0@@ -42,6 +42,9 @@#define F_INVLD_EN1 BIT(1)#define REG_MMU_MISC_CTRL 0x048 +#define F_MMU_IN_ORDER_WR_EN (BIT(1) | BIT(17)) +#define F_MMU_STANDARD_AXI_MODE_BIT (BIT(3) | BIT(19))
Wouldn't it make more sense to name it F_MMU_STANDARD_AXI_MODE_EN?
drivers/iommu/mtk_iommu.c static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) · line 580
Quoted 9 lines
drivers/iommu/mtk_iommu.c +2
-0+#define REG_MMU_DCM_DIS 0x050#define REG_MMU_CTRL_REG 0x110@@ -574,10 +577,17 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) }writel_relaxed (0 , data->base +REG_MMU_DCM_DIS ); + regval =readl_relaxed (data->base +REG_MMU_MISC_CTRL );
We only need to read regval in the else branch.
Quoted 19 lines
drivers/iommu/mtk_iommu.c +7
-1if (MTK_IOMMU_HAS_FLAG (data->plat_data,RESET_AXI )) {/* The register is called STANDARD_AXI_MODE in this case */ -writel_relaxed (0 , data->base +REG_MMU_MISC_CTRL ); + regval =0 ; + }else { +/* For mm_iommu, it can improve performance by the setting */ + regval &= ~F_MMU_STANDARD_AXI_MODE_BIT ; +if (MTK_IOMMU_HAS_FLAG (data->plat_data,OUT_ORDER_EN )) + regval &= ~F_MMU_IN_ORDER_WR_EN ; } +writel_relaxed (regval, data->base +REG_MMU_MISC_CTRL );if (devm_request_irq (data->dev, data->irq, mtk_iommu_isr,0 ,dev_name (data->dev), (void *)data)) {drivers/iommu/mtk_iommu.h +0
-0
drivers/iommu/mtk_iommu.h line 25
Quoted 4 lines
drivers/iommu/mtk_iommu.h +1
-0@@ -22,6 +22,7 @@#define HAS_BCLK BIT(1)#define HAS_VLD_PA_RNG BIT(2)#define RESET_AXI BIT(3) +#define OUT_ORDER_EN BIT(4)
Maybe something like OUT_ORDER_WR_EN, to make clear that it's about the the write path.
drivers/iommu/mtk_iommu.h
Quoted 4 lines
drivers/iommu/mtk_iommu.h +0
-0#define MTK_IOMMU_HAS_FLAG (pdata, _x) \ ((((pdata)->flags) & (_x)) == (_x))
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v5 04/10] iommu/mediatek: Setting MISC_CTRL register
Quoted 9 lines · Matthias Brugger
Quoted 6 lines · Chao Hao
Add
F_MMU_IN_ORDER_WR_ENandF_MMU_STANDARD_AXI_MODE_BITdefinition inMISC_CTRLregister.F_MMU_STANDARD_AXI_MODE_BIT:
If we set F_MMU_STANDARD_AXI_MODE_BIT(bit[3][19] = 0, not follow
standard AXI protocol), iommu will send urgent read command firstly compare with normal read command to improve performance.
Quoted 3 lines
Can you please help me to understand the phrase. Sorry I'm not a AXI specialist. Does this mean that you will send a 'urgent read command' which is not described in the specifications instead of a normal read command?
ok.
iommu sends read command to next bus_node normally(we can name it to cmd1), when cmd1 isn't handled by next bus_node, iommu has a urgent read command is needed to be sent(we can name it to cmd2), iommu will send cmd2 and replace cmd1. So cmd2 is handled by next bus_node firstly and cmd2 will be handled secondly.
But for standard AXI protocol, it will ignore the priority of read command and only be handled in order. So cmd2 is handled by next bus_node after cmd1 is done.
Quoted 22 lines
Quoted 22 lines
F_MMU_IN_ORDER_WR_EN:
If we setF_MMU_IN_ORDER_WR_EN(bit[1][17] = 0, out-of-order write), iommu
will re-order write command and send more higher priority write command instead of sending write command in order. The feature be controlled byOUT_ORDER_ENmacro definition.Cc Matthias Brugger <[email protected]>Suggested-by Yong Wu <[email protected]>Signed-off-by Chao Hao <[email protected]>--- drivers/iommu/mtk_iommu.c | 12 +++++++++++- drivers/iommu/mtk_iommu.h | 1 + 2 files changed, 12 insertions(+), 1 deletion(-)drivers/iommu/mtk_iommu.c +0
-0@@ -42,6 +42,9 @@#define F_INVLD_EN1 BIT(1)
Quoted 5 lines
drivers/iommu/mtk_iommu.c line 46
Quoted 3 lines
drivers/iommu/mtk_iommu.c +2
-0#define REG_MMU_MISC_CTRL 0x048 +#define F_MMU_IN_ORDER_WR_EN (BIT(1) | BIT(17)) +#define F_MMU_STANDARD_AXI_MODE_BIT (BIT(3) | BIT(19))Wouldn't it make more sense to name it
F_MMU_STANDARD_AXI_MODE_EN?
ok, you are right.
1'b1: follow standard axi protocol
Quoted 4 lines
Quoted 4 lines
drivers/iommu/mtk_iommu.c +1
-0+#define REG_MMU_DCM_DIS 0x050
Quoted 8 lines
drivers/iommu/mtk_iommu.c static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) · line 580
Quoted 6 lines
drivers/iommu/mtk_iommu.c +1
-0#define REG_MMU_CTRL_REG 0x110@@ -574,10 +577,17 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) }writel_relaxed (0 , data->base +REG_MMU_DCM_DIS ); + regval =readl_relaxed (data->base +REG_MMU_MISC_CTRL );We only need to read regval in the else branch.
ok, I got it. thanks
Quoted 13 lines
Quoted 13 lines
drivers/iommu/mtk_iommu.c +7
-1if (MTK_IOMMU_HAS_FLAG (data->plat_data,RESET_AXI )) {/* The register is called STANDARD_AXI_MODE in this case */ -writel_relaxed (0 , data->base +REG_MMU_MISC_CTRL ); + regval =0 ; + }else { +/* For mm_iommu, it can improve performance by the setting */ + regval &= ~F_MMU_STANDARD_AXI_MODE_BIT ; +if (MTK_IOMMU_HAS_FLAG (data->plat_data,OUT_ORDER_EN )) + regval &= ~F_MMU_IN_ORDER_WR_EN ; } +writel_relaxed (regval, data->base +REG_MMU_MISC_CTRL );
Quoted 15 lines
drivers/iommu/mtk_iommu.h line 25
Quoted 11 lines
drivers/iommu/mtk_iommu.c +0
-0if (devm_request_irq (data->dev, data->irq, mtk_iommu_isr,0 ,dev_name (data->dev), (void *)data)) {drivers/iommu/mtk_iommu.h +1
-0@@ -22,6 +22,7 @@#define HAS_BCLK BIT(1)#define HAS_VLD_PA_RNG BIT(2)#define RESET_AXI BIT(3) +#define OUT_ORDER_EN BIT(4)Maybe something like
OUT_ORDER_WR_EN, to make clear that it's about the the write path.
ok, thanks for your advice.
Quoted 4 lines
Quoted 4 lines
drivers/iommu/mtk_iommu.h +0
-0#define MTK_IOMMU_HAS_FLAG (pdata, _x) \ ((((pdata)->flags) & (_x)) == (_x))
Matthias Brugger
maintainerRe: [PATCH v5 04/10] iommu/mediatek: Setting MISC_CTRL register
Quoted 14 lines · chao hao
Quoted 9 lines · Matthias Brugger
Quoted 6 lines · Chao Hao
Add
F_MMU_IN_ORDER_WR_ENandF_MMU_STANDARD_AXI_MODE_BITdefinition inMISC_CTRLregister.F_MMU_STANDARD_AXI_MODE_BIT:
If we set F_MMU_STANDARD_AXI_MODE_BIT(bit[3][19] = 0, not follow
standard AXI protocol), iommu will send urgent read command firstly compare with normal read command to improve performance.Quoted 3 lines
Can you please help me to understand the phrase. Sorry I'm not a AXI specialist. Does this mean that you will send a 'urgent read command' which is not described in the specifications instead of a normal read command?
Quoted 10 lines
ok.
iommu sends read command to nextbus_nodenormally(we can name it to cmd1), when cmd1 isn't handled by nextbus_node, iommu has a urgent read command is needed to be sent(we can name it to cmd2), iommu will send cmd2 and replace cmd1. So cmd2 is handled by nextbus_nodefirstly and cmd2 will be handled secondly.
But for standard AXI protocol, it will ignore the priority of read command and only be handled in order. So cmd2 is handled by nextbus_nodeafter cmd1 is done.
Thanks. So I propose change this part of the commit message to something like:F_MMU_STANDARD_AXI_MODE_BIT:
If we set F_MMU_STANDARD_AXI_MODE_EN_MASK (bit[3][19] = 0, not follow standard AXI protocol), the iommu will priorize sending of urgent read command over a normal read command. This improves the performance.
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
F_MMU_IN_ORDER_WR_EN:
If we setF_MMU_IN_ORDER_WR_EN(bit[1][17] = 0, out-of-order write), iommu
will re-order write command and send more higher priority write command instead of sending write command in order. The feature be controlled byOUT_ORDER_ENmacro definition.
F_MMU_IN_ORDER_WR_EN:
If we set F_MMU_IN_ORDER_WR_EN_MASK (bit[1][17] = 0, out-of-order write), the iommu will re-order write commands and send the write command with higher priority. Otherwise the sending of write commands will be done in order. The feature is controlled by OUT_ORDER_WR_EN platform data flag.
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
Cc Matthias Brugger <[email protected]>Suggested-by Yong Wu <[email protected]>Signed-off-by Chao Hao <[email protected]>--- drivers/iommu/mtk_iommu.c | 12 +++++++++++- drivers/iommu/mtk_iommu.h | 1 + 2 files changed, 12 insertions(+), 1 deletion(-)drivers/iommu/mtk_iommu.c +0
-0@@ -42,6 +42,9 @@#define F_INVLD_EN1 BIT(1)
Quoted 8 lines
Quoted 5 lines
drivers/iommu/mtk_iommu.c line 46
Quoted 3 lines
drivers/iommu/mtk_iommu.c +2
-0#define REG_MMU_MISC_CTRL 0x048 +#define F_MMU_IN_ORDER_WR_EN (BIT(1) | BIT(17)) +#define F_MMU_STANDARD_AXI_MODE_BIT (BIT(3) | BIT(19))Wouldn't it make more sense to name it
F_MMU_STANDARD_AXI_MODE_EN?ok, you are right.
1'b1: follow standard axi protocol
What aboutF_MMU_IN_ORDER_WR_EN_MASKF_MMU_STANDARD_AXI_MODE_EN_MASK
Background is that we have to set/unset two bits to enable or disable the feature, so it's a mask we have to apply to the register.
Regards,
Matthias
Quoted 50 lines
Quoted 4 lines
Quoted 4 lines
drivers/iommu/mtk_iommu.c +1
-0+#define REG_MMU_DCM_DIS 0x050Quoted 8 lines
drivers/iommu/mtk_iommu.c static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) · line 580
Quoted 6 lines
drivers/iommu/mtk_iommu.c +1
-0#define REG_MMU_CTRL_REG 0x110@@ -574,10 +577,17 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) }writel_relaxed (0 , data->base +REG_MMU_DCM_DIS ); + regval =readl_relaxed (data->base +REG_MMU_MISC_CTRL );We only need to read regval in the else branch.
ok, I got it. thanks
Quoted 13 lines
Quoted 13 lines
drivers/iommu/mtk_iommu.c +7
-1if (MTK_IOMMU_HAS_FLAG (data->plat_data,RESET_AXI )) {/* The register is called STANDARD_AXI_MODE in this case */ -writel_relaxed (0 , data->base +REG_MMU_MISC_CTRL ); + regval =0 ; + }else { +/* For mm_iommu, it can improve performance by the setting */ + regval &= ~F_MMU_STANDARD_AXI_MODE_BIT ; +if (MTK_IOMMU_HAS_FLAG (data->plat_data,OUT_ORDER_EN )) + regval &= ~F_MMU_IN_ORDER_WR_EN ; } +writel_relaxed (regval, data->base +REG_MMU_MISC_CTRL );Quoted 15 lines
drivers/iommu/mtk_iommu.h line 25
Quoted 11 lines
drivers/iommu/mtk_iommu.c +0
-0if (devm_request_irq (data->dev, data->irq, mtk_iommu_isr,0 ,dev_name (data->dev), (void *)data)) {drivers/iommu/mtk_iommu.h +1
-0@@ -22,6 +22,7 @@#define HAS_BCLK BIT(1)#define HAS_VLD_PA_RNG BIT(2)#define RESET_AXI BIT(3) +#define OUT_ORDER_EN BIT(4)Maybe something like
OUT_ORDER_WR_EN, to make clear that it's about the the write path.ok, thanks for your advice.
Quoted 4 lines
Quoted 4 lines
drivers/iommu/mtk_iommu.h +0
-0#define MTK_IOMMU_HAS_FLAG (pdata, _x) \ ((((pdata)->flags) & (_x)) == (_x))
Re: [PATCH v5 04/10] iommu/mediatek: Setting MISC_CTRL register
Quoted 27 lines · Matthias Brugger
Quoted 14 lines · chao hao
Quoted 9 lines · Matthias Brugger
Quoted 6 lines · Chao Hao
Add
F_MMU_IN_ORDER_WR_ENandF_MMU_STANDARD_AXI_MODE_BITdefinition inMISC_CTRLregister.F_MMU_STANDARD_AXI_MODE_BIT:
If we set F_MMU_STANDARD_AXI_MODE_BIT(bit[3][19] = 0, not follow
standard AXI protocol), iommu will send urgent read command firstly compare with normal read command to improve performance.Quoted 3 lines
Can you please help me to understand the phrase. Sorry I'm not a AXI specialist. Does this mean that you will send a 'urgent read command' which is not described in the specifications instead of a normal read command?
Quoted 10 lines
ok.
iommu sends read command to nextbus_nodenormally(we can name it to cmd1), when cmd1 isn't handled by nextbus_node, iommu has a urgent read command is needed to be sent(we can name it to cmd2), iommu will send cmd2 and replace cmd1. So cmd2 is handled by nextbus_nodefirstly and cmd2 will be handled secondly.
But for standard AXI protocol, it will ignore the priority of read command and only be handled in order. So cmd2 is handled by nextbus_nodeafter cmd1 is done.
Quoted 6 lines
Thanks. So I propose change this part of the commit message to something like:
F_MMU_STANDARD_AXI_MODE_BIT:
If we setF_MMU_STANDARD_AXI_MODE_EN_MASK(bit[3][19] = 0, not follow standard AXI protocol), the iommu will priorize sending of urgent read command over a normal read command. This improves the performance.
ok, thanks
Quoted 39 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
F_MMU_IN_ORDER_WR_EN:
If we setF_MMU_IN_ORDER_WR_EN(bit[1][17] = 0, out-of-order write), iommu
will re-order write command and send more higher priority write command instead of sending write command in order. The feature be controlled byOUT_ORDER_ENmacro definition.
F_MMU_IN_ORDER_WR_EN:
If we setF_MMU_IN_ORDER_WR_EN_MASK(bit[1][17] = 0, out-of-order write), the iommu will re-order write commands and send the write command with higher priority. Otherwise the sending of write commands will be done in order. The feature is controlled byOUT_ORDER_WR_ENplatform data flag.Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
Cc Matthias Brugger <[email protected]>Suggested-by Yong Wu <[email protected]>Signed-off-by Chao Hao <[email protected]>--- drivers/iommu/mtk_iommu.c | 12 +++++++++++- drivers/iommu/mtk_iommu.h | 1 + 2 files changed, 12 insertions(+), 1 deletion(-)drivers/iommu/mtk_iommu.c +0
-0@@ -42,6 +42,9 @@#define F_INVLD_EN1 BIT(1)Quoted 8 lines
Quoted 5 lines
drivers/iommu/mtk_iommu.c line 46
Quoted 3 lines
drivers/iommu/mtk_iommu.c +2
-0#define REG_MMU_MISC_CTRL 0x048 +#define F_MMU_IN_ORDER_WR_EN (BIT(1) | BIT(17)) +#define F_MMU_STANDARD_AXI_MODE_BIT (BIT(3) | BIT(19))Wouldn't it make more sense to name it
F_MMU_STANDARD_AXI_MODE_EN?ok, you are right.
1'b1: follow standard axi protocol
Quoted 7 lines
What about
F_MMU_IN_ORDER_WR_EN_MASKF_MMU_STANDARD_AXI_MODE_EN_MASKBackground is that we have to set/unset two bits to enable or disable the feature, so it's a mask we have to apply to the register.
ok, thanks for your advice
Quoted 53 lines
Regards,
MatthiasQuoted 50 lines
Quoted 4 lines
Quoted 4 lines
drivers/iommu/mtk_iommu.c +1
-0+#define REG_MMU_DCM_DIS 0x050Quoted 8 lines
drivers/iommu/mtk_iommu.c static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) · line 580
Quoted 6 lines
drivers/iommu/mtk_iommu.c +1
-0#define REG_MMU_CTRL_REG 0x110@@ -574,10 +577,17 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) }writel_relaxed (0 , data->base +REG_MMU_DCM_DIS ); + regval =readl_relaxed (data->base +REG_MMU_MISC_CTRL );We only need to read regval in the else branch.
ok, I got it. thanks
Quoted 13 lines
Quoted 13 lines
drivers/iommu/mtk_iommu.c +7
-1if (MTK_IOMMU_HAS_FLAG (data->plat_data,RESET_AXI )) {/* The register is called STANDARD_AXI_MODE in this case */ -writel_relaxed (0 , data->base +REG_MMU_MISC_CTRL ); + regval =0 ; + }else { +/* For mm_iommu, it can improve performance by the setting */ + regval &= ~F_MMU_STANDARD_AXI_MODE_BIT ; +if (MTK_IOMMU_HAS_FLAG (data->plat_data,OUT_ORDER_EN )) + regval &= ~F_MMU_IN_ORDER_WR_EN ; } +writel_relaxed (regval, data->base +REG_MMU_MISC_CTRL );Quoted 15 lines
drivers/iommu/mtk_iommu.h line 25
Quoted 11 lines
drivers/iommu/mtk_iommu.c +0
-0if (devm_request_irq (data->dev, data->irq, mtk_iommu_isr,0 ,dev_name (data->dev), (void *)data)) {drivers/iommu/mtk_iommu.h +1
-0@@ -22,6 +22,7 @@#define HAS_BCLK BIT(1)#define HAS_VLD_PA_RNG BIT(2)#define RESET_AXI BIT(3) +#define OUT_ORDER_EN BIT(4)Maybe something like
OUT_ORDER_WR_EN, to make clear that it's about the the write path.ok, thanks for your advice.
Quoted 4 lines
Quoted 4 lines
drivers/iommu/mtk_iommu.h +0
-0#define MTK_IOMMU_HAS_FLAG (pdata, _x) \ ((((pdata)->flags) & (_x)) == (_x))
PATCH v5 5/10 iommu/mediatek: Move inv_sel_reg into the plat_data
In reply to Chao HaoFor mt6779, MMU_INV_SEL register's offset is changed from 0x38 to 0x2c, so we can put inv_sel_reg in the plat_data to use it.
In addition, we renamed it to REG_MMU_INV_SEL_GEN1 and use it before mt6779.
--- drivers/iommu/mtk_iommu.c | 9 ++++++--- drivers/iommu/mtk_iommu.h | 1 + 2 files changed, 7 insertions(+), 3 deletions(-)
drivers/iommu/mtk_iommu.c +6 -3
@@ -37,7 +37,7 @@#define REG_MMU_INVLD_START_A 0x024#define REG_MMU_INVLD_END_A 0x028 -#define REG_MMU_INV_SEL 0x038 +#define REG_MMU_INV_SEL_GEN1 0x038#define F_INVLD_EN0 BIT(0)#define F_INVLD_EN1 BIT(1)
@@ -168,7 +168,7 @@ static void mtk_iommu_tlb_flush_all(void *cookie)for_each_m4u (data) {writel_relaxed (F_INVLD_EN1 |F_INVLD_EN0 , - data->base +REG_MMU_INV_SEL ); + data->base + data->plat_data->inv_sel_reg);writel_relaxed (F_ALL_INVLD , data->base +REG_MMU_INVALIDATE );wmb ();/* Make sure the tlb flush all done */ }
@@ -185,7 +185,7 @@ static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size,for_each_m4u (data) {spin_lock_irqsave (&data->tlb_lock, flags);writel_relaxed (F_INVLD_EN1 |F_INVLD_EN0 , - data->base +REG_MMU_INV_SEL ); + data->base + data->plat_data->inv_sel_reg);writel_relaxed (iova, data->base +REG_MMU_INVLD_START_A ); writel_relaxed(iova + size - 1,
@@ -777,6 +777,7 @@ static const struct mtk_iommu_plat_data mt2712_data = { .flags = HAS_4GB_MODE | HAS_BCLK | HAS_VLD_PA_RNG, + .inv_sel_reg = REG_MMU_INV_SEL_GEN1, .larbid_remap = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, };
@@ -785,12 +786,14 @@ static const struct mtk_iommu_plat_data mt8173_data = { .flags = HAS_4GB_MODE | HAS_BCLK | RESET_AXI, + .inv_sel_reg = REG_MMU_INV_SEL_GEN1, .larbid_remap = {0, 1, 2, 3, 4, 5}, /* Linear mapping. */ };static const struct mtk_iommu_plat_data mt8183_data = { .m4u_plat =M4U_MT8183 , .flags =RESET_AXI , + .inv_sel_reg =REG_MMU_INV_SEL_GEN1 , .larbid_remap = {0 ,4 ,5 ,6 ,7 ,2 ,3 ,1 }, };
drivers/iommu/mtk_iommu.h +1 -0
@@ -47,6 +47,7 @@ enum mtk_iommu_plat {struct mtk_iommu_plat_data {enum mtk_iommu_plat m4u_plat;u32 flags; +u32 inv_sel_reg;unsigned char larbid_remap[MTK_LARB_NR_MAX ]; };
Signature · 5 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v5 6/10 iommu/mediatek: Add sub_comm id in translation fault
In reply to Chao HaoThe max larb number that a iommu HW support is 8(larb0~larb7 in the below diagram).
If the larb's number is over 8, we use a sub_common for merging several larbs into one larb. At this case, we will extend larb_id:
bit[11:9] means common-id;
bit[8:7] means subcommon-id;
From these two variables, we could get the real larb number when translation fault happen.
The diagram is as below:
EMI
|
IOMMU
|
-----------------
| |
common1 common0
| |
-----------------
|
smi common
|
------------------------------------
| | | | | |
3'd0 3'd1 3'd2 3'd3 ... 3'd7 <-common_id(max is 8)
| | | | | |
Larb0 Larb1 | Larb3 ... Larb7
|
smi sub common
|
--------------------------
| | | |
2'd0 2'd1 2'd2 2'd3 <-sub_common_id(max is 4)
| | | |Larb8 Larb9 Larb10 Larb11
In this patch we extend larb_remap[] to larb_remap[8][4] for this. larb_remap[x][y]: x means common-id above, y means subcommon_id above.
We can also distinguish if the M4U HW has sub_common by HAS_SUB_COMM macro.
--- drivers/iommu/mtk_iommu.c | 20 +++++++++++++------- drivers/iommu/mtk_iommu.h | 3 ++- include/soc/mediatek/smi.h | 2 ++ 3 files changed, 17 insertions(+), 8 deletions(-)
drivers/iommu/mtk_iommu.c +13 -7
@@ -91,6 +91,8 @@#define REG_MMU1_INVLD_PA 0x148#define REG_MMU0_INT_ID 0x150#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)
@@ -229,7 +231,7 @@ static irqreturn_t mtk_iommu_isr(int irq, void *dev_id)struct mtk_iommu_data *data = dev_id;struct mtk_iommu_domain *dom = data->m4u_dom;u32 int_state, regval, fault_iova, fault_pa; -unsigned int fault_larb, fault_port; +unsigned int fault_larb, fault_port, sub_comm =0 ;bool layer, write;/* Read error info from registers */
@@ -245,10 +247,14 @@ static irqreturn_t mtk_iommu_isr(int irq, void *dev_id) } layer = fault_iova &F_MMU_FAULT_VA_LAYER_BIT ; write = fault_iova &F_MMU_FAULT_VA_WRITE_BIT ; - fault_larb =F_MMU_INT_ID_LARB_ID (regval); fault_port =F_MMU_INT_ID_PORT_ID (regval); - - fault_larb = data->plat_data->larbid_remap[fault_larb]; +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 = data->plat_data->larbid_remap[fault_larb][sub_comm];if (report_iommu_fault (&dom->domain, data->dev, fault_iova, write ?IOMMU_FAULT_WRITE :IOMMU_FAULT_READ )) {
@@ -778,7 +784,7 @@ static const struct mtk_iommu_plat_data mt2712_data = {HAS_BCLK | HAS_VLD_PA_RNG, .inv_sel_reg = REG_MMU_INV_SEL_GEN1, - .larbid_remap = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, + .larbid_remap = {{0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}}, };static const struct mtk_iommu_plat_data mt8173_data = {
@@ -787,14 +793,14 @@ static const struct mtk_iommu_plat_data mt8173_data = {HAS_BCLK | RESET_AXI, .inv_sel_reg = REG_MMU_INV_SEL_GEN1, - .larbid_remap = {0, 1, 2, 3, 4, 5}, /* Linear mapping. */ + .larbid_remap = {{0}, {1}, {2}, {3}, {4}, {5}}, /* Linear mapping. */ };static const struct mtk_iommu_plat_data mt8183_data = { .m4u_plat =M4U_MT8183 , .flags =RESET_AXI , .inv_sel_reg =REG_MMU_INV_SEL_GEN1 , - .larbid_remap = {0 ,4 ,5 ,6 ,7 ,2 ,3 ,1 }, + .larbid_remap = {{0 }, {4 }, {5 }, {6 }, {7 }, {2 }, {3 }, {1 }}, };static const struct of_device_id mtk_iommu_of_ids[] = {
drivers/iommu/mtk_iommu.h +2 -1
@@ -23,6 +23,7 @@#define HAS_VLD_PA_RNG BIT(2)#define RESET_AXI BIT(3)#define OUT_ORDER_EN BIT(4) +#define HAS_SUB_COMM BIT(5)#define MTK_IOMMU_HAS_FLAG (pdata, _x) \ ((((pdata)->flags) & (_x)) == (_x))
@@ -48,7 +49,7 @@ struct mtk_iommu_plat_data {enum mtk_iommu_plat m4u_plat;u32 flags;u32 inv_sel_reg; -unsigned char larbid_remap[MTK_LARB_NR_MAX ]; +unsigned char larbid_remap[MTK_LARB_COM_MAX ][MTK_LARB_SUBCOM_MAX ]; };struct mtk_iommu_domain ;
include/soc/mediatek/smi.h +2 -0
@@ -12,6 +12,8 @@#ifdef CONFIG_MTK_SMI #define MTK_LARB_NR_MAX 16 +#define MTK_LARB_COM_MAX 8 +#define MTK_LARB_SUBCOM_MAX 4#define MTK_SMI_MMU_EN (port) BIT(port)
Signature · 5 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerRe: [PATCH v5 06/10] iommu/mediatek: Add sub_comm id in translation fault
Quoted 49 lines · Chao Hao
The max larb number that a iommu HW support is 8(larb0~larb7 in the below diagram).
If the larb's number is over 8, we use asub_commonfor merging several larbs into one larb. At this case, we will extendlarb_id:
bit[11:9] means common-id;
bit[8:7] means subcommon-id;
From these two variables, we could get the real larb number when translation fault happen.
The diagram is as below:EMI | IOMMU | ----------------- | | common1 common0 | | ----------------- | smi common | ------------------------------------ | | | | | | 3'd0 3'd1 3'd2 3'd3 ... 3'd7 <-common_id(max is 8) | | | | | | Larb0 Larb1 | Larb3 ... Larb7 | smi sub common | -------------------------- | | | | 2'd0 2'd1 2'd2 2'd3 <-sub_common_id(max is 4) | | | |Larb8 Larb9 Larb10 Larb11
In this patch we extend larb_remap[] to larb_remap[8][4] for this. larb_remap[x][y]: x means common-id above, y means
subcommon_idabove.We can also distinguish if the M4U HW has
sub_commonbyHAS_SUB_COMMmacro.Cc Matthias Brugger <[email protected]>Signed-off-by Chao Hao <[email protected]>Reviewed-by Yong Wu <[email protected]>--- drivers/iommu/mtk_iommu.c | 20 +++++++++++++------- drivers/iommu/mtk_iommu.h | 3 ++- include/soc/mediatek/smi.h | 2 ++ 3 files changed, 17 insertions(+), 8 deletions(-)
[snip]
Quoted 14 lines
drivers/iommu/mtk_iommu.h +1
-1@@ -48,7 +49,7 @@ struct mtk_iommu_plat_data {enum mtk_iommu_plat m4u_plat;u32 flags;u32 inv_sel_reg; -unsigned char larbid_remap[MTK_LARB_NR_MAX ]; +unsigned char larbid_remap[MTK_LARB_COM_MAX ][MTK_LARB_SUBCOM_MAX ]; };struct mtk_iommu_domain ;include/soc/mediatek/smi.h +0
-0
include/soc/mediatek/smi.h line 16
Quoted 5 lines
include/soc/mediatek/smi.h +2
-0@@ -12,6 +12,8 @@#ifdef CONFIG_MTK_SMI #define MTK_LARB_NR_MAX 16 +#define MTK_LARB_COM_MAX 8 +#define MTK_LARB_SUBCOM_MAX 4
Both are only used in mtk_iommu.h, and I don't think smi has plan to use them. thus we could move them into mtk_iommu.h
Quoted 3 lines
include/soc/mediatek/smi.h +0
-0#define MTK_SMI_MMU_EN (port) BIT(port)
Re: [PATCH v5 06/10] iommu/mediatek: Add sub_comm id in translation fault
Quoted 69 lines · Yong Wu
Quoted 49 lines · Chao Hao
The max larb number that a iommu HW support is 8(larb0~larb7 in the below diagram).
If the larb's number is over 8, we use asub_commonfor merging several larbs into one larb. At this case, we will extendlarb_id:
bit[11:9] means common-id;
bit[8:7] means subcommon-id;
From these two variables, we could get the real larb number when translation fault happen.
The diagram is as below:EMI | IOMMU | ----------------- | | common1 common0 | | ----------------- | smi common | ------------------------------------ | | | | | | 3'd0 3'd1 3'd2 3'd3 ... 3'd7 <-common_id(max is 8) | | | | | | Larb0 Larb1 | Larb3 ... Larb7 | smi sub common | -------------------------- | | | | 2'd0 2'd1 2'd2 2'd3 <-sub_common_id(max is 4) | | | |Larb8 Larb9 Larb10 Larb11
In this patch we extend larb_remap[] to larb_remap[8][4] for this. larb_remap[x][y]: x means common-id above, y means
subcommon_idabove.We can also distinguish if the M4U HW has
sub_commonbyHAS_SUB_COMMmacro.Cc Matthias Brugger <[email protected]>Signed-off-by Chao Hao <[email protected]>Reviewed-by Yong Wu <[email protected]>--- drivers/iommu/mtk_iommu.c | 20 +++++++++++++------- drivers/iommu/mtk_iommu.h | 3 ++- include/soc/mediatek/smi.h | 2 ++ 3 files changed, 17 insertions(+), 8 deletions(-)[snip]
Quoted 16 lines
drivers/iommu/mtk_iommu.h +1
-1@@ -48,7 +49,7 @@ struct mtk_iommu_plat_data {enum mtk_iommu_plat m4u_plat;u32 flags;u32 inv_sel_reg; -unsigned char larbid_remap[MTK_LARB_NR_MAX ]; +unsigned char larbid_remap[MTK_LARB_COM_MAX ][MTK_LARB_SUBCOM_MAX ]; };struct mtk_iommu_domain ;include/soc/mediatek/smi.h +0
-0@@ -12,6 +12,8 @@#ifdef CONFIG_MTK_SMI
Quoted 7 lines
include/soc/mediatek/smi.h line 16
Quoted 3 lines
include/soc/mediatek/smi.h +2
-0#define MTK_LARB_NR_MAX 16 +#define MTK_LARB_COM_MAX 8 +#define MTK_LARB_SUBCOM_MAX 4Both are only used in
mtk_iommu.h, and I don't think smi has plan to use them. thus we could move them intomtk_iommu.h
ok, got it. Thanks for your advice.
Quoted 5 lines
Quoted 3 lines
include/soc/mediatek/smi.h +0
-0#define MTK_SMI_MMU_EN (port) BIT(port)
PATCH v5 7/10 iommu/mediatek: Add REG_MMU_WR_LEN register definition
In reply to Chao HaoSome platforms(ex: mt6779) need to improve performance by setting REG_MMU_WR_LEN register. And we can use WR_THROT_EN macro to control whether we need to set the register. If the register uses default value, iommu will send command to EMI without restriction, when the number of commands become more and more, it will drop the EMI performance. So when more than ten_commands(default value) don't be handled for EMI, iommu will stop send command to EMI for keeping EMI's performace by enabling write throttling mechanism(bit[5][21]=0) in MMU_WR_LEN_CTRL register.
--- drivers/iommu/mtk_iommu.c | 10 ++++++++++ drivers/iommu/mtk_iommu.h | 2 ++ 2 files changed, 12 insertions(+)
drivers/iommu/mtk_iommu.c +10 -0
@@ -46,6 +46,8 @@#define F_MMU_STANDARD_AXI_MODE_BIT (BIT(3) | BIT(19))#define REG_MMU_DCM_DIS 0x050 +#define REG_MMU_WR_LEN 0x054 +#define F_MMU_WR_THROT_DIS_BIT (BIT(5) | BIT(21))#define REG_MMU_CTRL_REG 0x110#define F_MMU_TF_PROT_TO_PROGRAM_ADDR (2 << 4)
@@ -582,6 +584,12 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)writel_relaxed (regval, data->base +REG_MMU_VLD_PA_RNG ); }writel_relaxed (0 , data->base +REG_MMU_DCM_DIS ); +if (MTK_IOMMU_HAS_FLAG (data->plat_data,WR_THROT_EN )) { +/* write command throttling mode */ + regval =readl_relaxed (data->base +REG_MMU_WR_LEN ); + regval &= ~F_MMU_WR_THROT_DIS_BIT ; +writel_relaxed (regval, data->base +REG_MMU_WR_LEN ); + } regval =readl_relaxed (data->base +REG_MMU_MISC_CTRL );if (MTK_IOMMU_HAS_FLAG (data->plat_data,RESET_AXI )) {
@@ -737,6 +745,7 @@ static int __maybe_unused mtk_iommu_suspend(struct device *dev)struct mtk_iommu_suspend_reg *reg = &data->reg;void __iomem *base = data->base; + reg->wr_len =readl_relaxed (base +REG_MMU_WR_LEN ); reg->misc_ctrl =readl_relaxed (base +REG_MMU_MISC_CTRL ); reg->dcm_dis =readl_relaxed (base +REG_MMU_DCM_DIS ); reg->ctrl_reg =readl_relaxed (base +REG_MMU_CTRL_REG );
@@ -761,6 +770,7 @@ static int __maybe_unused mtk_iommu_resume(struct device *dev)dev_err (data->dev,"Failed to enable clk(%d) in resume\n" , ret);return ret; } +writel_relaxed (reg->wr_len, base +REG_MMU_WR_LEN );writel_relaxed (reg->misc_ctrl, base +REG_MMU_MISC_CTRL );writel_relaxed (reg->dcm_dis, base +REG_MMU_DCM_DIS );writel_relaxed (reg->ctrl_reg, base +REG_MMU_CTRL_REG );
drivers/iommu/mtk_iommu.h +2 -0
@@ -24,6 +24,7 @@#define RESET_AXI BIT(3)#define OUT_ORDER_EN BIT(4)#define HAS_SUB_COMM BIT(5) +#define WR_THROT_EN BIT(6)#define MTK_IOMMU_HAS_FLAG (pdata, _x) \ ((((pdata)->flags) & (_x)) == (_x))
@@ -36,6 +37,7 @@ struct mtk_iommu_suspend_reg {u32 int_main_control;u32 ivrp_paddr;u32 vld_pa_rng; +u32 wr_len; };enum mtk_iommu_plat {
Signature · 5 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Matthias Brugger
maintainerRe: [PATCH v5 07/10] iommu/mediatek: Add REG_MMU_WR_LEN register definition
Quoted 21 lines · Chao Hao
Some platforms(ex: mt6779) need to improve performance by setting
REG_MMU_WR_LENregister. And we can useWR_THROT_ENmacro to control whether we need to set the register. If the register uses default value, iommu will send command to EMI without restriction, when the number of commands become more and more, it will drop the EMI performance. So when more thanten_commands(default value)don't be handled for EMI, iommu will stop send command to EMI for keeping EMI's performace by enabling write throttlingmechanism(bit[5][21]=0)inMMU_WR_LEN_CTRLregister.Cc Matthias Brugger <[email protected]>Signed-off-by Chao Hao <[email protected]>--- drivers/iommu/mtk_iommu.c | 10 ++++++++++ drivers/iommu/mtk_iommu.h | 2 ++ 2 files changed, 12 insertions(+)drivers/iommu/mtk_iommu.c +0
-0
drivers/iommu/mtk_iommu.c line 49
Quoted 4 lines
drivers/iommu/mtk_iommu.c +1
-0@@ -46,6 +46,8 @@#define F_MMU_STANDARD_AXI_MODE_BIT (BIT(3) | BIT(19))#define REG_MMU_DCM_DIS 0x050 +#define REG_MMU_WR_LEN 0x054
The register name is confusing. For me it seems to describe the length of a write but it is used for controlling the write throttling. Is this the name that's used in the datasheet?
drivers/iommu/mtk_iommu.c line 50
Quoted 1 line
drivers/iommu/mtk_iommu.c +1
-0+#define F_MMU_WR_THROT_DIS_BIT (BIT(5) | BIT(21))
There are two spaces between '|' and 'BIT(21)', should be one.
Regarding the name of the define, what does the 'F_' statnds for? Also I think it should be called '_MASK' instead of '_BIT' as it defines a mask of bits.
Regards,
Matthias
Quoted 46 lines
drivers/iommu/mtk_iommu.c +8
-0#define REG_MMU_CTRL_REG 0x110#define F_MMU_TF_PROT_TO_PROGRAM_ADDR (2 << 4)@@ -582,6 +584,12 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)writel_relaxed (regval, data->base +REG_MMU_VLD_PA_RNG ); }writel_relaxed (0 , data->base +REG_MMU_DCM_DIS ); +if (MTK_IOMMU_HAS_FLAG (data->plat_data,WR_THROT_EN )) { +/* write command throttling mode */ + regval =readl_relaxed (data->base +REG_MMU_WR_LEN ); + regval &= ~F_MMU_WR_THROT_DIS_BIT ; +writel_relaxed (regval, data->base +REG_MMU_WR_LEN ); + } regval =readl_relaxed (data->base +REG_MMU_MISC_CTRL );if (MTK_IOMMU_HAS_FLAG (data->plat_data,RESET_AXI )) {@@ -737,6 +745,7 @@ static int __maybe_unused mtk_iommu_suspend(struct device *dev)struct mtk_iommu_suspend_reg *reg = &data->reg;void __iomem *base = data->base; + reg->wr_len =readl_relaxed (base +REG_MMU_WR_LEN ); reg->misc_ctrl =readl_relaxed (base +REG_MMU_MISC_CTRL ); reg->dcm_dis =readl_relaxed (base +REG_MMU_DCM_DIS ); reg->ctrl_reg =readl_relaxed (base +REG_MMU_CTRL_REG );@@ -761,6 +770,7 @@ static int __maybe_unused mtk_iommu_resume(struct device *dev)dev_err (data->dev,"Failed to enable clk(%d) in resume\n" , ret);return ret; } +writel_relaxed (reg->wr_len, base +REG_MMU_WR_LEN );writel_relaxed (reg->misc_ctrl, base +REG_MMU_MISC_CTRL );writel_relaxed (reg->dcm_dis, base +REG_MMU_DCM_DIS );writel_relaxed (reg->ctrl_reg, base +REG_MMU_CTRL_REG );drivers/iommu/mtk_iommu.h +1
-0@@ -24,6 +24,7 @@#define RESET_AXI BIT(3)#define OUT_ORDER_EN BIT(4)#define HAS_SUB_COMM BIT(5) +#define WR_THROT_EN BIT(6)#define MTK_IOMMU_HAS_FLAG (pdata, _x) \ ((((pdata)->flags) & (_x)) == (_x))
drivers/iommu/mtk_iommu.h struct mtk_iommu_suspend_reg { · line 43
Quoted 7 lines
drivers/iommu/mtk_iommu.h +1
-0@@ -36,6 +37,7 @@ struct mtk_iommu_suspend_reg {u32 int_main_control;u32 ivrp_paddr;u32 vld_pa_rng; +u32 wr_len; };enum mtk_iommu_plat {
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v5 07/10] iommu/mediatek: Add REG_MMU_WR_LEN register definition
Quoted 25 lines · Matthias Brugger
Quoted 23 lines · Chao Hao
Some platforms(ex: mt6779) need to improve performance by setting
REG_MMU_WR_LENregister. And we can useWR_THROT_ENmacro to control whether we need to set the register. If the register uses default value, iommu will send command to EMI without restriction, when the number of commands become more and more, it will drop the EMI performance. So when more thanten_commands(default value)don't be handled for EMI, iommu will stop send command to EMI for keeping EMI's performace by enabling write throttlingmechanism(bit[5][21]=0)inMMU_WR_LEN_CTRLregister.Cc Matthias Brugger <[email protected]>Signed-off-by Chao Hao <[email protected]>--- drivers/iommu/mtk_iommu.c | 10 ++++++++++ drivers/iommu/mtk_iommu.h | 2 ++ 2 files changed, 12 insertions(+)drivers/iommu/mtk_iommu.c +0
-0@@ -46,6 +46,8 @@#define F_MMU_STANDARD_AXI_MODE_BIT (BIT(3) | BIT(19))
Quoted 7 lines
drivers/iommu/mtk_iommu.c line 49
Quoted 2 lines
drivers/iommu/mtk_iommu.c +1
-0#define REG_MMU_DCM_DIS 0x050 +#define REG_MMU_WR_LEN 0x054The register name is confusing. For me it seems to describe the length of a write but it is used for controlling the write throttling. Is this the name that's used in the datasheet?
Thanks for your review carefully, we can name it to REG_MMU_WR_LEN_CTRL
Quoted 5 lines
drivers/iommu/mtk_iommu.c line 50
Quoted 1 line
drivers/iommu/mtk_iommu.c +1
-0+#define F_MMU_WR_THROT_DIS_BIT (BIT(5) | BIT(21))There are two spaces between '|' and 'BIT(21)', should be one.
Regarding the name of the define, what does the 'F_' statnds for?
F_ is used to described some bits in register and doesn't have other meanings. The format is refer to other bits definition
Quoted 3 lines
Also I think
it should be called '_MASK' instead of '_BIT' as it defines a mask of bits.
Thanks for your advice.
For F_MMU_WR_THROT_DIS_BIT:
1'b0: Enable write throttling mechanism
1'b1: Disable write throttling mechanism
So I think we can name "F_MMU_WR_THROT_DIS BIT(5) | BIT(21)" directly, it maybe more clearer.
Quoted 56 lines
Regards,
MatthiasQuoted 53 lines
drivers/iommu/mtk_iommu.c +8
-0#define REG_MMU_CTRL_REG 0x110#define F_MMU_TF_PROT_TO_PROGRAM_ADDR (2 << 4)@@ -582,6 +584,12 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)writel_relaxed (regval, data->base +REG_MMU_VLD_PA_RNG ); }writel_relaxed (0 , data->base +REG_MMU_DCM_DIS ); +if (MTK_IOMMU_HAS_FLAG (data->plat_data,WR_THROT_EN )) { +/* write command throttling mode */ + regval =readl_relaxed (data->base +REG_MMU_WR_LEN ); + regval &= ~F_MMU_WR_THROT_DIS_BIT ; +writel_relaxed (regval, data->base +REG_MMU_WR_LEN ); + } regval =readl_relaxed (data->base +REG_MMU_MISC_CTRL );if (MTK_IOMMU_HAS_FLAG (data->plat_data,RESET_AXI )) {@@ -737,6 +745,7 @@ static int __maybe_unused mtk_iommu_suspend(struct device *dev)struct mtk_iommu_suspend_reg *reg = &data->reg;void __iomem *base = data->base; + reg->wr_len =readl_relaxed (base +REG_MMU_WR_LEN ); reg->misc_ctrl =readl_relaxed (base +REG_MMU_MISC_CTRL ); reg->dcm_dis =readl_relaxed (base +REG_MMU_DCM_DIS ); reg->ctrl_reg =readl_relaxed (base +REG_MMU_CTRL_REG );@@ -761,6 +770,7 @@ static int __maybe_unused mtk_iommu_resume(struct device *dev)dev_err (data->dev,"Failed to enable clk(%d) in resume\n" , ret);return ret; } +writel_relaxed (reg->wr_len, base +REG_MMU_WR_LEN );writel_relaxed (reg->misc_ctrl, base +REG_MMU_MISC_CTRL );writel_relaxed (reg->dcm_dis, base +REG_MMU_DCM_DIS );writel_relaxed (reg->ctrl_reg, base +REG_MMU_CTRL_REG );drivers/iommu/mtk_iommu.h +2
-0@@ -24,6 +24,7 @@#define RESET_AXI BIT(3)#define OUT_ORDER_EN BIT(4)#define HAS_SUB_COMM BIT(5) +#define WR_THROT_EN BIT(6)#define MTK_IOMMU_HAS_FLAG (pdata, _x) \ ((((pdata)->flags) & (_x)) == (_x))@@ -36,6 +37,7 @@ struct mtk_iommu_suspend_reg {u32 int_main_control;u32 ivrp_paddr;u32 vld_pa_rng; +u32 wr_len; };enum mtk_iommu_plat {
Matthias Brugger
maintainerRe: [PATCH v5 07/10] iommu/mediatek: Add REG_MMU_WR_LEN register definition
Quoted 34 lines · chao hao
Quoted 25 lines · Matthias Brugger
Quoted 23 lines · Chao Hao
Some platforms(ex: mt6779) need to improve performance by setting
REG_MMU_WR_LENregister. And we can useWR_THROT_ENmacro to control whether we need to set the register. If the register uses default value, iommu will send command to EMI without restriction, when the number of commands become more and more, it will drop the EMI performance. So when more thanten_commands(default value)don't be handled for EMI, iommu will stop send command to EMI for keeping EMI's performace by enabling write throttlingmechanism(bit[5][21]=0)inMMU_WR_LEN_CTRLregister.Cc Matthias Brugger <[email protected]>Signed-off-by Chao Hao <[email protected]>--- drivers/iommu/mtk_iommu.c | 10 ++++++++++ drivers/iommu/mtk_iommu.h | 2 ++ 2 files changed, 12 insertions(+)drivers/iommu/mtk_iommu.c +0
-0@@ -46,6 +46,8 @@#define F_MMU_STANDARD_AXI_MODE_BIT (BIT(3) | BIT(19))Quoted 7 lines
drivers/iommu/mtk_iommu.c line 49
Quoted 2 lines
drivers/iommu/mtk_iommu.c +1
-0#define REG_MMU_DCM_DIS 0x050 +#define REG_MMU_WR_LEN 0x054The register name is confusing. For me it seems to describe the length of a write but it is used for controlling the write throttling. Is this the name that's used in the datasheet?
Quoted 1 line
Thanks for your review carefully, we can name it to
REG_MMU_WR_LEN_CTRL
Yes, that's mbetter, thanks.
Quoted 15 lines
Quoted 7 lines
drivers/iommu/mtk_iommu.c line 50
Quoted 3 lines
drivers/iommu/mtk_iommu.c +1
-0+#define F_MMU_WR_THROT_DIS_BIT (BIT(5) | BIT(21))There are two spaces between '|' and 'BIT(21)', should be one.
Regarding the name of the define, what does the 'F_' statnds for?
F_ is used to described some bits in register and doesn't have other meanings. The format is refer to other bits definition
Quoted 3 lines
Also I think
it should be called '_MASK' instead of '_BIT' as it defines a mask of bits.
Quoted 7 lines
Thanks for your advice.
ForF_MMU_WR_THROT_DIS_BIT:
1'b0: Enable write throttling mechanism
1'b1: Disable write throttling mechanism
So I think we can name "F_MMU_WR_THROT_DISBIT(5) | BIT(21)" directly, it maybe more clearer.
Is this what the datasheet names it? If not then I'd prefer F_MMU_WR_THROT_DIS_MASK.
Regards,
Matthias
Quoted 57 lines
Quoted 56 lines
Regards,
MatthiasQuoted 53 lines
drivers/iommu/mtk_iommu.c +8
-0#define REG_MMU_CTRL_REG 0x110#define F_MMU_TF_PROT_TO_PROGRAM_ADDR (2 << 4)@@ -582,6 +584,12 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)writel_relaxed (regval, data->base +REG_MMU_VLD_PA_RNG ); }writel_relaxed (0 , data->base +REG_MMU_DCM_DIS ); +if (MTK_IOMMU_HAS_FLAG (data->plat_data,WR_THROT_EN )) { +/* write command throttling mode */ + regval =readl_relaxed (data->base +REG_MMU_WR_LEN ); + regval &= ~F_MMU_WR_THROT_DIS_BIT ; +writel_relaxed (regval, data->base +REG_MMU_WR_LEN ); + } regval =readl_relaxed (data->base +REG_MMU_MISC_CTRL );if (MTK_IOMMU_HAS_FLAG (data->plat_data,RESET_AXI )) {@@ -737,6 +745,7 @@ static int __maybe_unused mtk_iommu_suspend(struct device *dev)struct mtk_iommu_suspend_reg *reg = &data->reg;void __iomem *base = data->base; + reg->wr_len =readl_relaxed (base +REG_MMU_WR_LEN ); reg->misc_ctrl =readl_relaxed (base +REG_MMU_MISC_CTRL ); reg->dcm_dis =readl_relaxed (base +REG_MMU_DCM_DIS ); reg->ctrl_reg =readl_relaxed (base +REG_MMU_CTRL_REG );@@ -761,6 +770,7 @@ static int __maybe_unused mtk_iommu_resume(struct device *dev)dev_err (data->dev,"Failed to enable clk(%d) in resume\n" , ret);return ret; } +writel_relaxed (reg->wr_len, base +REG_MMU_WR_LEN );writel_relaxed (reg->misc_ctrl, base +REG_MMU_MISC_CTRL );writel_relaxed (reg->dcm_dis, base +REG_MMU_DCM_DIS );writel_relaxed (reg->ctrl_reg, base +REG_MMU_CTRL_REG );drivers/iommu/mtk_iommu.h +2
-0@@ -24,6 +24,7 @@#define RESET_AXI BIT(3)#define OUT_ORDER_EN BIT(4)#define HAS_SUB_COMM BIT(5) +#define WR_THROT_EN BIT(6)#define MTK_IOMMU_HAS_FLAG (pdata, _x) \ ((((pdata)->flags) & (_x)) == (_x))@@ -36,6 +37,7 @@ struct mtk_iommu_suspend_reg {u32 int_main_control;u32 ivrp_paddr;u32 vld_pa_rng; +u32 wr_len; };enum mtk_iommu_plat {
PATCH v5 8/10 iommu/mediatek: Extend protect pa alignment value
In reply to Chao HaoStarting with mt6779, iommu needs to extend to 256 bytes from 128 bytes which can send the max number of data for memory protection pa alignment. So we can use a separate patch to modify it.
--- drivers/iommu/mtk_iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/mtk_iommu.c +1 -1
@@ -98,7 +98,7 @@#define F_MMU_INT_ID_LARB_ID (a) (((a) >> 7) & 0x7)#define F_MMU_INT_ID_PORT_ID (a) (((a) >> 2) & 0x1f) -#define MTK_PROTECT_PA_ALIGN 128 +#define MTK_PROTECT_PA_ALIGN 256/* * Get the local arbiter ID and the portid within the larb arbiter
Signature · 5 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v5 08/10] iommu/mediatek: Extend protect pa alignment value
Quoted 6 lines · Chao Hao
Starting with mt6779, iommu needs to extend to 256 bytes from 128 bytes which can send the max number of data for memory protection pa alignment. So we can use a separate patch to modify it.
Suggested-by Matthias Brugger <[email protected]>Signed-off-by Chao Hao <[email protected]>
Quoted 10 lines
--- drivers/iommu/mtk_iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/iommu/mtk_iommu.c +0
-0
drivers/iommu/mtk_iommu.c line 104
Quoted 8 lines
drivers/iommu/mtk_iommu.c +1
-1@@ -98,7 +98,7 @@#define F_MMU_INT_ID_LARB_ID (a) (((a) >> 7) & 0x7)#define F_MMU_INT_ID_PORT_ID (a) (((a) >> 2) & 0x1f) -#define MTK_PROTECT_PA_ALIGN 128 +#define MTK_PROTECT_PA_ALIGN 256/* * Get the local arbiter ID and the portid within the larb arbiter
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v5 9/10 iommu/mediatek: Modify MMU_CTRL register setting
In reply to Chao HaoMT8173 is different from other SoCs for MMU_CTRL register. For mt8173, its bit9 is in_order_write_en and doesn't use its default 1'b1.
For other SoCs, bit[12] represents victim_tlb_en feature and victim_tlb is enable defaultly(bit[12]=1), if we use "regval = F_MMU_TF_PROT_TO_PROGRAM_ADDR", victim_tlb will be disabled, it will drop iommu performace.
So we need to deal with the setting of MMU_CTRL separately for mt8173 and others.
--- drivers/iommu/mtk_iommu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/iommu/mtk_iommu.c +2 -1
@@ -543,11 +543,12 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)return ret; } + regval =readl_relaxed (data->base +REG_MMU_CTRL_REG );if (data->plat_data->m4u_plat ==M4U_MT8173 ) regval =F_MMU_PREFETCH_RT_REPLACE_MOD |F_MMU_TF_PROT_TO_PROGRAM_ADDR_MT8173 ;else - regval =F_MMU_TF_PROT_TO_PROGRAM_ADDR ; + regval |=F_MMU_TF_PROT_TO_PROGRAM_ADDR ;writel_relaxed (regval, data->base +REG_MMU_CTRL_REG ); regval = F_L2_MULIT_HIT_EN |
Signature · 5 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Matthias Brugger
maintainerRe: [PATCH v5 09/10] iommu/mediatek: Modify MMU_CTRL register setting
Quoted 9 lines · Chao Hao
MT8173 is different from other SoCs for
MMU_CTRLregister.
For mt8173, its bit9 isin_order_write_enand doesn't use its default 1'b1.> For other SoCs, bit[12] representsvictim_tlb_enfeature andvictim_tlbis enabledefaultly(bit[12]=1), if we use
"regval =F_MMU_TF_PROT_TO_PROGRAM_ADDR",victim_tlbwill be disabled, it will drop iommu performace.
So we need to deal with the setting ofMMU_CTRLseparately
for mt8173 and others.
My proposal to rewrite the commit message:
The MMU_CTRL regiser of MT8173 is different from other SoCs. The in_order_wr_en is bit[9] which is zero by default.
Other SoCs have the vitcim_tlb_en feature mapped to bit[12]. This bit is set to one by default. We need to preserve the bit when setting F_MMU_TF_PROT_TO_PROGRAM_ADDR as otherwise the bit will be cleared and IOMMU performance will drop.
Quoted 12 lines
Suggested-by Matthias Brugger <[email protected]>Suggested-by Yong Wu <[email protected]>Signed-off-by Chao Hao <[email protected]>--- drivers/iommu/mtk_iommu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/iommu/mtk_iommu.c +0
-0
drivers/iommu/mtk_iommu.c static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) · line 546
Quoted 4 lines
drivers/iommu/mtk_iommu.c +1
-0@@ -543,11 +543,12 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)return ret; } + regval =readl_relaxed (data->base +REG_MMU_CTRL_REG );
The read is only needed in the else branch.
drivers/iommu/mtk_iommu.c static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) · line 554
Quoted 10 lines
drivers/iommu/mtk_iommu.c +1
-1if (data->plat_data->m4u_plat ==M4U_MT8173 ) regval =F_MMU_PREFETCH_RT_REPLACE_MOD |F_MMU_TF_PROT_TO_PROGRAM_ADDR_MT8173 ;else - regval =F_MMU_TF_PROT_TO_PROGRAM_ADDR ; + regval |=F_MMU_TF_PROT_TO_PROGRAM_ADDR ;writel_relaxed (regval, data->base +REG_MMU_CTRL_REG ); regval = F_L2_MULIT_HIT_EN |
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v5 09/10] iommu/mediatek: Modify MMU_CTRL register setting
Quoted 12 lines · Matthias Brugger
Quoted 9 lines · Chao Hao
MT8173 is different from other SoCs for
MMU_CTRLregister.
For mt8173, its bit9 isin_order_write_enand doesn't use its default 1'b1.> For other SoCs, bit[12] representsvictim_tlb_enfeature andvictim_tlbis enabledefaultly(bit[12]=1), if we use
"regval =F_MMU_TF_PROT_TO_PROGRAM_ADDR",victim_tlbwill be disabled, it will drop iommu performace.
So we need to deal with the setting ofMMU_CTRLseparately
for mt8173 and others.
Quoted 8 lines
My proposal to rewrite the commit message:
The
MMU_CTRLregiser of MT8173 is different from other SoCs. Thein_order_wr_enis bit[9] which is zero by default.
Other SoCs have thevitcim_tlb_enfeature mapped to bit[12]. This bit is set to one by default. We need to preserve the bit when settingF_MMU_TF_PROT_TO_PROGRAM_ADDRas otherwise the bit will be cleared and IOMMU performance will drop.
got it, thanks for your advice very much.
Quoted 17 lines
Quoted 17 lines
Suggested-by Matthias Brugger <[email protected]>Suggested-by Yong Wu <[email protected]>Signed-off-by Chao Hao <[email protected]>--- drivers/iommu/mtk_iommu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/iommu/mtk_iommu.c +0
-0@@ -543,11 +543,12 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)return ret; }
Quoted 4 lines
drivers/iommu/mtk_iommu.c static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) · line 546
Quoted 1 line
drivers/iommu/mtk_iommu.c +1
-0+ regval =readl_relaxed (data->base +REG_MMU_CTRL_REG );The read is only needed in the else branch.
ok, thanks
Quoted 10 lines
Quoted 10 lines
drivers/iommu/mtk_iommu.c +1
-1if (data->plat_data->m4u_plat ==M4U_MT8173 ) regval =F_MMU_PREFETCH_RT_REPLACE_MOD |F_MMU_TF_PROT_TO_PROGRAM_ADDR_MT8173 ;else - regval =F_MMU_TF_PROT_TO_PROGRAM_ADDR ; + regval |=F_MMU_TF_PROT_TO_PROGRAM_ADDR ;writel_relaxed (regval, data->base +REG_MMU_CTRL_REG ); regval = F_L2_MULIT_HIT_EN |
PATCH v5 10/10 iommu/mediatek: Add mt6779 basic support
In reply to Chao Hao1. Start from mt6779, INVLDT_SEL move to offset=0x2c, so we add REG_MMU_INV_SEL_GEN2 definition and mt6779 uses it.
2. Add mt6779_data to support mm_iommu HW init.
--- drivers/iommu/mtk_iommu.c | 11 +++++++++++ drivers/iommu/mtk_iommu.h | 1 + 2 files changed, 12 insertions(+)
drivers/iommu/mtk_iommu.c +11 -0
@@ -37,6 +37,7 @@#define REG_MMU_INVLD_START_A 0x024#define REG_MMU_INVLD_END_A 0x028 +#define REG_MMU_INV_SEL_GEN2 0x02c#define REG_MMU_INV_SEL_GEN1 0x038#define F_INVLD_EN0 BIT(0)#define F_INVLD_EN1 BIT(1)
@@ -798,6 +799,15 @@ static const struct mtk_iommu_plat_data mt2712_data = { .larbid_remap = {{0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}}, }; +static const struct mtk_iommu_plat_data mt6779_data = { + .m4u_plat =M4U_MT6779 , + .flags =HAS_SUB_COMM | +OUT_ORDER_EN | +WR_THROT_EN , + .inv_sel_reg =REG_MMU_INV_SEL_GEN2 , + .larbid_remap = {{0 }, {1 }, {2 }, {3 }, {5 }, {7 ,8 }, {10 }, {9 }}, +}; +static const struct mtk_iommu_plat_data mt8173_data = { .m4u_plat =M4U_MT8173 , .flags = HAS_4GB_MODE |
@@ -816,6 +826,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,mt8173-m4u" , .data = &mt8173_data}, { .compatible ="mediatek,mt8183-m4u" , .data = &mt8183_data}, {}
drivers/iommu/mtk_iommu.h +1 -0
@@ -43,6 +43,7 @@ struct mtk_iommu_suspend_reg {enum mtk_iommu_plat {M4U_MT2701 ,M4U_MT2712 , +M4U_MT6779 ,M4U_MT8173 ,M4U_MT8183 , };
Signature · 5 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Matthias Brugger
maintainerRe: [PATCH v5 10/10] iommu/mediatek: Add mt6779 basic support
Quoted 7 lines · Chao Hao
1. Start from mt6779,
INVLDT_SELmove to offset=0x2c, so we addREG_MMU_INV_SEL_GEN2definition and mt6779 uses it.
2. Addmt6779_datato supportmm_iommuHW init.Cc Yong Wu <[email protected]>Cc Matthias Brugger <[email protected]>Signed-off-by Chao Hao <[email protected]>
Reviewed by: Matthias Brugger <[email protected]>
Quoted 47 lines
--- drivers/iommu/mtk_iommu.c | 11 +++++++++++ drivers/iommu/mtk_iommu.h | 1 + 2 files changed, 12 insertions(+)drivers/iommu/mtk_iommu.c +11
-0@@ -37,6 +37,7 @@#define REG_MMU_INVLD_START_A 0x024#define REG_MMU_INVLD_END_A 0x028 +#define REG_MMU_INV_SEL_GEN2 0x02c#define REG_MMU_INV_SEL_GEN1 0x038#define F_INVLD_EN0 BIT(0)#define F_INVLD_EN1 BIT(1)@@ -798,6 +799,15 @@ static const struct mtk_iommu_plat_data mt2712_data = { .larbid_remap = {{0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}}, }; +static const struct mtk_iommu_plat_data mt6779_data = { + .m4u_plat =M4U_MT6779 , + .flags =HAS_SUB_COMM | +OUT_ORDER_EN | +WR_THROT_EN , + .inv_sel_reg =REG_MMU_INV_SEL_GEN2 , + .larbid_remap = {{0 }, {1 }, {2 }, {3 }, {5 }, {7 ,8 }, {10 }, {9 }}, +}; +static const struct mtk_iommu_plat_data mt8173_data = { .m4u_plat =M4U_MT8173 , .flags = HAS_4GB_MODE |@@ -816,6 +826,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,mt8173-m4u" , .data = &mt8173_data}, { .compatible ="mediatek,mt8183-m4u" , .data = &mt8183_data}, {}drivers/iommu/mtk_iommu.h +0
-0
drivers/iommu/mtk_iommu.h struct mtk_iommu_suspend_reg { · line 49
Quoted 7 lines
drivers/iommu/mtk_iommu.h +1
-0@@ -43,6 +43,7 @@ struct mtk_iommu_suspend_reg {enum mtk_iommu_plat {M4U_MT2701 ,M4U_MT2712 , +M4U_MT6779 ,M4U_MT8173 ,M4U_MT8183 , };
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu