MT6779 IOMMU SUPPORT
Subsystems (5)
v4 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 EMDAAll 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:
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.
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 (7):
dt-bindings: mediatek: Add bindings for MT6779 iommu/mediatek: Rename the register STANDARD_AXI_MODE(0x48) to
MISC_CTRL
iommu/mediatek: Set 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 definition preparing for mt6779 iommu/mediatek: Add mt6779 basic support
.../bindings/iommu/mediatek,iommu.txt | 2 + drivers/iommu/mtk_iommu.c | 92 ++++++-- drivers/iommu/mtk_iommu.h | 10 +- include/dt-bindings/memory/mt6779-larb-port.h | 206 ++++++++++++++++++ 4 files changed, 285 insertions(+), 25 deletions(-)
--
2.18.0
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v4 1/7 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.
Change since v2:
1. Delete unused definition, ex: M4U_LARB12_ID, M4U_LARB13_ID, CCU, VPU, MDLA, EDMA
Change since v1:
1. Delete M4U_PORT_UNKNOWN define because of not use it.
2. Correct coding format: ex: /*larb3-VENC*/ --> /* larb3-VENC */
--- .../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 · 1 line
2.18.0
PATCH v4 2/7 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 · 1 line
2.18.0
Re: [PATCH v4 2/7] iommu/mediatek: Rename the register STANDARD_AXI_MODE(0x48) to MISC_CTRL
Quoted 9 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]>
Quoted 65 lines
--- 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;
PATCH v4 3/7 iommu/mediatek: Set MISC_CTRL register
In reply to Chao HaoAdd F_MMU_IN_ORDER_WR_EN definition in MISC_CTRL.
In order to improve performance, we always disable STANDARD_AXI_MODE and IN_ORDER_WR_EN in MISC_CTRL.
Change since v3:
1. Rename Disable STANDARD_AXI_MODE in MISC_CTRL to Set MISC_CTRL register
2. Add F_MMU_IN_DRDER_WR_EN definition in MISC_CTRL
We need to disable in_order_write to improve performance
--- drivers/iommu/mtk_iommu.c | 11 +++++++++++ drivers/iommu/mtk_iommu.h | 1 + 2 files changed, 12 insertions(+)
drivers/iommu/mtk_iommu.c +11 -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)) +#define REG_MMU_DCM_DIS 0x050#define REG_MMU_CTRL_REG 0x110
@@ -578,6 +581,14 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)writel_relaxed (0 , data->base +REG_MMU_MISC_CTRL ); } +if (data->plat_data->has_misc_ctrl) { +/* For mm_iommu, it can improve performance by the setting */ + regval =readl_relaxed (data->base +REG_MMU_MISC_CTRL ); + regval &= ~F_MMU_STANDARD_AXI_MODE_BIT ; + 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)) {writel_relaxed (0 , data->base +REG_MMU_PT_BASE_ADDR );
drivers/iommu/mtk_iommu.h +1 -0
@@ -40,6 +40,7 @@ struct mtk_iommu_plat_data {/* HW will use the EMI clock if there isn't the "bclk". */ bool has_bclk; +bool has_misc_ctrl;bool has_vld_pa_rng;bool reset_axi;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
Matthias Brugger
maintainerRe: [PATCH v4 3/7] iommu/mediatek: Set MISC_CTRL register
Quoted 5 lines · Chao Hao
Add
F_MMU_IN_ORDER_WR_ENdefinition inMISC_CTRL.
In order to improve performance, we always disableSTANDARD_AXI_MODEandIN_ORDER_WR_ENinMISC_CTRL.Change since v3:
The changelog should go below the '---' as we don't want this in the git history once the patch get's accepted.
Quoted 26 lines
1. Rename Disable
STANDARD_AXI_MODEinMISC_CTRLto SetMISC_CTRLregister
2. AddF_MMU_IN_DRDER_WR_ENdefinition inMISC_CTRL
We need to disablein_order_writeto improve performanceCc Yong Wu <[email protected]>Signed-off-by Chao Hao <[email protected]>--- drivers/iommu/mtk_iommu.c | 11 +++++++++++ drivers/iommu/mtk_iommu.h | 1 + 2 files changed, 12 insertions(+)drivers/iommu/mtk_iommu.c +3
-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)) +#define REG_MMU_DCM_DIS 0x050#define REG_MMU_CTRL_REG 0x110
drivers/iommu/mtk_iommu.c static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) · line 584
Quoted 4 lines
drivers/iommu/mtk_iommu.c +1
-0@@ -578,6 +581,14 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)writel_relaxed (0 , data->base +REG_MMU_MISC_CTRL ); } +if (data->plat_data->has_misc_ctrl) {
That's confusing. We renamed the register to misc_ctrl, but it's present in all SoCs. We should find a better name for this flag to describe what the hardware supports.
Regards,
Matthias
Quoted 23 lines
drivers/iommu/mtk_iommu.c +7
-0+/* For mm_iommu, it can improve performance by the setting */ + regval =readl_relaxed (data->base +REG_MMU_MISC_CTRL ); + regval &= ~F_MMU_STANDARD_AXI_MODE_BIT ; + 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)) {writel_relaxed (0 , data->base +REG_MMU_PT_BASE_ADDR );drivers/iommu/mtk_iommu.h +1
-0@@ -40,6 +40,7 @@ struct mtk_iommu_plat_data {/* HW will use the EMI clock if there isn't the "bclk". */ bool has_bclk; +bool has_misc_ctrl;bool has_vld_pa_rng;bool reset_axi;unsigned char larbid_remap[MTK_LARB_NR_MAX ];
Re: [PATCH v4 3/7] iommu/mediatek: Set MISC_CTRL register
Quoted 11 lines · Matthias Brugger
Quoted 5 lines · Chao Hao
Add
F_MMU_IN_ORDER_WR_ENdefinition inMISC_CTRL.
In order to improve performance, we always disableSTANDARD_AXI_MODEandIN_ORDER_WR_ENinMISC_CTRL.Change since v3:
The changelog should go below the '---' as we don't want this in the git history once the patch get's accepted.
okok, thanks
Quoted 29 lines
Quoted 29 lines
1. Rename Disable
STANDARD_AXI_MODEinMISC_CTRLto SetMISC_CTRLregister
2. AddF_MMU_IN_DRDER_WR_ENdefinition inMISC_CTRL
We need to disablein_order_writeto improve performanceCc Yong Wu <[email protected]>Signed-off-by Chao Hao <[email protected]>--- drivers/iommu/mtk_iommu.c | 11 +++++++++++ drivers/iommu/mtk_iommu.h | 1 + 2 files changed, 12 insertions(+)drivers/iommu/mtk_iommu.c +3
-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)) +#define REG_MMU_DCM_DIS 0x050#define REG_MMU_CTRL_REG 0x110@@ -578,6 +581,14 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)writel_relaxed (0 , data->base +REG_MMU_MISC_CTRL ); }
Quoted 6 lines
drivers/iommu/mtk_iommu.c static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) · line 584
Quoted 1 line
drivers/iommu/mtk_iommu.c +1
-0+if (data->plat_data->has_misc_ctrl) {That's confusing. We renamed the register to
misc_ctrl, but it's present in all SoCs. We should find a better name for this flag to describe what the hardware supports.
ok, thanks for you advice, I will rename it in next version. ex:has_perf_req(has performance requirement)
Quoted 26 lines
Regards,
MatthiasQuoted 23 lines
drivers/iommu/mtk_iommu.c +7
-0+/* For mm_iommu, it can improve performance by the setting */ + regval =readl_relaxed (data->base +REG_MMU_MISC_CTRL ); + regval &= ~F_MMU_STANDARD_AXI_MODE_BIT ; + 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)) {writel_relaxed (0 , data->base +REG_MMU_PT_BASE_ADDR );drivers/iommu/mtk_iommu.h +1
-0@@ -40,6 +40,7 @@ struct mtk_iommu_plat_data {/* HW will use the EMI clock if there isn't the "bclk". */ bool has_bclk; +bool has_misc_ctrl;bool has_vld_pa_rng;bool reset_axi;unsigned char larbid_remap[MTK_LARB_NR_MAX ];
Yong Wu
maintainerRe: [PATCH v4 3/7] iommu/mediatek: Set MISC_CTRL register
Hi Chao,
Quoted 1 line · chao hao
On Wed, 2020-06-17 at 11:34 +0200, Matthias Brugger wrote:
[snip]
Quoted 23 lines
Quoted 12 lines
Quoted 12 lines
#define
REG_MMU_MISC_CTRL0x048drivers/iommu/mtk_iommu.c +3
-0+#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@@ -578,6 +581,14 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)writel_relaxed (0 , data->base +REG_MMU_MISC_CTRL ); }Quoted 6 lines
drivers/iommu/mtk_iommu.c static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) · line 584
Quoted 1 line
drivers/iommu/mtk_iommu.c +1
-0+if (data->plat_data->has_misc_ctrl) {That's confusing. We renamed the register to
misc_ctrl, but it's present in all SoCs. We should find a better name for this flag to describe what the hardware supports.ok, thanks for you advice, I will rename it in next version. ex:has_perf_req(has performance requirement)
Quoted 7 lines
Quoted 7 lines
Regards,
Matthiasdrivers/iommu/mtk_iommu.c static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) · line 588
Quoted 4 lines
drivers/iommu/mtk_iommu.c +4
-0+/* For mm_iommu, it can improve performance by the setting */ + regval =readl_relaxed (data->base +REG_MMU_MISC_CTRL ); + regval &= ~F_MMU_STANDARD_AXI_MODE_BIT ; + regval &= ~F_MMU_IN_ORDER_WR_EN ;
Note: mt2712 also is MISC_CTRL register, but it don't use this in_order setting.
As commented in v3. 0x48 is either STANDARD_AXI_MODE or MISC_CTRL register. No need two flags(reset_axi/has_xx) for it.
something like:
regval = readl_relaxed(data->base + REG_MMU_MISC_CTRL);
if (reset_axi) {
regval = 0;
} else { /* MISC_CTRL */
if (!apu[1])
regval &= ~F_MMU_STANDARD_AXI_MODE_BIT;
if (out_order_en)
regval &= ~F_MMU_IN_ORDER_WR_EN;
}writel_relaxed(regval, data->base + REG_MMU_MISC_CTRL);
[1] Your current patch doesn't support apu-iommu, thus, add it when necessary.
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
drivers/iommu/mtk_iommu.c +3
-0+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)) {writel_relaxed (0 , data->base +REG_MMU_PT_BASE_ADDR );drivers/iommu/mtk_iommu.h +0
-0@@ -40,6 +40,7 @@ struct mtk_iommu_plat_data {
Quoted 9 lines
Quoted 7 lines
drivers/iommu/mtk_iommu.h struct mtk_iommu_plat_data { · line 46
Quoted 7 lines
drivers/iommu/mtk_iommu.h +1
-0/* HW will use the EMI clock if there isn't the "bclk". */ bool has_bclk; +bool has_misc_ctrl;bool has_vld_pa_rng;bool reset_axi;unsigned char larbid_remap[MTK_LARB_NR_MAX ];
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v4 3/7] iommu/mediatek: Set MISC_CTRL register
Quoted 58 lines · Yong Wu
Hi Chao,
Quoted 1 line · chao hao
On Wed, 2020-06-17 at 11:34 +0200, Matthias Brugger wrote:
[snip]
Quoted 23 lines
Quoted 12 lines
Quoted 12 lines
#define
REG_MMU_MISC_CTRL0x048drivers/iommu/mtk_iommu.c +3
-0+#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@@ -578,6 +581,14 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)writel_relaxed (0 , data->base +REG_MMU_MISC_CTRL ); }Quoted 6 lines
drivers/iommu/mtk_iommu.c static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) · line 584
Quoted 1 line
drivers/iommu/mtk_iommu.c +1
-0+if (data->plat_data->has_misc_ctrl) {That's confusing. We renamed the register to
misc_ctrl, but it's present in all SoCs. We should find a better name for this flag to describe what the hardware supports.ok, thanks for you advice, I will rename it in next version. ex:has_perf_req(has performance requirement)
Quoted 7 lines
Quoted 7 lines
Regards,
Matthiasdrivers/iommu/mtk_iommu.c static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) · line 588
Quoted 4 lines
drivers/iommu/mtk_iommu.c +4
-0+/* For mm_iommu, it can improve performance by the setting */ + regval =readl_relaxed (data->base +REG_MMU_MISC_CTRL ); + regval &= ~F_MMU_STANDARD_AXI_MODE_BIT ; + regval &= ~F_MMU_IN_ORDER_WR_EN ;Note: mt2712 also is
MISC_CTRLregister, but it don't use thisin_ordersetting.As commented in v3.
0x48is eitherSTANDARD_AXI_MODEorMISC_CTRLregister. No need twoflags(reset_axi/has_xx)for it.something like:
regval =
readl_relaxed(data->base + REG_MMU_MISC_CTRL); if (reset_axi) {
regval = 0;
} else { /*MISC_CTRL*/
if (!apu[1])
regval &= ~F_MMU_STANDARD_AXI_MODE_BIT;
if (out_order_en)
regval &= ~F_MMU_IN_ORDER_WR_EN;
}writel_relaxed(regval, data->base + REG_MMU_MISC_CTRL);
Quoted 2 lines
[1] Your current patch doesn't support apu-iommu, thus, add it when necessary.
ok, the patchset don't need to "if (!apu[1])", I will fix it in next version. thanks
Quoted 22 lines
Quoted 21 lines
Quoted 19 lines
Quoted 19 lines
drivers/iommu/mtk_iommu.c +3
-0+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)) {writel_relaxed (0 , data->base +REG_MMU_PT_BASE_ADDR );drivers/iommu/mtk_iommu.h +1
-0@@ -40,6 +40,7 @@ struct mtk_iommu_plat_data {/* HW will use the EMI clock if there isn't the "bclk". */ bool has_bclk; +bool has_misc_ctrl;bool has_vld_pa_rng;bool reset_axi;unsigned char larbid_remap[MTK_LARB_NR_MAX ];
PATCH v4 4/7 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.
Change since v3:
1. Fix coding style
--- drivers/iommu/mtk_iommu.c | 19 +++++++++++-------- drivers/iommu/mtk_iommu.h | 1 + 2 files changed, 12 insertions(+), 8 deletions(-)
drivers/iommu/mtk_iommu.c +11 -8
@@ -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,
@@ -773,11 +773,12 @@ 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, - .larbid_remap = {0 ,1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 }, + .m4u_plat =M4U_MT2712 , + .has_4gb_mode = true, + .has_bclk = true, + .has_vld_pa_rng = true, + .inv_sel_reg =REG_MMU_INV_SEL_GEN1 , + .larbid_remap = {0 ,1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 }, };static const struct mtk_iommu_plat_data mt8173_data = {
@@ -785,12 +786,14 @@ static const struct mtk_iommu_plat_data mt8173_data = { .has_4gb_mode = true, .has_bclk = true, .reset_axi = true, + .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 , .reset_axi = true, + .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
@@ -43,6 +43,7 @@ struct mtk_iommu_plat_data {bool has_misc_ctrl;bool has_vld_pa_rng;bool reset_axi; +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
Re: [PATCH v4 4/7] iommu/mediatek: Move inv_sel_reg into the plat_data
Quoted 11 lines · Chao Hao
For mt6779,
MMU_INV_SELregister's offset is changed from0x38to0x2c, so we can putinv_sel_regin theplat_datato use it.
In addition, we renamed it toREG_MMU_INV_SEL_GEN1and use it before mt6779.Change since v3:
1. Fix coding styleCc Yong Wu <[email protected]>Signed-off-by Chao Hao <[email protected]>
Quoted 82 lines
--- drivers/iommu/mtk_iommu.c | 19 +++++++++++-------- drivers/iommu/mtk_iommu.h | 1 + 2 files changed, 12 insertions(+), 8 deletions(-)drivers/iommu/mtk_iommu.c +11
-8@@ -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,@@ -773,11 +773,12 @@ 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, - .larbid_remap = {0 ,1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 }, + .m4u_plat =M4U_MT2712 , + .has_4gb_mode = true, + .has_bclk = true, + .has_vld_pa_rng = true, + .inv_sel_reg =REG_MMU_INV_SEL_GEN1 , + .larbid_remap = {0 ,1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 }, };static const struct mtk_iommu_plat_data mt8173_data = {@@ -785,12 +786,14 @@ static const struct mtk_iommu_plat_data mt8173_data = { .has_4gb_mode = true, .has_bclk = true, .reset_axi = true, + .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 , .reset_axi = true, + .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@@ -43,6 +43,7 @@ struct mtk_iommu_plat_data {bool has_misc_ctrl;bool has_vld_pa_rng;bool reset_axi; +u32 inv_sel_reg;unsigned char larbid_remap[MTK_LARB_NR_MAX ]; };
PATCH v4 5/7 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 variable, 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 extern larb_remap[] to larb_remap[8][4] for this. larb_remap[x][y]: x mean common-id above, y means subcommon_id above.
We can also distinguish if the M4U HW has sub_common by has_sub_comm property.
--- drivers/iommu/mtk_iommu.c | 20 +++++++++++++------- drivers/iommu/mtk_iommu.h | 3 ++- 2 files changed, 15 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 (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 = true, .has_vld_pa_rng = true, .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 = true, .reset_axi = true, .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 , .reset_axi = true, .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
@@ -41,10 +41,11 @@ struct mtk_iommu_plat_data {/* HW will use the EMI clock if there isn't the "bclk". */ bool has_bclk;bool has_misc_ctrl; +bool has_sub_comm;bool has_vld_pa_rng;bool reset_axi;u32 inv_sel_reg; -unsigned char larbid_remap[MTK_LARB_NR_MAX ]; +unsigned char larbid_remap[8 ][4 ]; };struct mtk_iommu_domain ;
Signature · 5 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Matthias Brugger
maintainerRe: [PATCH v4 5/7] iommu/mediatek: Add sub_comm id in translation fault
Quoted 33 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 variable, 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) | | | |
Quoted 3 lines
Larb8 Larb9 Larb10 Larb11
In this patch we extern larb_remap[] to larb_remap[8][4] for this.
extern -> extend
Quoted 1 line
larb_remap[x][y]: x mean common-id above, y means
subcommon_idabove.
mean -> means
Quoted 82 lines
We can also distinguish if the M4U HW has
sub_commonbyhas_sub_commproperty.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 ++- 2 files changed, 15 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 (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 = true, .has_vld_pa_rng = true, .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 = true, .reset_axi = true, .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 , .reset_axi = true, .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 +0
-0
drivers/iommu/mtk_iommu.h struct mtk_iommu_plat_data { · line 48
Quoted 9 lines
drivers/iommu/mtk_iommu.h +2
-1@@ -41,10 +41,11 @@ struct mtk_iommu_plat_data {/* HW will use the EMI clock if there isn't the "bclk". */ bool has_bclk;bool has_misc_ctrl; +bool has_sub_comm;bool has_vld_pa_rng;bool reset_axi;u32 inv_sel_reg; -unsigned char larbid_remap[MTK_LARB_NR_MAX ]; +unsigned char larbid_remap[8 ][4 ];
MTK_LARB_NR_MAX is 16, why do you decrease it to 8? Should we use a define for the subcommon as well?
Regards,
Matthias
Quoted 4 lines
drivers/iommu/mtk_iommu.h +0
-0};struct mtk_iommu_domain ;
Yong Wu
maintainerRe: [PATCH v4 5/7] iommu/mediatek: Add sub_comm id in translation fault
Hi Matthias,
Thanks very much for your review.
Quoted 130 lines · Matthias Brugger
Quoted 33 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 variable, 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) | | | |Quoted 3 lines
Larb8 Larb9 Larb10 Larb11
In this patch we extern larb_remap[] to larb_remap[8][4] for this.
extern -> extend
Quoted 1 line
larb_remap[x][y]: x mean common-id above, y means
subcommon_idabove.mean -> means
Quoted 85 lines
We can also distinguish if the M4U HW has
sub_commonbyhas_sub_commproperty.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 ++- 2 files changed, 15 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 (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 = true, .has_vld_pa_rng = true, .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 = true, .reset_axi = true, .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 , .reset_axi = true, .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 +0
-0@@ -41,10 +41,11 @@ struct mtk_iommu_plat_data {/* HW will use the EMI clock if there isn't the "bclk". */ bool has_bclk;bool has_misc_ctrl;
Quoted 8 lines
drivers/iommu/mtk_iommu.h struct mtk_iommu_plat_data { · line 48
Quoted 6 lines
drivers/iommu/mtk_iommu.h +2
-1+bool has_sub_comm;bool has_vld_pa_rng;bool reset_axi;u32 inv_sel_reg; -unsigned char larbid_remap[MTK_LARB_NR_MAX ]; +unsigned char larbid_remap[8 ][4 ];
MTK_LARB_NR_MAXis 16, why do you decrease it to 8?
From the diagram above, the max number of the larbs that could connected with a IOMMU HW is 8. thus, 8 is right here for each a IOMMU HW.
as I commented when v3. mt2712 have the larbs over 8 since it has 2 IOMMU HWes.
and MTK_LARB_NR_MAX means the max larbs number that this SoC support. Keep its value as is.
Quoted 9 lines
Should we use a define for the subcommon as well?
Regards,
MatthiasQuoted 4 lines
drivers/iommu/mtk_iommu.h +0
-0};struct mtk_iommu_domain ;
Re: [PATCH v4 5/7] iommu/mediatek: Add sub_comm id in translation fault
Quoted 144 lines · Yong Wu
Hi Matthias,
Thanks very much for your review.
Quoted 130 lines · Matthias Brugger
Quoted 33 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 variable, 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) | | | |Quoted 3 lines
Larb8 Larb9 Larb10 Larb11
In this patch we extern larb_remap[] to larb_remap[8][4] for this.
extern -> extend
Quoted 1 line
larb_remap[x][y]: x mean common-id above, y means
subcommon_idabove.mean -> means
Quoted 85 lines
We can also distinguish if the M4U HW has
sub_commonbyhas_sub_commproperty.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 ++- 2 files changed, 15 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 (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 = true, .has_vld_pa_rng = true, .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 = true, .reset_axi = true, .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 , .reset_axi = true, .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 +0
-0@@ -41,10 +41,11 @@ struct mtk_iommu_plat_data {/* HW will use the EMI clock if there isn't the "bclk". */ bool has_bclk;bool has_misc_ctrl;Quoted 8 lines
drivers/iommu/mtk_iommu.h struct mtk_iommu_plat_data { · line 48
Quoted 6 lines
drivers/iommu/mtk_iommu.h +2
-1+bool has_sub_comm;bool has_vld_pa_rng;bool reset_axi;u32 inv_sel_reg; -unsigned char larbid_remap[MTK_LARB_NR_MAX ]; +unsigned char larbid_remap[8 ][4 ];
MTK_LARB_NR_MAXis 16, why do you decrease it to 8?
Quoted 15 lines
From the diagram above, the max number of the larbs that could connected with a IOMMU HW is 8. thus, 8 is right here for each a IOMMU HW.
as I commented when v3. mt2712 have the larbs over 8 since it has 2 IOMMU HWes.
and
MTK_LARB_NR_MAXmeans the max larbs number that this SoC support. Keep its value as is.Quoted 5 lines
Should we use a define for the subcommon as well?
Regards,
Matthias
Hi Matthias and yong,
Thanks very much for your review.
HW diagram is as belove and whether we need to use macro definitions to show it, maybe more clearer? like this:
#define LARB_COMMON_MAX 8
#define LARB_SUB_COMMON_MAX 4
unsigned char larbid_remap[LARB_COMMON_MAX][LARB_SUB_COMMON_MAX];
Quoted 7 lines
Quoted 5 lines
Quoted 5 lines
drivers/iommu/mtk_iommu.h +0
-0};struct mtk_iommu_domain ;
PATCH v4 6/7 iommu/mediatek: Add REG_MMU_WR_LEN definition preparing for mt6779
In reply to Chao HaoSome platforms(ex: mt6779) have a new register called by REG_MMU_WR_LEN to improve performance.
This patch add this register definition.
--- 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)
@@ -581,6 +583,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 (data->plat_data->has_wr_len) { +/* 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 ); + }if (data->plat_data->reset_axi) {/* The register is called STANDARD_AXI_MODE in this case */
@@ -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
@@ -25,6 +25,7 @@ struct mtk_iommu_suspend_reg {u32 int_main_control;u32 ivrp_paddr;u32 vld_pa_rng; +u32 wr_len; };enum mtk_iommu_plat {
@@ -43,6 +44,7 @@ struct mtk_iommu_plat_data {bool has_misc_ctrl;bool has_sub_comm;bool has_vld_pa_rng; +bool has_wr_len;bool reset_axi;u32 inv_sel_reg;unsigned char larbid_remap[8 ][4 ];
Signature · 5 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Matthias Brugger
maintainerRe: [PATCH v4 6/7] iommu/mediatek: Add REG_MMU_WR_LEN definition preparing for mt6779
Quoted 3 lines · Chao Hao
Some platforms(ex: mt6779) have a new register called by
REG_MMU_WR_LENto improve performance.
This patch add this register definition.
Please be more specific what this register is about.
Quoted 34 lines
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 +8
-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)@@ -581,6 +583,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 (data->plat_data->has_wr_len) { +/* 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 ); + }if (data->plat_data->reset_axi) {/* The register is called STANDARD_AXI_MODE in this case */
drivers/iommu/mtk_iommu.c static int __maybe_unused mtk_iommu_suspend(struct device *dev) · line 748
Quoted 4 lines
drivers/iommu/mtk_iommu.c +1
-0@@ -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 );
Can we read/write the register without any side effect although hardware has not implemented it (!has_wr_len)?
Quoted 24 lines
drivers/iommu/mtk_iommu.c +1
-0reg->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@@ -25,6 +25,7 @@ struct mtk_iommu_suspend_reg {u32 int_main_control;u32 ivrp_paddr;u32 vld_pa_rng; +u32 wr_len; };enum mtk_iommu_plat {
drivers/iommu/mtk_iommu.h struct mtk_iommu_plat_data { · line 47
Quoted 4 lines
drivers/iommu/mtk_iommu.h +1
-0@@ -43,6 +44,7 @@ struct mtk_iommu_plat_data {bool has_misc_ctrl;bool has_sub_comm;bool has_vld_pa_rng; +bool has_wr_len;
Given the fact that we are adding more and more plat_data bool values, I think it would make sense to use a u32 flags register and add the appropriate macro definitions to set and check for a flag present.
Regards,
Matthias
Quoted 4 lines
drivers/iommu/mtk_iommu.h +0
-0bool reset_axi;u32 inv_sel_reg;unsigned char larbid_remap[8 ][4 ];
Re: [PATCH v4 6/7] iommu/mediatek: Add REG_MMU_WR_LEN definition preparing for mt6779
Quoted 8 lines · Matthias Brugger
Quoted 3 lines · Chao Hao
Some platforms(ex: mt6779) have a new register called by
REG_MMU_WR_LENto improve performance.
This patch add this register definition.Please be more specific what this register is about.
OK. thanks.
We can use "has_wr_len" flag 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.
I will write description above to commit message in next version
Quoted 37 lines
Quoted 37 lines
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 +8
-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)@@ -581,6 +583,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 (data->plat_data->has_wr_len) { +/* 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 ); + }if (data->plat_data->reset_axi) {/* The register is called STANDARD_AXI_MODE in this case */ @@ -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;
Quoted 4 lines
drivers/iommu/mtk_iommu.c static int __maybe_unused mtk_iommu_suspend(struct device *dev) · line 748
Quoted 1 line
drivers/iommu/mtk_iommu.c +1
-0+ reg->wr_len =readl_relaxed (base +REG_MMU_WR_LEN );Can we read/write the register without any side effect although hardware has not implemented it (!has_wr_len)?
It doesn't have side effect. Becasue all the MTK platform have the register for iommu HW. If we need to have requirement for performance, we can set it by has_wr_len.
But I'm Sorry, the name of flag(has_wr_len) is not exact, I will rename it in next version, ex: "wr_throt_en"
Quoted 24 lines
Quoted 24 lines
drivers/iommu/mtk_iommu.c +1
-0reg->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@@ -25,6 +25,7 @@ struct mtk_iommu_suspend_reg {u32 int_main_control;u32 ivrp_paddr;u32 vld_pa_rng; +u32 wr_len; };
Quoted 10 lines
drivers/iommu/mtk_iommu.h struct mtk_iommu_plat_data { · line 47
Quoted 6 lines
drivers/iommu/mtk_iommu.h +1
-0enum mtk_iommu_plat {@@ -43,6 +44,7 @@ struct mtk_iommu_plat_data {bool has_misc_ctrl;bool has_sub_comm;bool has_vld_pa_rng; +bool has_wr_len;Given the fact that we are adding more and more
plat_databool values, I think it would make sense to use a u32 flags register and add the appropriate macro definitions to set and check for a flag present.
Thanks for your advice.
do you mean like this:
struct plat_flag {
#define HAS_4GB_MODE BIT(0)
#define HAS_BCLK BIT(1)
#define REST_AXI BIT(2)
... ...
u32 flag;
};struct mtk_iommu_plat_data {
......
struct plat_flag flag;
......
};Quoted 7 lines
Regards,
MatthiasQuoted 4 lines
drivers/iommu/mtk_iommu.h +0
-0bool reset_axi;u32 inv_sel_reg;unsigned char larbid_remap[8 ][4 ];
Matthias Brugger
maintainerRe: [PATCH v4 6/7] iommu/mediatek: Add REG_MMU_WR_LEN definition preparing for mt6779
Quoted 115 lines · chao hao
Quoted 8 lines · Matthias Brugger
Quoted 3 lines · Chao Hao
Some platforms(ex: mt6779) have a new register called by
REG_MMU_WR_LENto improve performance.
This patch add this register definition.Please be more specific what this register is about.
OK. thanks.
We can use "has_wr_len" flag 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.I will write description above to commit message in next version
Quoted 37 lines
Quoted 37 lines
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 +8
-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)@@ -581,6 +583,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 (data->plat_data->has_wr_len) { +/* 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 ); + }if (data->plat_data->reset_axi) {/* The register is called STANDARD_AXI_MODE in this case */ @@ -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;Quoted 4 lines
drivers/iommu/mtk_iommu.c static int __maybe_unused mtk_iommu_suspend(struct device *dev) · line 748
Quoted 1 line
drivers/iommu/mtk_iommu.c +1
-0+ reg->wr_len =readl_relaxed (base +REG_MMU_WR_LEN );Can we read/write the register without any side effect although hardware has not implemented it (!has_wr_len)?
It doesn't have side effect. Becasue all the MTK platform have the register for iommu HW. If we need to have requirement for performance, we can set it by
has_wr_len.
But I'm Sorry, the name offlag(has_wr_len)is not exact, I will rename it in next version, ex: "wr_throt_en"Quoted 24 lines
Quoted 24 lines
drivers/iommu/mtk_iommu.c +1
-0reg->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@@ -25,6 +25,7 @@ struct mtk_iommu_suspend_reg {u32 int_main_control;u32 ivrp_paddr;u32 vld_pa_rng; +u32 wr_len; };Quoted 10 lines
drivers/iommu/mtk_iommu.h struct mtk_iommu_plat_data { · line 47
Quoted 6 lines
drivers/iommu/mtk_iommu.h +1
-0enum mtk_iommu_plat {@@ -43,6 +44,7 @@ struct mtk_iommu_plat_data {bool has_misc_ctrl;bool has_sub_comm;bool has_vld_pa_rng; +bool has_wr_len;Given the fact that we are adding more and more
plat_databool values, I think it would make sense to use a u32 flags register and add the appropriate macro definitions to set and check for a flag present.Thanks for your advice.
do you mean like this:
structplat_flag{#define HAS_4GB_MODE BIT(0) #define HAS_BCLK BIT(1) #define REST_AXI BIT(2) ... ... u32 flag; };
Quoted 6 lines
struct mtk_iommu_plat_data {
......
struct plat_flag flag;
......
};Nearly, I mean something like this:
#define HAS_4GB_MODE BIT(0) #define HAS_BCLK BIT(1) #define REST_AXI BIT(2)
#define MTK_IOMMU_HAS_FLAG(pdata, _x) \ ((((pdata)->flags) & (_x)) == (_x))
struct mtk_iommu_plat_data {
...
u32 flags;
...
}if (MTK_IOMMU_HAS_FLAG(data->plat_data, HAS_BCLK)
...
Regards,
Matthias
Quoted 9 lines
Quoted 8 lines
Regards,
MatthiasQuoted 4 lines
drivers/iommu/mtk_iommu.h +0
-0bool reset_axi;u32 inv_sel_reg;unsigned char larbid_remap[8 ][4 ];
Re: [PATCH v4 6/7] iommu/mediatek: Add REG_MMU_WR_LEN definition preparing for mt6779
Quoted 133 lines · Matthias Brugger
Quoted 115 lines · chao hao
Quoted 8 lines · Matthias Brugger
Quoted 3 lines · Chao Hao
Some platforms(ex: mt6779) have a new register called by
REG_MMU_WR_LENto improve performance.
This patch add this register definition.Please be more specific what this register is about.
OK. thanks.
We can use "has_wr_len" flag 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.I will write description above to commit message in next version
Quoted 37 lines
Quoted 37 lines
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 +8
-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)@@ -581,6 +583,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 (data->plat_data->has_wr_len) { +/* 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 ); + }if (data->plat_data->reset_axi) {/* The register is called STANDARD_AXI_MODE in this case */ @@ -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;Quoted 4 lines
drivers/iommu/mtk_iommu.c static int __maybe_unused mtk_iommu_suspend(struct device *dev) · line 748
Quoted 1 line
drivers/iommu/mtk_iommu.c +1
-0+ reg->wr_len =readl_relaxed (base +REG_MMU_WR_LEN );Can we read/write the register without any side effect although hardware has not implemented it (!has_wr_len)?
It doesn't have side effect. Becasue all the MTK platform have the register for iommu HW. If we need to have requirement for performance, we can set it by
has_wr_len.
But I'm Sorry, the name offlag(has_wr_len)is not exact, I will rename it in next version, ex: "wr_throt_en"Quoted 24 lines
Quoted 24 lines
drivers/iommu/mtk_iommu.c +1
-0reg->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@@ -25,6 +25,7 @@ struct mtk_iommu_suspend_reg {u32 int_main_control;u32 ivrp_paddr;u32 vld_pa_rng; +u32 wr_len; };Quoted 10 lines
drivers/iommu/mtk_iommu.h struct mtk_iommu_plat_data { · line 47
Quoted 6 lines
drivers/iommu/mtk_iommu.h +1
-0enum mtk_iommu_plat {@@ -43,6 +44,7 @@ struct mtk_iommu_plat_data {bool has_misc_ctrl;bool has_sub_comm;bool has_vld_pa_rng; +bool has_wr_len;Given the fact that we are adding more and more
plat_databool values, I think it would make sense to use a u32 flags register and add the appropriate macro definitions to set and check for a flag present.Thanks for your advice.
do you mean like this:
structplat_flag{#define HAS_4GB_MODE BIT(0) #define HAS_BCLK BIT(1) #define REST_AXI BIT(2) ... ... u32 flag; };Quoted 6 lines
struct mtk_iommu_plat_data { ...... struct plat_flag flag; ...... };Nearly, I mean something like this:
#define HAS_4GB_MODE BIT(0) #define HAS_BCLK BIT(1) #define REST_AXI BIT(2)#define MTK_IOMMU_HAS_FLAG(pdata, _x) \ ((((pdata)->flags) & (_x)) == (_x))
Quoted 9 lines
struct mtk_iommu_plat_data { ... u32 flags; ... }if (
MTK_IOMMU_HAS_FLAG(data->plat_data, HAS_BCLK)
...
Ok, got it, thanks
Quoted 12 lines
Regards,
MatthiasQuoted 9 lines
Quoted 8 lines
Regards,
MatthiasQuoted 4 lines
drivers/iommu/mtk_iommu.h +0
-0bool reset_axi;u32 inv_sel_reg;unsigned char larbid_remap[8 ][4 ];
PATCH v4 7/7 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. Change PROTECT_PA_ALIGN from 128 byte to 256 byte.
3. For REG_MMU_CTRL_REG register, we only need to change bit[2:0], others bits keep default value, ex: enable victim tlb.
4. Add mt6779_data to support mm_iommu HW init.
Change since v3:
1. When setting MMU_CTRL_REG, we don't need to include mt8173.
--- drivers/iommu/mtk_iommu.c | 20 ++++++++++++++++++-- drivers/iommu/mtk_iommu.h | 1 + 2 files changed, 19 insertions(+), 2 deletions(-)
drivers/iommu/mtk_iommu.c +18 -2
@@ -37,6 +37,11 @@#define REG_MMU_INVLD_START_A 0x024#define REG_MMU_INVLD_END_A 0x028 +/* In latest Coda, MMU_INV_SEL's offset is changed to 0x02c. +* So we named offset = 0x02c to "REG_MMU_INV_SEL_GEN2" +* and offset = 0x038 to "REG_MMU_INV_SEL_GEN1". +*/ +#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)
@@ -98,7 +103,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
@@ -543,11 +548,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 |
@@ -797,6 +803,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 , + .has_sub_comm = true, + .has_wr_len = true, + .has_misc_ctrl = true, + .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 , .has_4gb_mode = true,
@@ -815,6 +830,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
@@ -31,6 +31,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 v4 7/7] iommu/mediatek: Add mt6779 basic support
Quoted 22 lines · Chao Hao
1. Start from mt6779,
INVLDT_SELmove to offset=0x2c, so we addREG_MMU_INV_SEL_GEN2definition and mt6779 uses it.
2. ChangePROTECT_PA_ALIGNfrom 128 byte to 256 byte.
3. ForREG_MMU_CTRL_REGregister, we only need to change bit[2:0], others bits keep default value, ex: enable victim tlb.
4. Addmt6779_datato supportmm_iommuHW init.Change since v3:
1. When settingMMU_CTRL_REG, we don't need to include mt8173.Cc Yong Wu <[email protected]>Signed-off-by Chao Hao <[email protected]>--- drivers/iommu/mtk_iommu.c | 20 ++++++++++++++++++-- drivers/iommu/mtk_iommu.h | 1 + 2 files changed, 19 insertions(+), 2 deletions(-)drivers/iommu/mtk_iommu.c +0
-0
drivers/iommu/mtk_iommu.c line 43
Quoted 7 lines
drivers/iommu/mtk_iommu.c +4
-0@@ -37,6 +37,11 @@#define REG_MMU_INVLD_START_A 0x024#define REG_MMU_INVLD_END_A 0x028 +/* In latest Coda, MMU_INV_SEL's offset is changed to 0x02c. +* So we named offset = 0x02c to "REG_MMU_INV_SEL_GEN2" +* and offset = 0x038 to "REG_MMU_INV_SEL_GEN1". +*/
Please delete the comment, this should be understandable from the git history
drivers/iommu/mtk_iommu.c line 106
Quoted 10 lines
drivers/iommu/mtk_iommu.c +2
-1+#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)@@ -98,7 +103,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
Do we need 512 bytes for all gen2 IOMMUs?
I'm not sure if we should add this in plat_data or if we should just bump up the value for all SoCs.
In both cases this should be a separate patch.
Quoted 4 lines
drivers/iommu/mtk_iommu.c +0
-0/* * Get the local arbiter ID and the portid within the larb arbiter
drivers/iommu/mtk_iommu.c static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) · line 556
Quoted 10 lines
drivers/iommu/mtk_iommu.c +2
-1@@ -543,11 +548,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 ;
Why do we change this, is it that the bootloader for mt6779 set some values in the register we have to keep? In this case I think we should update the regval accordingly.
Quoted 40 lines
drivers/iommu/mtk_iommu.c +10
-0writel_relaxed (regval, data->base +REG_MMU_CTRL_REG ); regval = F_L2_MULIT_HIT_EN |@@ -797,6 +803,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 , + .has_sub_comm = true, + .has_wr_len = true, + .has_misc_ctrl = true, + .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 , .has_4gb_mode = true,@@ -815,6 +830,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@@ -31,6 +31,7 @@ struct mtk_iommu_suspend_reg {enum mtk_iommu_plat {M4U_MT2701 ,M4U_MT2712 , +M4U_MT6779 ,M4U_MT8173 ,M4U_MT8183 , };
Re: [PATCH v4 7/7] iommu/mediatek: Add mt6779 basic support
Quoted 27 lines · Matthias Brugger
Quoted 25 lines · Chao Hao
1. Start from mt6779,
INVLDT_SELmove to offset=0x2c, so we addREG_MMU_INV_SEL_GEN2definition and mt6779 uses it.
2. ChangePROTECT_PA_ALIGNfrom 128 byte to 256 byte.
3. ForREG_MMU_CTRL_REGregister, we only need to change bit[2:0], others bits keep default value, ex: enable victim tlb.
4. Addmt6779_datato supportmm_iommuHW init.Change since v3:
1. When settingMMU_CTRL_REG, we don't need to include mt8173.Cc Yong Wu <[email protected]>Signed-off-by Chao Hao <[email protected]>--- drivers/iommu/mtk_iommu.c | 20 ++++++++++++++++++-- drivers/iommu/mtk_iommu.h | 1 + 2 files changed, 19 insertions(+), 2 deletions(-)drivers/iommu/mtk_iommu.c +0
-0@@ -37,6 +37,11 @@#define REG_MMU_INVLD_START_A 0x024#define REG_MMU_INVLD_END_A 0x028
Quoted 6 lines
drivers/iommu/mtk_iommu.c line 43
Quoted 4 lines
drivers/iommu/mtk_iommu.c +4
-0+/* In latest Coda, MMU_INV_SEL's offset is changed to 0x02c. +* So we named offset = 0x02c to "REG_MMU_INV_SEL_GEN2" +* and offset = 0x038 to "REG_MMU_INV_SEL_GEN1". +*/ Please delete the comment, this should be understandable from the git history
ok, thanks
Quoted 9 lines
Quoted 9 lines
drivers/iommu/mtk_iommu.c +1
-0+#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)@@ -98,7 +103,7 @@#define F_MMU_INT_ID_LARB_ID (a) (((a) >> 7) & 0x7)#define F_MMU_INT_ID_PORT_ID (a) (((a) >> 2) & 0x1f)
Quoted 8 lines
drivers/iommu/mtk_iommu.c line 106
Quoted 2 lines
drivers/iommu/mtk_iommu.c +1
-1-#define MTK_PROTECT_PA_ALIGN 128 +#define MTK_PROTECT_PA_ALIGN 256Do we need 512 bytes for all gen2 IOMMUs?
I'm not sure if we should add this inplat_dataor if we should just bump up the value for all SoCs.
In both cases this should be a separate patch.
From mt6779, MTK_PROTECT_PA_ALIGN is extend to 256 bytes and don't be changed for a long time from our HW designer comment. The legacy iommu also can use it, mabye it doesn't set it by platform.
Quoted 7 lines
Quoted 7 lines
drivers/iommu/mtk_iommu.c +0
-0/* * Get the local arbiter ID and the portid within the larb arbiter @@ -543,11 +548,12 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)return ret; }
Quoted 11 lines
drivers/iommu/mtk_iommu.c static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) · line 556
Quoted 7 lines
drivers/iommu/mtk_iommu.c +2
-1+ 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 ;Why do we change this, is it that the bootloader for mt6779 set some values in the register we have to keep? In this case I think we should update the regval accordingly.
For REG_MMU_CTRL_REG, bit[12] represents victim_tlb_en feature and victim_tlb is enable defaultly(bit[12]=1),but if we use "regval = F_MMU_TF_PROT_TO_PROGRAM_ADDR", victim_tlb will disable, it will drop iommu performace for mt6779
Quoted 33 lines
Quoted 33 lines
drivers/iommu/mtk_iommu.c +10
-0writel_relaxed (regval, data->base +REG_MMU_CTRL_REG ); regval = F_L2_MULIT_HIT_EN |@@ -797,6 +803,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 , + .has_sub_comm = true, + .has_wr_len = true, + .has_misc_ctrl = true, + .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 , .has_4gb_mode = true,@@ -815,6 +830,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@@ -31,6 +31,7 @@ struct mtk_iommu_suspend_reg {
Quoted 8 lines
drivers/iommu/mtk_iommu.h struct mtk_iommu_suspend_reg { · line 37
Quoted 8 lines
drivers/iommu/mtk_iommu.h +1
-0enum 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
Matthias Brugger
maintainerRe: [PATCH v4 7/7] iommu/mediatek: Add mt6779 basic support
Quoted 54 lines · chao hao
Quoted 27 lines · Matthias Brugger
Quoted 25 lines · Chao Hao
1. Start from mt6779,
INVLDT_SELmove to offset=0x2c, so we addREG_MMU_INV_SEL_GEN2definition and mt6779 uses it.
2. ChangePROTECT_PA_ALIGNfrom 128 byte to 256 byte.
3. ForREG_MMU_CTRL_REGregister, we only need to change bit[2:0], others bits keep default value, ex: enable victim tlb.
4. Addmt6779_datato supportmm_iommuHW init.Change since v3:
1. When settingMMU_CTRL_REG, we don't need to include mt8173.Cc Yong Wu <[email protected]>Signed-off-by Chao Hao <[email protected]>--- drivers/iommu/mtk_iommu.c | 20 ++++++++++++++++++-- drivers/iommu/mtk_iommu.h | 1 + 2 files changed, 19 insertions(+), 2 deletions(-)drivers/iommu/mtk_iommu.c +0
-0@@ -37,6 +37,11 @@#define REG_MMU_INVLD_START_A 0x024#define REG_MMU_INVLD_END_A 0x028Quoted 6 lines
drivers/iommu/mtk_iommu.c line 43
Quoted 4 lines
drivers/iommu/mtk_iommu.c +4
-0+/* In latest Coda, MMU_INV_SEL's offset is changed to 0x02c. +* So we named offset = 0x02c to "REG_MMU_INV_SEL_GEN2" +* and offset = 0x038 to "REG_MMU_INV_SEL_GEN1". +*/ Please delete the comment, this should be understandable from the git history
ok, thanks
Quoted 9 lines
Quoted 9 lines
drivers/iommu/mtk_iommu.c +1
-0+#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)@@ -98,7 +103,7 @@#define F_MMU_INT_ID_LARB_ID (a) (((a) >> 7) & 0x7)#define F_MMU_INT_ID_PORT_ID (a) (((a) >> 2) & 0x1f)Quoted 8 lines
drivers/iommu/mtk_iommu.c line 106
Quoted 2 lines
drivers/iommu/mtk_iommu.c +1
-1-#define MTK_PROTECT_PA_ALIGN 128 +#define MTK_PROTECT_PA_ALIGN 256Do we need 512 bytes for all gen2 IOMMUs?
I'm not sure if we should add this inplat_dataor if we should just bump up the value for all SoCs.
In both cases this should be a separate patch.
Quoted 4 lines
From mt6779,
MTK_PROTECT_PA_ALIGNis extend to 256 bytes and don't be changed for a long time from our HW designer comment. The legacy iommu also can use it, mabye it doesn't set it by platform.
Ok then just bump it to 256 in a new patch. Thanks for clarification.
Quoted 20 lines
Quoted 8 lines
Quoted 8 lines
drivers/iommu/mtk_iommu.c +0
-0/* * Get the local arbiter ID and the portid within the larb arbiter @@ -543,11 +548,12 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)return ret; }Quoted 11 lines
drivers/iommu/mtk_iommu.c static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) · line 556
Quoted 7 lines
drivers/iommu/mtk_iommu.c +2
-1+ 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 ;Why do we change this, is it that the bootloader for mt6779 set some values in the register we have to keep? In this case I think we should update the regval accordingly.
Quoted 5 lines
For
REG_MMU_CTRL_REG, bit[12] representsvictim_tlb_enfeature andvictim_tlbis enable defaultly(bit[12]=1),but if we use "regval =F_MMU_TF_PROT_TO_PROGRAM_ADDR",victim_tlbwill disable, it will drop iommu performace for mt6779
Got it. Please put that in a separate patch then.
Regards,
Matthias
Quoted 43 lines
Quoted 42 lines
Quoted 42 lines
drivers/iommu/mtk_iommu.c +10
-0writel_relaxed (regval, data->base +REG_MMU_CTRL_REG ); regval = F_L2_MULIT_HIT_EN |@@ -797,6 +803,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 , + .has_sub_comm = true, + .has_wr_len = true, + .has_misc_ctrl = true, + .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 , .has_4gb_mode = true,@@ -815,6 +830,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@@ -31,6 +31,7 @@ struct mtk_iommu_suspend_reg {enum mtk_iommu_plat {M4U_MT2701 ,M4U_MT2712 , +M4U_MT6779 ,M4U_MT8173 ,M4U_MT8183 , };
Re: [PATCH v4 7/7] iommu/mediatek: Add mt6779 basic support
Quoted 56 lines · Matthias Brugger
Quoted 54 lines · chao hao
Quoted 27 lines · Matthias Brugger
Quoted 25 lines · Chao Hao
1. Start from mt6779,
INVLDT_SELmove to offset=0x2c, so we addREG_MMU_INV_SEL_GEN2definition and mt6779 uses it.
2. ChangePROTECT_PA_ALIGNfrom 128 byte to 256 byte.
3. ForREG_MMU_CTRL_REGregister, we only need to change bit[2:0], others bits keep default value, ex: enable victim tlb.
4. Addmt6779_datato supportmm_iommuHW init.Change since v3:
1. When settingMMU_CTRL_REG, we don't need to include mt8173.Cc Yong Wu <[email protected]>Signed-off-by Chao Hao <[email protected]>--- drivers/iommu/mtk_iommu.c | 20 ++++++++++++++++++-- drivers/iommu/mtk_iommu.h | 1 + 2 files changed, 19 insertions(+), 2 deletions(-)drivers/iommu/mtk_iommu.c +0
-0@@ -37,6 +37,11 @@#define REG_MMU_INVLD_START_A 0x024#define REG_MMU_INVLD_END_A 0x028Quoted 6 lines
drivers/iommu/mtk_iommu.c line 43
Quoted 4 lines
drivers/iommu/mtk_iommu.c +4
-0+/* In latest Coda, MMU_INV_SEL's offset is changed to 0x02c. +* So we named offset = 0x02c to "REG_MMU_INV_SEL_GEN2" +* and offset = 0x038 to "REG_MMU_INV_SEL_GEN1". +*/ Please delete the comment, this should be understandable from the git history
ok, thanks
Quoted 17 lines
drivers/iommu/mtk_iommu.c line 106
Quoted 11 lines
drivers/iommu/mtk_iommu.c +2
-1+#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)@@ -98,7 +103,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 256Do we need 512 bytes for all gen2 IOMMUs?
I'm not sure if we should add this inplat_dataor if we should just bump up the value for all SoCs.
In both cases this should be a separate patch.
Quoted 6 lines
Quoted 4 lines
From mt6779,
MTK_PROTECT_PA_ALIGNis extend to 256 bytes and don't be changed for a long time from our HW designer comment. The legacy iommu also can use it, mabye it doesn't set it by platform.Ok then just bump it to 256 in a new patch. Thanks for clarification.
Ok, thanks
Quoted 20 lines
Quoted 20 lines
Quoted 19 lines
Quoted 5 lines
drivers/iommu/mtk_iommu.c +0
-0/* * Get the local arbiter ID and the portid within the larb arbiter drivers/iommu/mtk_iommu.c static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) · line 556
Quoted 10 lines
drivers/iommu/mtk_iommu.c +2
-1@@ -543,11 +548,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 ;Why do we change this, is it that the bootloader for mt6779 set some values in the register we have to keep? In this case I think we should update the regval accordingly.
Quoted 8 lines
Quoted 5 lines
For
REG_MMU_CTRL_REG, bit[12] representsvictim_tlb_enfeature andvictim_tlbis enable defaultly(bit[12]=1),but if we use "regval =F_MMU_TF_PROT_TO_PROGRAM_ADDR",victim_tlbwill disable, it will drop iommu performace for mt6779Got it. Please put that in a separate patch then.
Ok, thanks
Quoted 46 lines
Regards,
MatthiasQuoted 43 lines
Quoted 42 lines
Quoted 42 lines
drivers/iommu/mtk_iommu.c +10
-0writel_relaxed (regval, data->base +REG_MMU_CTRL_REG ); regval = F_L2_MULIT_HIT_EN |@@ -797,6 +803,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 , + .has_sub_comm = true, + .has_wr_len = true, + .has_misc_ctrl = true, + .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 , .has_4gb_mode = true,@@ -815,6 +830,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@@ -31,6 +31,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