MT8195 IOMMU SUPPORT
Subsystems (5)
Yong Wu
maintainerv2 cover MT8195 IOMMU SUPPORT
This patchset add mt8195 iommu support.
mt8195 have 3 IOMMU HWs. 2 IOMMU HW is for multimedia, and 1 IOMMU HW is for infra-master, like PCIe/USB.
About the 2 MM IOMMU HW, something like this:
IOMMU(VDO) IOMMU(VPP)
| |
SMI_COMMON(VDO) SMI_COMMON(VPP)
--------------- ----------------
| | ... | | ...
larb0 larb2 ... larb1 larb3 ...these two MM IOMMU HW share a pgtable.
About the INFRA IOMMU, it don't have larbs, the master connects the iommu directly. It use a independent pgtable.
Also, mt8195 IOMMU bank supports.Normally the IOMMU register size only is 0x1000. In this IOMMU HW, the register size is 5 * 0x1000. each 0x1000 is a bank. the banks' register look like this:
----------------------------------------
|bank0 | bank1 | bank2 | bank3 | bank4|
----------------------------------------
|global |
|control| null
|regs |
-----------------------------------------
|bank |bank |bank |bank |bank |
|regs |regs |regs |regs |regs |
| | | | | |
-----------------------------------------All the banks share some global control registers, and each bank have its special bank registers, like pgtable base register, tlb operation registers, the fault status registers.
In mt8195, we enable this bank feature for infra iommu, We put PCIe in bank0 and USB in bank4. they have independent pgtable.
patch[1..19]: support mt8195 iommu.
patch[20..29]: support bank feature.
TODO: there is another APU_IOMMU in mt8195, this should depend on APU patches. thus, we need add that feature after that.
Change note:
v2: 1) Base on v5.14-rc1.
2) Fix build fail for arm32.
3) Fix dt-binding issue from Rob.
4) Fix the bank issue when tlb flush. v1 always use bank->base.
5) Adjust devlink with smi-common since the node may be smi-sub-common.
6) other changes: like reword some commit message(removing many "This patch..."); seperate serveral patches.
v1: https://lore.kernel.org/linux-mediatek/[email protected]/
Base on v5.13-rc1.
Yong Wu (29):
dt-bindings: mediatek: mt8195: Add binding for MM IOMMU
dt-bindings: mediatek: mt8195: Add binding for infra IOMMU iommu/mediatek: Fix 2 HW sharing pgtable issue iommu/mediatek: Adapt sharing and non-sharing pgtable case iommu/mediatek: Add 12G~16G support for multi domains iommu/mediatek: Add a flag DCM_DISABLE iommu/mediatek: Add a flag NON_STD_AXI iommu/mediatek: Remove for_each_m4u in tlb_sync_all iommu/mediatek: Add tlb_lock in tlb_flush_all iommu/mediatek: Remove the granule in the tlb flush iommu/mediatek: Always pm_runtime_get while tlb flush iommu/mediatek: Always enable output PA over 32bits in isr iommu/mediatek: Add SUB_COMMON_3BITS flag iommu/mediatek: Add IOMMU_TYPE flag iommu/mediatek: Contain MM IOMMU flow with the MM TYPE iommu/mediatek: Adjust device link when it is sub-common iommu/mediatek: Add infra iommu support iommu/mediatek: Add PCIe support
iommu/mediatek: Add mt8195 support iommu/mediatek: Only adjust code about register base iommu/mediatek: Just move code position in hw_init iommu/mediatek: Add mtk_iommu_bank_data structure iommu/mediatek: Initialise bank HW for each a bank iommu/mediatek: Add bank_nr and bank_enable iommu/mediatek: Change the domid to iova_region_id iommu/mediatek: Get the proper bankid for multi banks iommu/mediatek: Initialise/Remove for multi bank dev iommu/mediatek: Backup/restore regsiters for multi banks iommu/mediatek: mt8195: Enable multi banks for infra iommu
.../bindings/iommu/mediatek,iommu.yaml | 20 +- drivers/iommu/mtk_iommu.c | 792 ++++++++++++------ drivers/iommu/mtk_iommu.h | 55 +- .../dt-bindings/memory/mt8195-memory-port.h | 408 +++++++++ include/dt-bindings/memory/mtk-memory-port.h | 2 + 5 files changed, 1010 insertions(+), 267 deletions(-) create mode 100644 include/dt-bindings/memory/mt8195-memory-port.h
Signature · 1 line
2.18.0
Yong Wu
maintainerPATCH v2 1/29 dt-bindings: mediatek: mt8195: Add binding for MM IOMMU
This patch adds descriptions for mt8195 IOMMU which also use ARM Short-Descriptor translation table format.
In mt8195, there are two smi-common HW and IOMMU, one is for vdo(video output), the other is for vpp(video processing pipe). They connects with different smi-larbs, then some setting(larbid_remap) is different. Differentiate them with the compatible string.
Something like this:
IOMMU(VDO) IOMMU(VPP)
| |
SMI_COMMON_VDO SMI_COMMON_VPP --------------- ---------------- | | ... | | ...
larb0 larb2 ... larb1 larb3 ...
Another change is that we have a new IOMMU that is for infra master like PCIe and USB. The infra master don't have the larb and ports, thus we rename the port header file to mt8195-memory-port.h rather than mt8195-larb-port.h.
Also, the IOMMU is not only for MM, thus, we don't call it "m4u" which means "MultiMedia Memory Management UNIT". thus, use the "iommu" as the compatiable string.
--- .../bindings/iommu/mediatek,iommu.yaml | 7 + .../dt-bindings/memory/mt8195-memory-port.h | 390 ++++++++++++++++++ 2 files changed, 397 insertions(+) create mode 100644 include/dt-bindings/memory/mt8195-memory-port.h
Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml +7 -0
@@ -77,6 +77,8 @@ properties: - mediatek,mt8173-m4u # generation two - mediatek,mt8183-m4u # generation two - mediatek,mt8192-m4u # generation two + - mediatek,mt8195-iommu-vdo # generation two + - mediatek,mt8195-iommu-vpp # generation two - description: mt7623 generation one items:
@@ -118,6 +120,7 @@ properties: dt-binding/memory/mt8173-larb-port.h for mt8173, dt-binding/memory/mt8183-larb-port.h for mt8183, dt-binding/memory/mt8192-larb-port.h for mt8192. + dt-binding/memory/mt8195-memory-port.h for mt8195. power-domains: maxItems: 1
@@ -139,6 +142,8 @@ allOf: - mediatek,mt2712-m4u - mediatek,mt8173-m4u - mediatek,mt8192-m4u + - mediatek,mt8195-iommu-vdo + - mediatek,mt8195-iommu-vpp then: required:
@@ -149,6 +154,8 @@ allOf: compatible: enum: - mediatek,mt8192-m4u + - mediatek,mt8195-iommu-vdo + - mediatek,mt8195-iommu-vpp then: required:
include/dt-bindings/memory/mt8195-memory-port.h new file +390 -0
390 lines not on this page · raw message
Signature · 1 line
2.18.0
Yong Wu
maintainerPATCH v2 2/29 dt-bindings: mediatek: mt8195: Add binding for infra IOMMU
In reply to Yong WuIn mt8195, we have a new IOMMU that is for INFRA IOMMU. its masters mainly are PCIe and USB. Different with MM IOMMU, all these masters connect with IOMMU directly, there is no mediatek,larbs property for infra IOMMU.
Another thing is about PCIe ports. currently the function "of_iommu_configure_dev_id" only support the id number is 1, But our PCIe have two ports, one is for reading and the other is for writing. see more about the PCIe patch in this patchset. Thus, I only list the reading id here and add the other id in our driver.
---
Change note: use "contains" commented from Rob.
--- .../bindings/iommu/mediatek,iommu.yaml | 13 ++++++++++++- .../dt-bindings/memory/mt8195-memory-port.h | 18 ++++++++++++++++++ include/dt-bindings/memory/mtk-memory-port.h | 2 ++ 3 files changed, 32 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml +12 -1
@@ -79,6 +79,7 @@ properties: - mediatek,mt8192-m4u # generation two - mediatek,mt8195-iommu-vdo # generation two - mediatek,mt8195-iommu-vpp # generation two + - mediatek,mt8195-iommu-infra # generation two - description: mt7623 generation one items:
@@ -129,7 +130,6 @@ required: - compatible - reg - interrupts - - mediatek,larbs - '#iommu-cells' allOf:
@@ -161,6 +161,17 @@ allOf: required: - power-domains + - if: # The IOMMUs don't have larbs. + not: + properties: + compatible: + contains: + const: mediatek,mt8195-iommu-infra + + then: + required: + - mediatek,larbs + additionalProperties: false examples:
include/dt-bindings/memory/mt8195-memory-port.h +18 -0
@@ -387,4 +387,22 @@#define M4U_PORT_L28_CAM_DRZS4NO_R1 MTK_M4U_ID(28, 5)#define M4U_PORT_L28_CAM_TNCSO_R1 MTK_M4U_ID(28, 6) +/* Infra iommu ports */ +/* PCIe1: read: BIT16; write BIT17. */ +#define IOMMU_PORT_INFRA_PCIE1 MTK_IFAIOMMU_PERI_ID(16) +/* PCIe0: read: BIT18; write BIT19. */ +#define IOMMU_PORT_INFRA_PCIE0 MTK_IFAIOMMU_PERI_ID(18) +#define IOMMU_PORT_INFRA_SSUSB_P3_R MTK_IFAIOMMU_PERI_ID(20) +#define IOMMU_PORT_INFRA_SSUSB_P3_W MTK_IFAIOMMU_PERI_ID(21) +#define IOMMU_PORT_INFRA_SSUSB_P2_R MTK_IFAIOMMU_PERI_ID(22) +#define IOMMU_PORT_INFRA_SSUSB_P2_W MTK_IFAIOMMU_PERI_ID(23) +#define IOMMU_PORT_INFRA_SSUSB_P1_1_R MTK_IFAIOMMU_PERI_ID(24) +#define IOMMU_PORT_INFRA_SSUSB_P1_1_W MTK_IFAIOMMU_PERI_ID(25) +#define IOMMU_PORT_INFRA_SSUSB_P1_0_R MTK_IFAIOMMU_PERI_ID(26) +#define IOMMU_PORT_INFRA_SSUSB_P1_0_W MTK_IFAIOMMU_PERI_ID(27) +#define IOMMU_PORT_INFRA_SSUSB2_R MTK_IFAIOMMU_PERI_ID(28) +#define IOMMU_PORT_INFRA_SSUSB2_W MTK_IFAIOMMU_PERI_ID(29) +#define IOMMU_PORT_INFRA_SSUSB_R MTK_IFAIOMMU_PERI_ID(30) +#define IOMMU_PORT_INFRA_SSUSB_W MTK_IFAIOMMU_PERI_ID(31) +#endif
include/dt-bindings/memory/mtk-memory-port.h +2 -0
@@ -12,4 +12,6 @@#define MTK_M4U_TO_LARB (id) (((id) >> 5) & 0x1f)#define MTK_M4U_TO_PORT (id) ((id) & 0x1f) +#define MTK_IFAIOMMU_PERI_ID (port) MTK_M4U_ID(0, port) +#endif
Signature · 1 line
2.18.0
Re: [PATCH v2 02/29] dt-bindings: mediatek: mt8195: Add binding for infra IOMMU
Quoted 13 lines · Yong Wu
In mt8195, we have a new IOMMU that is for INFRA IOMMU. its masters mainly are PCIe and USB. Different with MM IOMMU, all these masters connect with IOMMU directly, there is no mediatek,larbs property for infra IOMMU.
Another thing is about PCIe ports. currently the function "
of_iommu_configure_dev_id" only support the id number is 1, But our PCIe have two ports, one is for reading and the other is for writing. see more about the PCIe patch in this patchset. Thus, I only list the reading id here and add the other id in our driver.Signed-off-by Yong Wu <[email protected]>
Quoted 8 lines
---
Change note: use "contains" commented from Rob.--- .../bindings/iommu/mediatek,iommu.yaml | 13 ++++++++++++- .../dt-bindings/memory/mt8195-memory-port.h | 18 ++++++++++++++++++ include/dt-bindings/memory/mtk-memory-port.h | 2 ++ 3 files changed, 32 insertions(+), 1 deletion(-)
Yong Wu
maintainerPATCH v2 3/29 iommu/mediatek: Fix 2 HW sharing pgtable issue
In reply to Yong WuIn the commit 4f956c97d26b ("iommu/mediatek: Move domain_finalise into attach_device"), I overlooked the sharing pgtable case. After that commit, the "data" in the mtk_iommu_domain_finalise always is the data of the current IOMMU HW. Fix this for the sharing pgtable case.
Only affect mt2712 which is the only SoC that share pgtable currently.
--- drivers/iommu/mtk_iommu.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/iommu/mtk_iommu.c +5 -2
@@ -458,7 +458,7 @@ static void mtk_iommu_domain_free(struct iommu_domain *domain)static int mtk_iommu_attach_device (struct iommu_domain *domain,struct device *dev) { -struct mtk_iommu_data *data =dev_iommu_priv_get (dev); +struct mtk_iommu_data *data =dev_iommu_priv_get (dev), *frstdata;struct mtk_iommu_domain *dom =to_mtk_domain (domain);struct device *m4udev = data->dev;int ret, domid;
@@ -468,7 +468,10 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,return domid;if (!dom->data) { -if (mtk_iommu_domain_finalise (dom, data, domid)) +/* Data is in the frstdata in sharing pgtable case. */ + frstdata =mtk_iommu_get_m4u_data (); + +if (mtk_iommu_domain_finalise (dom, frstdata, domid))return -ENODEV ; dom->data = data; }
Signature · 1 line
2.18.0
Yong Wu
maintainerPATCH v2 4/29 iommu/mediatek: Adapt sharing and non-sharing pgtable case
In reply to Yong WuIn previous mt2712, Both IOMMUs are MM IOMMU, and they will share pgtable. However in the latest SoC, another is infra IOMMU, there is no reason to share pgtable between MM with INFRA IOMMU. This patch manage to implement the two case(sharing and non-sharing pgtable).
Currently we use for_each_m4u to loop the 2 HWs. Add the list_head into this macro.
In the sharing pgtable case, the list_head is the global "m4ulist". In the non-sharing pgtable case, the list_head is hw_list_head which is a variable in the "data". then for_each_m4u will only loop itself.
--- drivers/iommu/mtk_iommu.c | 47 ++++++++++++++++++++++----------------- drivers/iommu/mtk_iommu.h | 7 ++++++ 2 files changed, 33 insertions(+), 21 deletions(-)
drivers/iommu/mtk_iommu.c +26 -21
@@ -119,6 +119,7 @@#define WR_THROT_EN BIT(6)#define HAS_LEGACY_IVRP_PADDR BIT(7)#define IOVA_34_EN BIT(8) +#define SHARE_PGTABLE BIT(9)/* 2 HW share pgtable */ #define MTK_IOMMU_HAS_FLAG (pdata, _x) \ ((((pdata)->flags) & (_x)) == (_x))
@@ -166,7 +167,7 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data);static LIST_HEAD (m4ulist);/* List all the M4U HWs */ -#define for_each_m4u (data) list_for_each_entry(data, &m4ulist, list) +#define for_each_m4u (data, head) list_for_each_entry(data, head, list)struct mtk_iommu_iova_region {dma_addr_t iova_base;
@@ -187,21 +188,10 @@ static const struct mtk_iommu_iova_region mt8192_multi_dom[] = {#endif }; -/* -* There may be 1 or 2 M4U HWs, But we always expect they are in the same domain -* for the performance. -* -* Here always return the mtk_iommu_data of the first probed M4U where the -* iommu domain information is recorded. -*/ -static struct mtk_iommu_data *mtk_iommu_get_m4u_data (void ) +/* If 2 M4U share a domain(use the same hwlist), Put the corresponding info in first data.*/ +static struct mtk_iommu_data *mtk_iommu_get_frst_data (struct list_head *hwlist) { -struct mtk_iommu_data *data; - -for_each_m4u (data) -return data; - -return NULL ; + return list_first_entry(hwlist, struct mtk_iommu_data, list); }static struct mtk_iommu_domain *to_mtk_domain (struct iommu_domain *dom)
@@ -211,7 +201,9 @@ static struct mtk_iommu_domain *to_mtk_domain(struct iommu_domain *dom)static void mtk_iommu_tlb_flush_all (struct mtk_iommu_data *data) { -for_each_m4u (data) { +struct list_head *head = data->hw_list; + +for_each_m4u (data, head) {if (pm_runtime_get_if_in_use (data->dev) <=0 )continue ;
@@ -228,12 +220,13 @@ static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size,size_t granule, struct mtk_iommu_data *data) { + struct list_head *head = data->hw_list;bool has_pm = !!data->dev->pm_domain;unsigned long flags;int ret;u32 tmp; -for_each_m4u (data) { +for_each_m4u (data, head) {if (has_pm) {if (pm_runtime_get_if_in_use (data->dev) <=0 )continue ;
@@ -460,6 +453,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain, {struct mtk_iommu_data *data =dev_iommu_priv_get (dev), *frstdata;struct mtk_iommu_domain *dom =to_mtk_domain (domain); +struct list_head *hw_list = data->hw_list;struct device *m4udev = data->dev;int ret, domid;
@@ -469,7 +463,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,if (!dom->data) {/* Data is in the frstdata in sharing pgtable case. */ - frstdata =mtk_iommu_get_m4u_data (); + frstdata =mtk_iommu_get_frst_data (hw_list);if (mtk_iommu_domain_finalise (dom, frstdata, domid))return -ENODEV ;
@@ -595,10 +589,12 @@ static void mtk_iommu_release_device(struct device *dev)static struct iommu_group *mtk_iommu_device_group (struct device *dev) { -struct mtk_iommu_data *data =mtk_iommu_get_m4u_data (); +struct mtk_iommu_data *c_data =dev_iommu_priv_get (dev), *data; +struct list_head *hw_list = c_data->hw_list;struct iommu_group *group;int domid; + data =mtk_iommu_get_frst_data (hw_list);if (!data)return ERR_PTR (-ENODEV );
@@ -899,7 +895,15 @@ static int mtk_iommu_probe(struct platform_device *pdev) goto out_sysfs_remove;spin_lock_init (&data->tlb_lock); -list_add_tail (&data->list, &m4ulist); + +if (MTK_IOMMU_HAS_FLAG (data->plat_data,SHARE_PGTABLE )) { +list_add_tail (&data->list, data->plat_data->hw_list); + data->hw_list = data->plat_data->hw_list; + }else { +INIT_LIST_HEAD (&data->hw_list_head); +list_add_tail (&data->list, &data->hw_list_head); + data->hw_list = &data->hw_list_head; + }if (!iommu_present (&platform_bus_type)) { ret =bus_set_iommu (&platform_bus_type, &mtk_iommu_ops);
@@ -1003,7 +1007,8 @@ static const struct dev_pm_ops mtk_iommu_pm_ops = {static const struct mtk_iommu_plat_data mt2712_data = { .m4u_plat =M4U_MT2712 , - .flags =HAS_4GB_MODE |HAS_BCLK |HAS_VLD_PA_RNG , + .flags =HAS_4GB_MODE |HAS_BCLK |HAS_VLD_PA_RNG |SHARE_PGTABLE , + .hw_list = &m4ulist, .inv_sel_reg =REG_MMU_INV_SEL_GEN1 , .iova_region = single_domain, .iova_region_nr =ARRAY_SIZE (single_domain),
drivers/iommu/mtk_iommu.h +7 -0
@@ -55,6 +55,7 @@ struct mtk_iommu_plat_data {u32 flags;u32 inv_sel_reg; +struct list_head *hw_list;unsigned int iova_region_nr;const struct mtk_iommu_iova_region *iova_region;unsigned char larbid_remap[MTK_LARB_COM_MAX ][MTK_LARB_SUBCOM_MAX ];
@@ -80,6 +81,12 @@ struct mtk_iommu_data {struct dma_iommu_mapping *mapping;/* For mtk_iommu_v1.c */ +/* +* In the sharing pgtable case, list data->list to the global list like m4ulist. +* In the non-sharing pgtable case, list data->list to the itself hw_list_head. +*/ +struct list_head *hw_list; +struct list_head hw_list_head;struct list_head list;struct mtk_smi_larb_iommu larb_imu[MTK_LARB_NR_MAX ]; };
Signature · 1 line
2.18.0
Yong Wu
maintainerPATCH v2 5/29 iommu/mediatek: Add 12G~16G support for multi domains
In reply to Yong WuIn mt8192, we preassign 0-4G; 4G-8G; 8G-12G for different multimedia engines. This depends on the "dma-ranges=" in the iommu consumer's dtsi node.
Adds 12G-16G region here. and reword the previous comment. we don't limit which master locate in which region.
CCU still is 8G-12G. Don't change it here.
--- drivers/iommu/mtk_iommu.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/iommu/mtk_iommu.c +5 -3
@@ -179,10 +179,12 @@ static const struct mtk_iommu_iova_region single_domain[] = { };static const struct mtk_iommu_iova_region mt8192_multi_dom[] = { - { .iova_base =0x0 , .size =SZ_4G },/* disp: 0 ~ 4G */ + { .iova_base =0x0 , .size =SZ_4G },/* 0 ~ 4G */ #if IS_ENABLED(CONFIG_ARCH_DMA_ADDR_T_64BIT) - { .iova_base =SZ_4G , .size =SZ_4G },/* vdec: 4G ~ 8G */ - { .iova_base =SZ_4G *2 , .size =SZ_4G },/* CAM/MDP: 8G ~ 12G */ + { .iova_base =SZ_4G , .size =SZ_4G },/* 4G ~ 8G */ + { .iova_base =SZ_4G *2 , .size =SZ_4G },/* 8G ~ 12G */ + { .iova_base =SZ_4G *3 , .size =SZ_4G },/* 12G ~ 16G */ + { .iova_base =0x240000000ULL , .size =0x4000000 },/* CCU0 */ { .iova_base =0x244000000ULL , .size =0x4000000 },/* CCU1 */ #endif
Signature · 1 line
2.18.0
Yong Wu
maintainerPATCH v2 6/29 iommu/mediatek: Add a flag DCM_DISABLE
In reply to Yong WuIn the infra iommu, we should disable DCM. add a new flag for this.
--- drivers/iommu/mtk_iommu.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/iommu/mtk_iommu.c +8 -1
@@ -52,6 +52,8 @@#define F_MMU_STANDARD_AXI_MODE_MASK (BIT(3) | BIT(19))#define REG_MMU_DCM_DIS 0x050 +#define F_MMU_DCM BIT(8) +#define REG_MMU_WR_LEN_CTRL 0x054#define F_MMU_WR_THROT_DIS_MASK (BIT(5) | BIT(21))
@@ -120,6 +122,7 @@#define HAS_LEGACY_IVRP_PADDR BIT(7)#define IOVA_34_EN BIT(8)#define SHARE_PGTABLE BIT(9)/* 2 HW share pgtable */ +#define DCM_DISABLE BIT(10)#define MTK_IOMMU_HAS_FLAG (pdata, _x) \ ((((pdata)->flags) & (_x)) == (_x))
@@ -733,7 +736,11 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) regval =F_MMU_VLD_PA_RNG (7 ,4 );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,DCM_DISABLE )) +writel_relaxed (F_MMU_DCM , data->base +REG_MMU_DCM_DIS ); +else +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_CTRL );
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v2 7/29 iommu/mediatek: Add a flag NON_STD_AXI
In reply to Yong WuAdd a new flag NON_STD_AXI, All the previous SoC support this flag. Prepare for adding infra and apu iommu which don't support this.
--- drivers/iommu/mtk_iommu.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
drivers/iommu/mtk_iommu.c +10 -6
@@ -123,6 +123,7 @@#define IOVA_34_EN BIT(8)#define SHARE_PGTABLE BIT(9)/* 2 HW share pgtable */ #define DCM_DISABLE BIT(10) +#define NOT_STD_AXI_MODE BIT(11)#define MTK_IOMMU_HAS_FLAG (pdata, _x) \ ((((pdata)->flags) & (_x)) == (_x))
@@ -753,7 +754,8 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) regval =0 ; }else { regval =readl_relaxed (data->base +REG_MMU_MISC_CTRL ); - regval &= ~F_MMU_STANDARD_AXI_MODE_MASK ; +if (MTK_IOMMU_HAS_FLAG (data->plat_data,NOT_STD_AXI_MODE )) + regval &= ~F_MMU_STANDARD_AXI_MODE_MASK ;if (MTK_IOMMU_HAS_FLAG (data->plat_data,OUT_ORDER_WR_EN )) regval &= ~F_MMU_IN_ORDER_WR_EN_MASK ; }
@@ -1016,7 +1018,8 @@ static const struct dev_pm_ops mtk_iommu_pm_ops = {static const struct mtk_iommu_plat_data mt2712_data = { .m4u_plat =M4U_MT2712 , - .flags =HAS_4GB_MODE |HAS_BCLK |HAS_VLD_PA_RNG |SHARE_PGTABLE , + .flags =HAS_4GB_MODE |HAS_BCLK |HAS_VLD_PA_RNG |SHARE_PGTABLE | +NOT_STD_AXI_MODE , .hw_list = &m4ulist, .inv_sel_reg =REG_MMU_INV_SEL_GEN1 , .iova_region = single_domain,
@@ -1026,7 +1029,8 @@ static const struct mtk_iommu_plat_data mt2712_data = {static const struct mtk_iommu_plat_data mt6779_data = { .m4u_plat =M4U_MT6779 , - .flags =HAS_SUB_COMM |OUT_ORDER_WR_EN |WR_THROT_EN , + .flags =HAS_SUB_COMM |OUT_ORDER_WR_EN |WR_THROT_EN | +NOT_STD_AXI_MODE , .inv_sel_reg =REG_MMU_INV_SEL_GEN2 , .iova_region = single_domain, .iova_region_nr =ARRAY_SIZE (single_domain),
@@ -1035,7 +1039,7 @@ static const struct mtk_iommu_plat_data mt6779_data = {static const struct mtk_iommu_plat_data mt8167_data = { .m4u_plat =M4U_MT8167 , - .flags =RESET_AXI |HAS_LEGACY_IVRP_PADDR , + .flags =RESET_AXI |HAS_LEGACY_IVRP_PADDR |NOT_STD_AXI_MODE , .inv_sel_reg =REG_MMU_INV_SEL_GEN1 , .iova_region = single_domain, .iova_region_nr =ARRAY_SIZE (single_domain),
@@ -1045,7 +1049,7 @@ static const struct mtk_iommu_plat_data mt8167_data = {static const struct mtk_iommu_plat_data mt8173_data = { .m4u_plat =M4U_MT8173 , .flags =HAS_4GB_MODE |HAS_BCLK |RESET_AXI | -HAS_LEGACY_IVRP_PADDR , +HAS_LEGACY_IVRP_PADDR |NOT_STD_AXI_MODE , .inv_sel_reg =REG_MMU_INV_SEL_GEN1 , .iova_region = single_domain, .iova_region_nr =ARRAY_SIZE (single_domain),
@@ -1064,7 +1068,7 @@ static const struct mtk_iommu_plat_data mt8183_data = {static const struct mtk_iommu_plat_data mt8192_data = { .m4u_plat =M4U_MT8192 , .flags =HAS_BCLK |HAS_SUB_COMM |OUT_ORDER_WR_EN | -WR_THROT_EN |IOVA_34_EN , +WR_THROT_EN |IOVA_34_EN |NOT_STD_AXI_MODE , .inv_sel_reg =REG_MMU_INV_SEL_GEN2 , .iova_region = mt8192_multi_dom, .iova_region_nr =ARRAY_SIZE (mt8192_multi_dom),
Signature · 1 line
2.18.0
Yong Wu
maintainerPATCH v2 8/29 iommu/mediatek: Remove for_each_m4u in tlb_sync_all
In reply to Yong WuThe tlb_sync_all is called from these three functions:
a) flush_iotlb_all: it will be called for each a iommu HW.
b) tlb_flush_range_sync: it already has for_each_m4u.
c) in irq: some IOMMU HW translation fault, Only need flush itself.
Thus, No need for_each_m4u in this tlb_sync_all. Remove it.
--- drivers/iommu/mtk_iommu.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)
drivers/iommu/mtk_iommu.c +7 -11
@@ -207,19 +207,15 @@ static struct mtk_iommu_domain *to_mtk_domain(struct iommu_domain *dom)static void mtk_iommu_tlb_flush_all (struct mtk_iommu_data *data) { -struct list_head *head = data->hw_list; - -for_each_m4u (data, head) { -if (pm_runtime_get_if_in_use (data->dev) <=0 ) -continue ; +if (pm_runtime_get_if_in_use (data->dev) <=0 ) +return ; -writel_relaxed (F_INVLD_EN1 |F_INVLD_EN0 , - 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 */ +writel_relaxed (F_INVLD_EN1 |F_INVLD_EN0 , + 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 */ -pm_runtime_put (data->dev); - } +pm_runtime_put (data->dev); } static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size,
Signature · 1 line
2.18.0
Yong Wu
maintainerPATCH v2 9/29 iommu/mediatek: Add tlb_lock in tlb_flush_all
In reply to Yong WuThe tlb_flush_all also touches the registers about tlb operations. Add spinlock in it to protect the tlb registers. If flush_all is called from tlb_flush_range, then no need this spinlock as tlb_flush_range already hold the tlb_lock.
--- drivers/iommu/mtk_iommu.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-)
drivers/iommu/mtk_iommu.c +14 -5
@@ -205,15 +205,24 @@ static struct mtk_iommu_domain *to_mtk_domain(struct iommu_domain *dom) return container_of(dom, struct mtk_iommu_domain, domain); } -static void mtk_iommu_tlb_flush_all (struct mtk_iommu_data *data) +static void __mtk_iommu_tlb_flush_all (struct mtk_iommu_data *data) { -if (pm_runtime_get_if_in_use (data->dev) <=0 ) -return ; -writel_relaxed (F_INVLD_EN1 |F_INVLD_EN0 , 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 */ +} + +static void mtk_iommu_tlb_flush_all (struct mtk_iommu_data *data) +{ +unsigned long flags; + +if (pm_runtime_get_if_in_use (data->dev) <=0 ) +return ; + +spin_lock_irqsave (&data->tlb_lock, flags); +__mtk_iommu_tlb_flush_all (data); +spin_unlock_irqrestore (&data->tlb_lock, flags);pm_runtime_put (data->dev); }
@@ -251,7 +260,7 @@ static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size,if (ret) {dev_warn (data->dev,"Partial TLB flush timed out, falling back to full flush\n" ); -mtk_iommu_tlb_flush_all (data); +__mtk_iommu_tlb_flush_all (data); }/* Clear the CPE status */ writel_relaxed (0 , data->base +REG_MMU_CPE_DONE );
Signature · 1 line
2.18.0
Yong Wu
maintainerPATCH v2 10/29 iommu/mediatek: Remove the granule in the tlb flush
In reply to Yong WuThe MediaTek IOMMU don't care about granule when tlb flushing. Remove this variable.
--- drivers/iommu/mtk_iommu.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/iommu/mtk_iommu.c +2 -4
@@ -228,7 +228,6 @@ static void mtk_iommu_tlb_flush_all(struct mtk_iommu_data *data) }static void mtk_iommu_tlb_flush_range_sync (unsigned long iova,size_t size, -size_t granule,struct mtk_iommu_data *data) {struct list_head *head = data->hw_list;
@@ -550,8 +549,7 @@ static void mtk_iommu_iotlb_sync(struct iommu_domain *domain,struct mtk_iommu_domain *dom =to_mtk_domain (domain);size_t length = gather->end - gather->start +1 ; -mtk_iommu_tlb_flush_range_sync (gather->start, length, gather->pgsize, - dom->data); +mtk_iommu_tlb_flush_range_sync (gather->start, length, dom->data); } static void mtk_iommu_sync_map(struct iommu_domain *domain, unsigned long iova,
@@ -559,7 +557,7 @@ static void mtk_iommu_sync_map(struct iommu_domain *domain, unsigned long iova, {struct mtk_iommu_domain *dom =to_mtk_domain (domain); -mtk_iommu_tlb_flush_range_sync (iova, size, size, dom->data); +mtk_iommu_tlb_flush_range_sync (iova, size, dom->data); } static phys_addr_t mtk_iommu_iova_to_phys(struct iommu_domain *domain,
Signature · 1 line
2.18.0
Yong Wu
maintainerPATCH v2 11/29 iommu/mediatek: Always pm_runtime_get while tlb flush
In reply to Yong WuPrepare for 2 HWs that sharing pgtable in different power-domains.
The previous SoC don't have PM. Only mt8192 has power-domain, and it is display's power-domain which nearly always is enabled.
When there are 2 M4U HWs, it may has problem.
In this function, we get the pm_status via the m4u dev, but it don't reflect the real power-domain status of the HW since there may be other HW also use that power-domain.
Currently we could not get the real power-domain status, thus always pm_runtime_get here.
Prepare for mt8195, thus, no need fix tags here.
This patch may drop the performance, we expect the user could pm_runtime_get_sync before dma_alloc_attrs which need tlb ops.
--- drivers/iommu/mtk_iommu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/iommu/mtk_iommu.c +4 -1
@@ -238,8 +238,11 @@ static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size,for_each_m4u (data, head) {if (has_pm) { -if (pm_runtime_get_if_in_use (data->dev) <=0 ) + ret =pm_runtime_resume_and_get (data->dev); +if (ret <0 ) { +dev_err (data->dev,"tlb flush: pm get fail %d.\n" , ret);continue ; + } }spin_lock_irqsave (&data->tlb_lock, flags);
Signature · 1 line
2.18.0
Re: [PATCH v2 11/29] iommu/mediatek: Always pm_runtime_get while tlb flush
Quoted 11 lines · Yong Wu
Prepare for 2 HWs that sharing pgtable in different power-domains.
The previous SoC don't have PM. Only mt8192 has power-domain, and it is display's power-domain which nearly always is enabled.
When there are 2 M4U HWs, it may has problem.
In this function, we get thepm_statusvia the m4u dev, but it don't reflect the real power-domain status of the HW since there may be other HW also use that power-domain.
Quoted 7 lines
Currently we could not get the real power-domain status, thus always
pm_runtime_gethere.Prepare for mt8195, thus, no need fix tags here.
This patch may drop the performance, we expect the user could
pm_runtime_get_syncbeforedma_alloc_attrswhich need tlb ops.
Can you check if there are existing users that need to add this change?
Quoted 3 lines
Signed-off-by Yong Wu <[email protected]>---
<snip>
Yong Wu (吴勇)
maintainerRe: [PATCH v2 11/29] iommu/mediatek: Always pm_runtime_get while tlb flush
Quoted 18 lines · Hsin-Yi Wang
Quoted 17 lines · Yong Wu
Prepare for 2 HWs that sharing pgtable in different power-domains.
The previous SoC don't have PM. Only mt8192 has power-domain, and it is display's power-domain which nearly always is enabled.
When there are 2 M4U HWs, it may has problem.
In this function, we get thepm_statusvia the m4u dev, but it don't
reflect the real power-domain status of the HW since there may be other
HW also use that power-domain.Currently we could not get the real power-domain status, thus always
pm_runtime_gethere.
Quoted 7 lines
Quoted 4 lines
Prepare for mt8195, thus, no need fix tags here.
This patch may drop the performance, we expect the user could
pm_runtime_get_syncbeforedma_alloc_attrswhich need tlb ops.Can you check if there are existing users that need to add this change?
The issue may exist in our most users. Our users mainly are in v4l2. normally their flow like this:
a) VIDIOC_REQBUFS: call dma_alloc_attrs or dma_buf_map_attachment.
b) VIDIOC_STREAMON.
c) VIDIOC_QBUF: device_run: pm_runtime_get_sync.
Requesting they call pm_runtime_get before dma_alloc_attrs looks not reasonable. It seems that they should not care about this.
This patch mainly make sure the flow is right. Locally I have a TODO to try get the real power-domain status here, the sample code like below:
static struct notifier_block mtk_penpd_notifier;
/* Register the genpd notifier. */ mtk_penpd_notifier.notifier_call = mtk_iommu_pd_callback; ret = dev_pm_genpd_add_notifier(dev, &mtk_penpd_notifier);
/* Then get the real power domain status in the notifier */
static int mtk_iommu_pd_callback(struct notifier_block *nb,
unsigned long flags, void *data)
{
if (flags == GENPD_NOTIFY_ON)
/* the real power domain is power on */
else if (flags == GENPD_NOTIFY_PRE_OFF)
/* the real power domain are going to power off. Take it aspower off.
* Skip the tlb ops after receivice this flag. */
}
How about this? or any other suggestion to get the real power-domain
rather than the iommu device's power domain status.
Thanks.
Quoted 7 lines
Quoted 5 lines
Signed-off-by Yong Wu <[email protected]>---
<snip>
Re: [PATCH v2 11/29] iommu/mediatek: Always pm_runtime_get while tlb flush
In reply to Yong WuQuoted 4 lines · Yong Wu
Prepare for 2 HWs that sharing pgtable in different power-domains.
The previous SoC don't have PM. Only mt8192 has power-domain, and it is display's power-domain which nearly always is enabled.
hi, I see that in mt1873.dtsi, many devices that uses the iommu have the 'power-domains' property.
Quoted 6 lines
When there are 2 M4U HWs, it may has problem.
In this function, we get thepm_statusvia the m4u dev, but it don't reflect the real power-domain status of the HW since there may be other HW also use that power-domain.
Quoted 8 lines
Currently we could not get the real power-domain status, thus always
pm_runtime_gethere.Prepare for mt8195, thus, no need fix tags here.
This patch may drop the performance, we expect the user could
pm_runtime_get_syncbeforedma_alloc_attrswhich need tlb ops.
Could you explain this sentence a bit? should the user call pm_runtime_get_sync before calling dma_alloc_attrs?
Thanks,
Dafna
Quoted 23 lines
Signed-off-by Yong Wu <[email protected]>--- drivers/iommu/mtk_iommu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)drivers/iommu/mtk_iommu.c +4
-1@@ -238,8 +238,11 @@ static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size,for_each_m4u (data, head) {if (has_pm) { -if (pm_runtime_get_if_in_use (data->dev) <=0 ) + ret =pm_runtime_resume_and_get (data->dev); +if (ret <0 ) { +dev_err (data->dev,"tlb flush: pm get fail %d.\n" , ret);continue ; + } }spin_lock_irqsave (&data->tlb_lock, flags);
Yong Wu
maintainerRe: [PATCH v2 11/29] iommu/mediatek: Always pm_runtime_get while tlb flush
Quoted 10 lines · Dafna Hirschfeld
Quoted 4 lines · Yong Wu
Prepare for 2 HWs that sharing pgtable in different power-domains.
The previous SoC don't have PM. Only mt8192 has power-domain, and it is display's power-domain which nearly always is enabled.
hi, I see that in
mt1873.dtsi, many devices that uses the iommu have the
'power-domains' property.
Sorry, I didn't clarify this clear. I mean the iommu device don't have this property rather than the other device.
Quoted 15 lines
Quoted 15 lines
When there are 2 M4U HWs, it may has problem.
In this function, we get thepm_statusvia the m4u dev, but it don't
reflect the real power-domain status of the HW since there may be other
HW also use that power-domain.Currently we could not get the real power-domain status, thus always
pm_runtime_gethere.Prepare for mt8195, thus, no need fix tags here.
Quoted 7 lines
Quoted 3 lines
This patch may drop the performance, we expect the user could
pm_runtime_get_syncbeforedma_alloc_attrswhich need tlb ops.Could you explain this sentence a bit? should the user call
pm_runtime_get_sync
before callingdma_alloc_attrs?
In v3, I have removed this patch. Use [1] instead.
[1]
https://lore.kernel.org/linux-mediatek/[email protected]/
Thanks.
Quoted 29 lines
Thanks,
DafnaQuoted 25 lines
Signed-off-by Yong Wu <[email protected]>--- drivers/iommu/mtk_iommu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)drivers/iommu/mtk_iommu.c +4
-1@@ -238,8 +238,11 @@ static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size,for_each_m4u (data, head) {if (has_pm) { -if (pm_runtime_get_if_in_use (data->dev) <=0 ) + ret =pm_runtime_resume_and_get (data->dev); +if (ret <0 ) { + dev_err(data->dev, "tlb flush: pm get fail %d.\n", ret);continue ; + } }spin_lock_irqsave(&data->tlb_lock, flags);
Yong Wu
maintainerPATCH v2 12/29 iommu/mediatek: Always enable output PA over 32bits in isr
In reply to Yong WuCurrently the output PA[32:33] is contained by the flag IOVA_34. This is not right. the iova_34 has no relation with pa[32:33], the 32bits iova still could map to pa[32:33]. Move it out from the flag.
No need fix tag since currently only mt8192 use the calulation and it always has this IOVA_34 flag.
Prepare for the IOMMU that still use IOVA 32bits but its dram size may be over 4GB.
--- drivers/iommu/mtk_iommu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iommu/mtk_iommu.c +2 -2
@@ -297,11 +297,11 @@ static irqreturn_t mtk_iommu_isr(int irq, void *dev_id) write = fault_iova &F_MMU_FAULT_VA_WRITE_BIT ;if (MTK_IOMMU_HAS_FLAG (data->plat_data,IOVA_34_EN )) { va34_32 =FIELD_GET (F_MMU_INVAL_VA_34_32_MASK , fault_iova); - pa34_32 =FIELD_GET (F_MMU_INVAL_PA_34_32_MASK , fault_iova); fault_iova = fault_iova &F_MMU_INVAL_VA_31_12_MASK ; fault_iova |= (u64 )va34_32 <<32 ; - fault_pa |= (u64 )pa34_32 <<32 ; } + pa34_32 =FIELD_GET (F_MMU_INVAL_PA_34_32_MASK , fault_iova); + fault_pa |= (u64 )pa34_32 <<32 ; fault_port =F_MMU_INT_ID_PORT_ID (regval);if (MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_SUB_COMM )) {
Signature · 1 line
2.18.0
Yong Wu
maintainerPATCH v2 13/29 iommu/mediatek: Add SUB_COMMON_3BITS flag
In reply to Yong WuIn prevous SoC, the sub common id occupy 2 bits. the mt8195's sub common id has 3bits. Add a new flag for this. and rename the prevous flag to _2BITS. For readable, I put these two flags together, then move the other flags. no functional change.
--- drivers/iommu/mtk_iommu.c | 26 ++++++++++++++++---------- drivers/iommu/mtk_iommu.h | 2 +- 2 files changed, 17 insertions(+), 11 deletions(-)
drivers/iommu/mtk_iommu.c +16 -10
@@ -106,6 +106,8 @@#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_COMM_ID_EXT (a) (((a) >> 10) & 0x7) +#define F_MMU_INT_ID_SUB_COMM_ID_EXT (a) (((a) >> 7) & 0x7)#define F_MMU_INT_ID_LARB_ID (a) (((a) >> 7) & 0x7)#define F_MMU_INT_ID_PORT_ID (a) (((a) >> 2) & 0x1f)
@@ -117,13 +119,14 @@#define HAS_VLD_PA_RNG BIT(2)#define RESET_AXI BIT(3)#define OUT_ORDER_WR_EN BIT(4) -#define HAS_SUB_COMM BIT(5) -#define WR_THROT_EN BIT(6) -#define HAS_LEGACY_IVRP_PADDR BIT(7) -#define IOVA_34_EN BIT(8) -#define SHARE_PGTABLE BIT(9)/* 2 HW share pgtable */ -#define DCM_DISABLE BIT(10) -#define NOT_STD_AXI_MODE BIT(11) +#define HAS_SUB_COMM_2BITS BIT(5) +#define HAS_SUB_COMM_3BITS BIT(6) +#define WR_THROT_EN BIT(7) +#define HAS_LEGACY_IVRP_PADDR BIT(8) +#define IOVA_34_EN BIT(9) +#define SHARE_PGTABLE BIT(10)/* 2 HW share pgtable */ +#define DCM_DISABLE BIT(11) +#define NOT_STD_AXI_MODE BIT(12)#define MTK_IOMMU_HAS_FLAG (pdata, _x) \ ((((pdata)->flags) & (_x)) == (_x))
@@ -304,9 +307,12 @@ static irqreturn_t mtk_iommu_isr(int irq, void *dev_id) fault_pa |= (u64 )pa34_32 <<32 ; fault_port =F_MMU_INT_ID_PORT_ID (regval); -if (MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_SUB_COMM )) { +if (MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_SUB_COMM_2BITS )) { fault_larb =F_MMU_INT_ID_COMM_ID (regval); sub_comm =F_MMU_INT_ID_SUB_COMM_ID (regval); + }else if (MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_SUB_COMM_3BITS )) { + fault_larb =F_MMU_INT_ID_COMM_ID_EXT (regval); + sub_comm =F_MMU_INT_ID_SUB_COMM_ID_EXT (regval); }else { fault_larb =F_MMU_INT_ID_LARB_ID (regval); }
@@ -1035,7 +1041,7 @@ static const struct mtk_iommu_plat_data mt2712_data = {static const struct mtk_iommu_plat_data mt6779_data = { .m4u_plat =M4U_MT6779 , - .flags =HAS_SUB_COMM |OUT_ORDER_WR_EN |WR_THROT_EN | + .flags =HAS_SUB_COMM_2BITS |OUT_ORDER_WR_EN |WR_THROT_EN |NOT_STD_AXI_MODE , .inv_sel_reg =REG_MMU_INV_SEL_GEN2 , .iova_region = single_domain,
@@ -1073,7 +1079,7 @@ static const struct mtk_iommu_plat_data mt8183_data = {static const struct mtk_iommu_plat_data mt8192_data = { .m4u_plat =M4U_MT8192 , - .flags =HAS_BCLK |HAS_SUB_COMM |OUT_ORDER_WR_EN | + .flags =HAS_BCLK |HAS_SUB_COMM_2BITS |OUT_ORDER_WR_EN |WR_THROT_EN |IOVA_34_EN |NOT_STD_AXI_MODE , .inv_sel_reg =REG_MMU_INV_SEL_GEN2 , .iova_region = mt8192_multi_dom,
drivers/iommu/mtk_iommu.h +1 -1
@@ -20,7 +20,7 @@#include <dt-bindings/memory/mtk-memory-port.h> #define MTK_LARB_COM_MAX 8 -#define MTK_LARB_SUBCOM_MAX 4 +#define MTK_LARB_SUBCOM_MAX 8#define MTK_IOMMU_GROUP_MAX 8
Signature · 1 line
2.18.0
Yong Wu
maintainerPATCH v2 14/29 iommu/mediatek: Add IOMMU_TYPE flag
In reply to Yong WuAdd IOMMU_TYPE definition. In the mt8195, we have another IOMMU_TYPE:
infra iommu, also there will be another APU_IOMMU, thus, use 2bits for the IOMMU_TYPE.
--- drivers/iommu/mtk_iommu.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/iommu/mtk_iommu.c +10 -2
@@ -127,9 +127,17 @@#define SHARE_PGTABLE BIT(10)/* 2 HW share pgtable */ #define DCM_DISABLE BIT(11)#define NOT_STD_AXI_MODE BIT(12) +/* 2 bits: iommu type */ +#define MTK_IOMMU_TYPE_MM (0x0 << 13) +#define MTK_IOMMU_TYPE_INFRA (0x1 << 13) +#define MTK_IOMMU_TYPE_MASK (0x3 << 13) -#define MTK_IOMMU_HAS_FLAG (pdata, _x) \ - ((((pdata)->flags) & (_x)) == (_x)) +#define MTK_IOMMU_HAS_FLAG (pdata, _x) (!!(((pdata)->flags) & (_x))) + +#define MTK_IOMMU_HAS_FLAG_MASK (pdata, _x, mask) \ + ((((pdata)->flags) & (mask)) == (_x)) +#define MTK_IOMMU_IS_TYPE (pdata, _x) MTK_IOMMU_HAS_FLAG_MASK(pdata, _x,\ + MTK_IOMMU_TYPE_MASK)struct mtk_iommu_domain {struct io_pgtable_cfg cfg;
Signature · 1 line
2.18.0
Yong Wu
maintainerPATCH v2 15/29 iommu/mediatek: Contain MM IOMMU flow with the MM TYPE
In reply to Yong WuPrepare for supporting INFRA_IOMMU, and APU_IOMMU later.
For Infra IOMMU/APU IOMMU, it doesn't have the "larb""port". thus, Use the MM flag contain the MM_IOMMU special flow, Also, it moves a big chunk code about parsing the mediatek,larbs into a function, this is only needed for MM IOMMU. and all the current SoC are MM_IOMMU.
--- drivers/iommu/mtk_iommu.c | 190 +++++++++++++++++++++----------------- 1 file changed, 107 insertions(+), 83 deletions(-)
drivers/iommu/mtk_iommu.c +107 -83
@@ -288,7 +288,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; -unsigned int fault_larb, fault_port, sub_comm =0 ; +unsigned int fault_larb =0 , fault_port =0 , sub_comm =0 ;u32 int_state, regval, va34_32, pa34_32;u64 fault_iova, fault_pa;bool layer, write;
@@ -314,17 +314,19 @@ static irqreturn_t mtk_iommu_isr(int irq, void *dev_id) pa34_32 =FIELD_GET (F_MMU_INVAL_PA_34_32_MASK , fault_iova); fault_pa |= (u64 )pa34_32 <<32 ; - fault_port =F_MMU_INT_ID_PORT_ID (regval); -if (MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_SUB_COMM_2BITS )) { - fault_larb =F_MMU_INT_ID_COMM_ID (regval); - sub_comm =F_MMU_INT_ID_SUB_COMM_ID (regval); - }else if (MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_SUB_COMM_3BITS )) { - fault_larb =F_MMU_INT_ID_COMM_ID_EXT (regval); - sub_comm =F_MMU_INT_ID_SUB_COMM_ID_EXT (regval); - }else { - fault_larb =F_MMU_INT_ID_LARB_ID (regval); +if (MTK_IOMMU_IS_TYPE (data->plat_data,MTK_IOMMU_TYPE_MM )) { + fault_port =F_MMU_INT_ID_PORT_ID (regval); +if (MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_SUB_COMM_2BITS )) { + fault_larb =F_MMU_INT_ID_COMM_ID (regval); + sub_comm =F_MMU_INT_ID_SUB_COMM_ID (regval); + }else if (MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_SUB_COMM_3BITS )) { + fault_larb =F_MMU_INT_ID_COMM_ID_EXT (regval); + sub_comm =F_MMU_INT_ID_SUB_COMM_ID_EXT (regval); + }else { + fault_larb =F_MMU_INT_ID_LARB_ID (regval); + } + fault_larb = data->plat_data->larbid_remap[fault_larb][sub_comm]; } - 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 )) {
@@ -388,19 +390,21 @@ static void mtk_iommu_config(struct mtk_iommu_data *data, struct device *dev, larbid =MTK_M4U_TO_LARB (fwspec->ids[i]); portid =MTK_M4U_TO_PORT (fwspec->ids[i]); - larb_mmu = &data->larb_imu[larbid]; +if (MTK_IOMMU_IS_TYPE (data->plat_data,MTK_IOMMU_TYPE_MM )) { + larb_mmu = &data->larb_imu[larbid]; - region = data->plat_data->iova_region + domid; - larb_mmu->bank[portid] =upper_32_bits (region->iova_base); + region = data->plat_data->iova_region + domid; + larb_mmu->bank[portid] =upper_32_bits (region->iova_base); -dev_dbg (dev,"%s iommu for larb(%s) port %d dom %d bank %d.\n" , - enable ?"enable" :"disable" ,dev_name (larb_mmu->dev), - portid, domid, larb_mmu->bank[portid]); +dev_dbg (dev,"%s iommu for larb(%s) port %d dom %d bank %d.\n" , + enable ?"enable" :"disable" ,dev_name (larb_mmu->dev), + portid, domid, larb_mmu->bank[portid]); -if (enable) - larb_mmu->mmu |=MTK_SMI_MMU_EN (portid); -else - larb_mmu->mmu &= ~MTK_SMI_MMU_EN (portid); +if (enable) + larb_mmu->mmu |=MTK_SMI_MMU_EN (portid); +else + larb_mmu->mmu &= ~MTK_SMI_MMU_EN (portid); + } } }
@@ -796,19 +800,75 @@ static const struct component_master_ops mtk_iommu_com_ops = { .unbind = mtk_iommu_unbind, }; +static int mtk_iommu_mm_dts_parse (struct device *dev, +struct component_match **match, +struct mtk_iommu_data *data) +{ +struct platform_device *plarbdev; +struct device_link *link; +struct device_node *larbnode, *smicomm_node; +int i, larb_nr, ret; + + larb_nr =of_count_phandle_with_args (dev->of_node,"mediatek,larbs" ,NULL ); +if (larb_nr <0 ) +return larb_nr; + +for (i =0 ; i < larb_nr; i++) { +u32 id; + + larbnode =of_parse_phandle (dev->of_node,"mediatek,larbs" , i); +if (!larbnode) +return -EINVAL ; + +if (!of_device_is_available (larbnode)) { +of_node_put (larbnode); +continue ; + } + + ret =of_property_read_u32 (larbnode,"mediatek,larb-id" , &id); +if (ret)/* The id is consecutive if there is no this property */ + id = i; + + plarbdev =of_find_device_by_node (larbnode); +if (!plarbdev) { +of_node_put (larbnode); +return -EPROBE_DEFER ; + } + data->larb_imu[id].dev = &plarbdev->dev; + +component_match_add_release (dev, match, release_of, + compare_of, larbnode); + } + +/* Get smi-common dev from the last larb. */ + smicomm_node =of_parse_phandle (larbnode,"mediatek,smi" ,0 ); +if (!smicomm_node) +return -EINVAL ; + + plarbdev =of_find_device_by_node (smicomm_node); +of_node_put (smicomm_node); + data->smicomm_dev = &plarbdev->dev; + + link =device_link_add (data->smicomm_dev, dev, +DL_FLAG_STATELESS |DL_FLAG_PM_RUNTIME ); + +if (!link) { +dev_err (dev,"Unable link %s.\n" ,dev_name (data->smicomm_dev)); +return PTR_ERR (link); + } +return 0 ; +} +static int mtk_iommu_probe (struct platform_device *pdev) {struct mtk_iommu_data *data;struct device *dev = &pdev->dev; -struct device_node *larbnode, *smicomm_node; -struct platform_device *plarbdev; -struct device_link *link;struct resource *res;resource_size_t ioaddr;struct component_match *match =NULL ;struct regmap *infracfg;void *protect; -int i, larb_nr, ret; +int ret;u32 val;char *p;
@@ -863,55 +923,12 @@ static int mtk_iommu_probe(struct platform_device *pdev)return PTR_ERR (data->bclk); } - larb_nr =of_count_phandle_with_args (dev->of_node, -"mediatek,larbs" ,NULL ); -if (larb_nr <0 ) -return larb_nr; - -for (i =0 ; i < larb_nr; i++) { -u32 id; - - larbnode =of_parse_phandle (dev->of_node,"mediatek,larbs" , i); -if (!larbnode) -return -EINVAL ; - -if (!of_device_is_available (larbnode)) { -of_node_put (larbnode); -continue ; - } - - ret =of_property_read_u32 (larbnode,"mediatek,larb-id" , &id); -if (ret)/* The id is consecutive if there is no this property */ - id = i; - - plarbdev =of_find_device_by_node (larbnode); -if (!plarbdev) { -of_node_put (larbnode); -return -EPROBE_DEFER ; - } - data->larb_imu[id].dev = &plarbdev->dev; - -component_match_add_release (dev, &match, release_of, - compare_of, larbnode); - } - -/* Get smi-common dev from the last larb. */ - smicomm_node =of_parse_phandle (larbnode,"mediatek,smi" ,0 ); -if (!smicomm_node) -return -EINVAL ; - - plarbdev =of_find_device_by_node (smicomm_node); -of_node_put (smicomm_node); - data->smicomm_dev = &plarbdev->dev; -pm_runtime_enable (dev); - link =device_link_add (data->smicomm_dev, dev, -DL_FLAG_STATELESS |DL_FLAG_PM_RUNTIME ); -if (!link) { -dev_err (dev,"Unable to link %s.\n" ,dev_name (data->smicomm_dev)); - ret = -EINVAL ; - goto out_runtime_disable; +if (MTK_IOMMU_IS_TYPE (data->plat_data,MTK_IOMMU_TYPE_MM )) { + ret =mtk_iommu_mm_dts_parse (dev, &match, data); +if (ret) + goto out_runtime_disable; }platform_set_drvdata (pdev, data);
@@ -942,9 +959,11 @@ static int mtk_iommu_probe(struct platform_device *pdev) goto out_list_del; } - ret =component_master_add_with_match (dev, &mtk_iommu_com_ops, match); -if (ret) - goto out_bus_set_null; +if (MTK_IOMMU_IS_TYPE (data->plat_data,MTK_IOMMU_TYPE_MM )) { + ret =component_master_add_with_match (dev, &mtk_iommu_com_ops, match); +if (ret) + goto out_bus_set_null; + }return ret; out_bus_set_null:
@@ -955,7 +974,8 @@ static int mtk_iommu_probe(struct platform_device *pdev) out_sysfs_remove:iommu_device_sysfs_remove (&data->iommu); out_link_remove: -device_link_remove (data->smicomm_dev, dev); +if (MTK_IOMMU_IS_TYPE (data->plat_data,MTK_IOMMU_TYPE_MM )) +device_link_remove (data->smicomm_dev, dev); out_runtime_disable:pm_runtime_disable (dev);return ret;
@@ -972,7 +992,8 @@ static int mtk_iommu_remove(struct platform_device *pdev)bus_set_iommu (&platform_bus_type,NULL );clk_disable_unprepare (data->bclk); -device_link_remove (data->smicomm_dev, &pdev->dev); +if (MTK_IOMMU_IS_TYPE (data->plat_data,MTK_IOMMU_TYPE_MM )) +device_link_remove (data->smicomm_dev, &pdev->dev);pm_runtime_disable (&pdev->dev);devm_free_irq (&pdev->dev, data->irq, data);component_master_del (&pdev->dev, &mtk_iommu_com_ops);
@@ -1039,7 +1060,7 @@ static const struct dev_pm_ops mtk_iommu_pm_ops = {static const struct mtk_iommu_plat_data mt2712_data = { .m4u_plat =M4U_MT2712 , .flags =HAS_4GB_MODE |HAS_BCLK |HAS_VLD_PA_RNG |SHARE_PGTABLE | -NOT_STD_AXI_MODE , +NOT_STD_AXI_MODE |MTK_IOMMU_TYPE_MM , .hw_list = &m4ulist, .inv_sel_reg =REG_MMU_INV_SEL_GEN1 , .iova_region = single_domain,
@@ -1050,7 +1071,7 @@ static const struct mtk_iommu_plat_data mt2712_data = {static const struct mtk_iommu_plat_data mt6779_data = { .m4u_plat =M4U_MT6779 , .flags =HAS_SUB_COMM_2BITS |OUT_ORDER_WR_EN |WR_THROT_EN | -NOT_STD_AXI_MODE , +NOT_STD_AXI_MODE |MTK_IOMMU_TYPE_MM , .inv_sel_reg =REG_MMU_INV_SEL_GEN2 , .iova_region = single_domain, .iova_region_nr =ARRAY_SIZE (single_domain),
@@ -1059,7 +1080,8 @@ static const struct mtk_iommu_plat_data mt6779_data = {static const struct mtk_iommu_plat_data mt8167_data = { .m4u_plat =M4U_MT8167 , - .flags =RESET_AXI |HAS_LEGACY_IVRP_PADDR |NOT_STD_AXI_MODE , + .flags =RESET_AXI |HAS_LEGACY_IVRP_PADDR |NOT_STD_AXI_MODE | +MTK_IOMMU_TYPE_MM , .inv_sel_reg =REG_MMU_INV_SEL_GEN1 , .iova_region = single_domain, .iova_region_nr =ARRAY_SIZE (single_domain),
@@ -1069,7 +1091,8 @@ static const struct mtk_iommu_plat_data mt8167_data = {static const struct mtk_iommu_plat_data mt8173_data = { .m4u_plat =M4U_MT8173 , .flags =HAS_4GB_MODE |HAS_BCLK |RESET_AXI | -HAS_LEGACY_IVRP_PADDR |NOT_STD_AXI_MODE , +HAS_LEGACY_IVRP_PADDR |NOT_STD_AXI_MODE | +MTK_IOMMU_TYPE_MM , .inv_sel_reg =REG_MMU_INV_SEL_GEN1 , .iova_region = single_domain, .iova_region_nr =ARRAY_SIZE (single_domain),
@@ -1078,7 +1101,7 @@ static const struct mtk_iommu_plat_data mt8173_data = {static const struct mtk_iommu_plat_data mt8183_data = { .m4u_plat =M4U_MT8183 , - .flags =RESET_AXI , + .flags =RESET_AXI |MTK_IOMMU_TYPE_MM , .inv_sel_reg =REG_MMU_INV_SEL_GEN1 , .iova_region = single_domain, .iova_region_nr =ARRAY_SIZE (single_domain),
@@ -1088,7 +1111,8 @@ static const struct mtk_iommu_plat_data mt8183_data = {static const struct mtk_iommu_plat_data mt8192_data = { .m4u_plat =M4U_MT8192 , .flags =HAS_BCLK |HAS_SUB_COMM_2BITS |OUT_ORDER_WR_EN | -WR_THROT_EN |IOVA_34_EN |NOT_STD_AXI_MODE , +WR_THROT_EN |IOVA_34_EN |NOT_STD_AXI_MODE | +MTK_IOMMU_TYPE_MM , .inv_sel_reg =REG_MMU_INV_SEL_GEN2 , .iova_region = mt8192_multi_dom, .iova_region_nr =ARRAY_SIZE (mt8192_multi_dom),
Signature · 1 line
2.18.0
Yong Wu
maintainerPATCH v2 16/29 iommu/mediatek: Adjust device link when it is sub-common
In reply to Yong WuFor MM IOMMU, We always add device link between smi-common and IOMMU HW. In mt8195, we add smi-sub-common. Thus, if the node is sub-common, we still need find again to get smi-common, then do device link.
--- drivers/iommu/mtk_iommu.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/iommu/mtk_iommu.c +11 -0
@@ -845,6 +845,17 @@ static int mtk_iommu_mm_dts_parse(struct device *dev,if (!smicomm_node)return -EINVAL ; +/* Find smi-common again if this is smi-sub-common */ +if (of_property_read_bool (smicomm_node,"mediatek,smi_sub_common" )) { +of_node_put (smicomm_node);/* put the sub common */ + + smicomm_node =of_parse_phandle (smicomm_node,"mediatek,smi" ,0 ); +if (!smicomm_node) { +dev_err (dev,"sub-comm has no common.\n" ); +return -EINVAL ; + } + } + plarbdev =of_find_device_by_node (smicomm_node);of_node_put (smicomm_node); data->smicomm_dev = &plarbdev->dev;
Signature · 1 line
2.18.0
Re: [PATCH v2 16/29] iommu/mediatek: Adjust device link when it is sub-common
Quoted 15 lines · Yong Wu
For MM IOMMU, We always add device link between smi-common and IOMMU HW. In mt8195, we add smi-sub-common. Thus, if the node is sub-common, we still need find again to get smi-common, then do device link.
Signed-off-by Yong Wu <[email protected]>--- drivers/iommu/mtk_iommu.c | 11 +++++++++++ 1 file changed, 11 insertions(+)drivers/iommu/mtk_iommu.c +0
-0
drivers/iommu/mtk_iommu.c static int mtk_iommu_mm_dts_parse(struct device *dev, · line 852
Quoted 8 lines
drivers/iommu/mtk_iommu.c +5
-0@@ -845,6 +845,17 @@ static int mtk_iommu_mm_dts_parse(struct device *dev,if (!smicomm_node)return -EINVAL ; +/* Find smi-common again if this is smi-sub-common */ +if (of_property_read_bool (smicomm_node,"mediatek,smi_sub_common" )) { +of_node_put (smicomm_node);/* put the sub common */ + + smicomm_node =of_parse_phandle (smicomm_node,"mediatek,smi" ,0 );
This only checks 1 level here, and does not check if the mediatek,smi of a sub-common node is not another sub-common node.
So maybe add a check that the updated node here doesn't have mediatek,smi_sub_common property.
Quoted 15 lines
drivers/iommu/mtk_iommu.c +6
-1+if (!smicomm_node) { +dev_err (dev,"sub-comm has no common.\n" ); +return -EINVAL ; + } + } + plarbdev =of_find_device_by_node (smicomm_node);of_node_put (smicomm_node); data->smicomm_dev = &plarbdev->dev; --2.18.0
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Yong Wu (吴勇)
maintainerRe: [PATCH v2 16/29] iommu/mediatek: Adjust device link when it is sub-common
Quoted 22 lines · Hsin-Yi Wang
Quoted 21 lines · Yong Wu
For MM IOMMU, We always add device link between smi-common and IOMMU HW.
In mt8195, we add smi-sub-common. Thus, if the node is sub-common, we still
need find again to get smi-common, then do device link.Signed-off-by Yong Wu <[email protected]>--- drivers/iommu/mtk_iommu.c | 11 +++++++++++ 1 file changed, 11 insertions(+)drivers/iommu/mtk_iommu.c +0
-0@@ -845,6 +845,17 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, if (!smicomm_node) return -EINVAL;
Quoted 12 lines
drivers/iommu/mtk_iommu.c static int mtk_iommu_mm_dts_parse(struct · line 855
Quoted 7 lines
drivers/iommu/mtk_iommu.c +5
-0+/* Find smi-common again if this is smi-sub-common */ +if (of_property_read_bool (smicomm_node,"mediatek,smi_sub_common" )) { +of_node_put (smicomm_node);/* put the sub common */ + + smicomm_node =of_parse_phandle (smicomm_node,"mediatek,smi" ,0 );This only checks 1 level here, and does not check if the mediatek,smi of a sub-common node is not another sub-common node.
So maybe add a check that the updated node here doesn't have mediatek,smi_sub_common property.
Yes. Currently there are only 2 levels. we could confirm if it is sub- common from if it has "mediatek,smi", then "mediatek,smi_sub_common" is unnecessary.
Will fix in the next version.
Quoted 16 lines
Quoted 16 lines
drivers/iommu/mtk_iommu.c +6
-0+if (!smicomm_node) { +dev_err (dev,"sub-comm has no common.\n" ); +return -EINVAL ; + } + } +plarbdev = of_find_device_by_node(smicomm_node); of_node_put(smicomm_node); data->smicomm_dev = &plarbdev->dev;--
2.18.0
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Yong Wu
maintainerPATCH v2 17/29 iommu/mediatek: Add infra iommu support
In reply to Yong WuThe infra iommu enable bits in mt8195 is in the pericfg register segment, use regmap to update it.
If infra iommu master translation fault, It don't have the larbid/portid, thus print out the whole register value.
Since regmap_update_bits may fail, add return value for mtk_iommu_config.
--- drivers/iommu/mtk_iommu.c | 36 +++++++++++++++++++++++++++++------- drivers/iommu/mtk_iommu.h | 3 +++ 2 files changed, 32 insertions(+), 7 deletions(-)
drivers/iommu/mtk_iommu.c +29 -7
@@ -113,6 +113,8 @@#define MTK_PROTECT_PA_ALIGN 256 +#define PERICFG_IOMMU_1 0x714 +#define HAS_4GB_MODE BIT(0)/* HW will use the EMI clock if there isn't the "bclk". */ #define HAS_BCLK BIT(1)
@@ -332,8 +334,8 @@ static irqreturn_t mtk_iommu_isr(int irq, void *dev_id) write ? IOMMU_FAULT_WRITE : IOMMU_FAULT_READ)) {dev_err_ratelimited ( data->dev, -"fault type=0x%x iova=0x%llx pa=0x%llx larb=%d port=%d layer=%d %s\n" , - int_state, fault_iova, fault_pa, fault_larb, fault_port, +"fault type=0x%x iova=0x%llx pa=0x%llx master=0x%x(larb=%d port=%d) layer=%d %s\n" , + int_state, fault_iova, fault_pa, regval, fault_larb, fault_port, layer, write ?"write" :"read" ); }
@@ -377,14 +379,15 @@ static int mtk_iommu_get_domain_id(struct device *dev,return -EINVAL ; } -static void mtk_iommu_config (struct mtk_iommu_data *data,struct device *dev, -bool enable,unsigned int domid) +static int mtk_iommu_config (struct mtk_iommu_data *data,struct device *dev, +bool enable,unsigned int domid) {struct mtk_smi_larb_iommu *larb_mmu;unsigned int larbid, portid;struct iommu_fwspec *fwspec =dev_iommu_fwspec_get (dev);const struct mtk_iommu_iova_region *region; -int i; +u32 peri_mmuen, peri_mmuen_msk; +int i, ret =0 ;for (i =0 ; i < fwspec->num_ids; ++i) { larbid =MTK_M4U_TO_LARB (fwspec->ids[i]);
@@ -404,8 +407,19 @@ static void mtk_iommu_config(struct mtk_iommu_data *data, struct device *dev, larb_mmu->mmu |=MTK_SMI_MMU_EN (portid); else larb_mmu->mmu &= ~MTK_SMI_MMU_EN(portid); + }else if (MTK_IOMMU_IS_TYPE (data->plat_data,MTK_IOMMU_TYPE_INFRA )) { + peri_mmuen_msk =BIT (portid); + peri_mmuen = enable ? peri_mmuen_msk :0 ; + + ret =regmap_update_bits (data->pericfg,PERICFG_IOMMU_1 , + peri_mmuen_msk, peri_mmuen); +if (ret) +dev_err (dev,"%s iommu(%s) inframaster 0x%x fail(%d).\n" , + enable ?"enable" :"disable" , +dev_name (data->dev), peri_mmuen_msk, ret); } } +return ret; } static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom,
@@ -518,8 +532,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,pm_runtime_put (m4udev); } -mtk_iommu_config (data, dev, true, domid); -return 0 ; +return mtk_iommu_config (data, dev, true, domid); } static void mtk_iommu_detach_device(struct iommu_domain *domain,
@@ -940,6 +953,15 @@ static int mtk_iommu_probe(struct platform_device *pdev) ret =mtk_iommu_mm_dts_parse (dev, &match, data);if (ret) goto out_runtime_disable; + }else if (MTK_IOMMU_IS_TYPE (data->plat_data,MTK_IOMMU_TYPE_INFRA ) && + data->plat_data->pericfg_comp_str) { + infracfg =syscon_regmap_lookup_by_compatible (data->plat_data->pericfg_comp_str); +if (IS_ERR (infracfg)) { + ret =PTR_ERR (infracfg); + goto out_runtime_disable; + } + + data->pericfg = infracfg; }platform_set_drvdata (pdev, data);
drivers/iommu/mtk_iommu.h +3 -0
@@ -55,6 +55,7 @@ struct mtk_iommu_plat_data {u32 flags;u32 inv_sel_reg; +char *pericfg_comp_str;struct list_head *hw_list;unsigned int iova_region_nr;const struct mtk_iommu_iova_region *iova_region;
@@ -80,6 +81,8 @@ struct mtk_iommu_data {struct device *smicomm_dev;struct dma_iommu_mapping *mapping;/* For mtk_iommu_v1.c */ +struct regmap *pericfg; +/* * In the sharing pgtable case, list data->list to the global list like m4ulist.
Signature · 1 line
2.18.0
Yong Wu
maintainerPATCH v2 18/29 iommu/mediatek: Add PCIe support
In reply to Yong WuCurrently the code for of_iommu_configure_dev_id is like this:
static int of_iommu_configure_dev_id(struct device_node *master_np,
struct device *dev, const u32 *id)
{
struct of_phandle_args iommu_spec = { .args_count = 1 };
err = of_map_id(master_np, *id, "iommu-map",
"iommu-map-mask", &iommu_spec.np,
iommu_spec.args);...
}
It supports only one id output. BUT our PCIe HW has two ID(one is for writing, the other is for reading). I'm not sure if we should change of_map_id to support output MAX_PHANDLE_ARGS.
Here add the solution in ourselve drivers. If it's pcie case, enable one more bit.
Not all infra iommu support PCIe, thus add a PCIe support flag here.
--- drivers/iommu/mtk_iommu.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
drivers/iommu/mtk_iommu.c +16 -1
@@ -21,6 +21,7 @@#include <linux/of_address.h> #include <linux/of_irq.h> #include <linux/of_platform.h> +#include <linux/pci.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/regmap.h>
@@ -133,6 +134,7 @@#define MTK_IOMMU_TYPE_MM (0x0 << 13)#define MTK_IOMMU_TYPE_INFRA (0x1 << 13)#define MTK_IOMMU_TYPE_MASK (0x3 << 13) +#define IFA_IOMMU_PCIe_SUPPORT BIT(15)#define MTK_IOMMU_HAS_FLAG (pdata, _x) (!!(((pdata)->flags) & (_x)))
@@ -409,8 +411,12 @@ static int mtk_iommu_config(struct mtk_iommu_data *data, struct device *dev, larb_mmu->mmu &= ~MTK_SMI_MMU_EN (portid); }else if (MTK_IOMMU_IS_TYPE (data->plat_data,MTK_IOMMU_TYPE_INFRA )) { peri_mmuen_msk =BIT (portid); - peri_mmuen = enable ? peri_mmuen_msk :0 ; +/* PCIdev has only one output id, enable the next writing bit for PCIe */ +if (dev_is_pci (dev)) + peri_mmuen_msk |=BIT (portid +1 ); + + peri_mmuen = enable ? peri_mmuen_msk :0 ; ret =regmap_update_bits (data->pericfg,PERICFG_IOMMU_1 , peri_mmuen_msk, peri_mmuen);if (ret)
@@ -996,6 +1002,15 @@ static int mtk_iommu_probe(struct platform_device *pdev) ret =component_master_add_with_match (dev, &mtk_iommu_com_ops, match);if (ret) goto out_bus_set_null; + }else if (MTK_IOMMU_IS_TYPE (data->plat_data,MTK_IOMMU_TYPE_INFRA ) && +MTK_IOMMU_HAS_FLAG (data->plat_data, IFA_IOMMU_PCIe_SUPPORT)) { +#ifdef CONFIG_PCI +if (!iommu_present (&pci_bus_type)) { + ret =bus_set_iommu (&pci_bus_type, &mtk_iommu_ops); +if (ret)/* PCIe fail don't affect platform_bus. */ + goto out_list_del; + } +#endif }return ret;
Signature · 1 line
2.18.0
Yong Wu
maintainerPATCH v2 19/29 iommu/mediatek: Add mt8195 support
In reply to Yong Wumt8195 has 3 IOMMU, containing 2 MM IOMMUs, one is for vdo, the other is for vpp. and 1 INFRA IOMMU.
--- drivers/iommu/mtk_iommu.c | 42 +++++++++++++++++++++++++++++++++++++++ drivers/iommu/mtk_iommu.h | 1 + 2 files changed, 43 insertions(+)
drivers/iommu/mtk_iommu.c +42 -0
@@ -1168,6 +1168,45 @@ static const struct mtk_iommu_plat_data mt8192_data = { {0, 14, 16}, {0, 13, 18, 17}}, }; +static const struct mtk_iommu_plat_data mt8195_data_infra = { + .m4u_plat =M4U_MT8195 , + .flags =WR_THROT_EN |DCM_DISABLE | +MTK_IOMMU_TYPE_INFRA | IFA_IOMMU_PCIe_SUPPORT, + .pericfg_comp_str ="mediatek,mt8195-pericfg_ao" , + .inv_sel_reg =REG_MMU_INV_SEL_GEN2 , + .iova_region = single_domain, + .iova_region_nr =ARRAY_SIZE (single_domain), +}; + +static const struct mtk_iommu_plat_data mt8195_data_vdo = { + .m4u_plat =M4U_MT8195 , + .flags =HAS_BCLK |HAS_SUB_COMM_2BITS |OUT_ORDER_WR_EN | +WR_THROT_EN |NOT_STD_AXI_MODE |IOVA_34_EN | +SHARE_PGTABLE |MTK_IOMMU_TYPE_MM , + .hw_list = &m4ulist, + .inv_sel_reg =REG_MMU_INV_SEL_GEN2 , + .iova_region = mt8192_multi_dom, + .iova_region_nr =ARRAY_SIZE (mt8192_multi_dom), + .larbid_remap = {{2 ,0 }, {21 }, {24 }, {7 }, {19 }, {9 ,10 ,11 }, + {13 ,17 ,15 /* 17b */ ,25 }, {5 }}, +}; + +static const struct mtk_iommu_plat_data mt8195_data_vpp = { + .m4u_plat =M4U_MT8195 , + .flags =HAS_BCLK |HAS_SUB_COMM_3BITS |OUT_ORDER_WR_EN | +WR_THROT_EN |NOT_STD_AXI_MODE |IOVA_34_EN | +SHARE_PGTABLE |MTK_IOMMU_TYPE_MM , + .hw_list = &m4ulist, + .inv_sel_reg =REG_MMU_INV_SEL_GEN2 , + .iova_region = mt8192_multi_dom, + .iova_region_nr =ARRAY_SIZE (mt8192_multi_dom), + .larbid_remap = {{1 }, {3 }, {22 ,0 ,0 ,0 ,23 }, {8 }, + {20 }, {12 }, +/* 16: 16a; 29: 16b; 30: CCUtop0; 31: CCUtop1 */ + {14 ,16 ,29 ,26 ,30 ,31 ,18 }, + {4 ,0 ,0 ,0 ,6 }}, +}; +static const struct of_device_id mtk_iommu_of_ids[] = { { .compatible ="mediatek,mt2712-m4u" , .data = &mt2712_data}, { .compatible ="mediatek,mt6779-m4u" , .data = &mt6779_data},
@@ -1175,6 +1214,9 @@ static const struct of_device_id mtk_iommu_of_ids[] = { { .compatible = "mediatek,mt8173-m4u", .data = &mt8173_data}, { .compatible = "mediatek,mt8183-m4u", .data = &mt8183_data}, { .compatible = "mediatek,mt8192-m4u", .data = &mt8192_data}, + { .compatible = "mediatek,mt8195-iommu-infra", .data = &mt8195_data_infra}, + { .compatible = "mediatek,mt8195-iommu-vdo", .data = &mt8195_data_vdo}, + { .compatible = "mediatek,mt8195-iommu-vpp", .data = &mt8195_data_vpp}, {} };
drivers/iommu/mtk_iommu.h +1 -0
@@ -46,6 +46,7 @@ enum mtk_iommu_plat {M4U_MT8173 ,M4U_MT8183 ,M4U_MT8192 , + M4U_MT8195, };struct mtk_iommu_iova_region ;
Signature · 1 line
2.18.0
Yong Wu
maintainerPATCH v2 20/29 iommu/mediatek: Only adjust code about register base
In reply to Yong WuNo functional change. Use "base" instead of the data->base. This is avoid to touch too many lines in the next patches.
--- drivers/iommu/mtk_iommu.c | 45 +++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 21 deletions(-)
drivers/iommu/mtk_iommu.c +24 -21
@@ -248,6 +248,7 @@ static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size,struct list_head *head = data->hw_list;bool has_pm = !!data->dev->pm_domain;unsigned long flags; +void __iomem *base;int ret;u32 tmp;
@@ -260,19 +261,19 @@ static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size, } } + base = data->base; +spin_lock_irqsave (&data->tlb_lock, flags);writel_relaxed (F_INVLD_EN1 |F_INVLD_EN0 , - data->base + data->plat_data->inv_sel_reg); + base + data->plat_data->inv_sel_reg); -writel_relaxed (MTK_IOMMU_TLB_ADDR (iova), - data->base +REG_MMU_INVLD_START_A ); +writel_relaxed (MTK_IOMMU_TLB_ADDR (iova), base +REG_MMU_INVLD_START_A );writel_relaxed (MTK_IOMMU_TLB_ADDR (iova + size -1 ), - data->base +REG_MMU_INVLD_END_A ); -writel_relaxed (F_MMU_INV_RANGE , - data->base +REG_MMU_INVALIDATE ); + base +REG_MMU_INVLD_END_A ); +writel_relaxed (F_MMU_INV_RANGE , base +REG_MMU_INVALIDATE );/* tlb sync */ - ret =readl_poll_timeout_atomic (data->base +REG_MMU_CPE_DONE , + ret =readl_poll_timeout_atomic (base +REG_MMU_CPE_DONE , tmp, tmp !=0 ,10 ,1000 );if (ret) { dev_warn(data->dev,
@@ -280,7 +281,7 @@ static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size,__mtk_iommu_tlb_flush_all (data); }/* Clear the CPE status */ -writel_relaxed (0 , data->base +REG_MMU_CPE_DONE ); +writel_relaxed (0 , base +REG_MMU_CPE_DONE );spin_unlock_irqrestore (&data->tlb_lock, flags);if (has_pm)
@@ -294,23 +295,25 @@ static irqreturn_t mtk_iommu_isr(int irq, void *dev_id)struct mtk_iommu_domain *dom = data->m4u_dom;unsigned int fault_larb =0 , fault_port =0 , sub_comm =0 ;u32 int_state, regval, va34_32, pa34_32; +const struct mtk_iommu_plat_data *plat_data = data->plat_data; +void __iomem *base = data->base;u64 fault_iova, fault_pa;bool layer, write;/* Read error info from registers */ - int_state =readl_relaxed (data->base +REG_MMU_FAULT_ST1 ); + int_state =readl_relaxed (base +REG_MMU_FAULT_ST1 );if (int_state &F_REG_MMU0_FAULT_MASK ) { - regval =readl_relaxed (data->base +REG_MMU0_INT_ID ); - fault_iova =readl_relaxed (data->base +REG_MMU0_FAULT_VA ); - fault_pa =readl_relaxed (data->base +REG_MMU0_INVLD_PA ); + regval =readl_relaxed (base +REG_MMU0_INT_ID ); + fault_iova =readl_relaxed (base +REG_MMU0_FAULT_VA ); + fault_pa =readl_relaxed (base +REG_MMU0_INVLD_PA ); }else { - regval =readl_relaxed (data->base +REG_MMU1_INT_ID ); - fault_iova =readl_relaxed (data->base +REG_MMU1_FAULT_VA ); - fault_pa =readl_relaxed (data->base +REG_MMU1_INVLD_PA ); + regval =readl_relaxed (base +REG_MMU1_INT_ID ); + fault_iova =readl_relaxed (base +REG_MMU1_FAULT_VA ); + fault_pa =readl_relaxed (base +REG_MMU1_INVLD_PA ); } layer = fault_iova &F_MMU_FAULT_VA_LAYER_BIT ; write = fault_iova &F_MMU_FAULT_VA_WRITE_BIT ; -if (MTK_IOMMU_HAS_FLAG (data->plat_data,IOVA_34_EN )) { +if (MTK_IOMMU_HAS_FLAG (plat_data,IOVA_34_EN )) { va34_32 =FIELD_GET (F_MMU_INVAL_VA_34_32_MASK , fault_iova); fault_iova = fault_iova &F_MMU_INVAL_VA_31_12_MASK ; fault_iova |= (u64 )va34_32 <<32 ;
@@ -318,12 +321,12 @@ static irqreturn_t mtk_iommu_isr(int irq, void *dev_id) pa34_32 =FIELD_GET (F_MMU_INVAL_PA_34_32_MASK , fault_iova); fault_pa |= (u64 )pa34_32 <<32 ; -if (MTK_IOMMU_IS_TYPE (data->plat_data,MTK_IOMMU_TYPE_MM )) { +if (MTK_IOMMU_IS_TYPE (plat_data,MTK_IOMMU_TYPE_MM )) { fault_port =F_MMU_INT_ID_PORT_ID (regval); -if (MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_SUB_COMM_2BITS )) { +if (MTK_IOMMU_HAS_FLAG (plat_data,HAS_SUB_COMM_2BITS )) { fault_larb =F_MMU_INT_ID_COMM_ID (regval); sub_comm =F_MMU_INT_ID_SUB_COMM_ID (regval); - }else if (MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_SUB_COMM_3BITS )) { + }else if (MTK_IOMMU_HAS_FLAG (plat_data,HAS_SUB_COMM_3BITS )) { fault_larb =F_MMU_INT_ID_COMM_ID_EXT (regval); sub_comm =F_MMU_INT_ID_SUB_COMM_ID_EXT (regval); }else {
@@ -342,9 +345,9 @@ static irqreturn_t mtk_iommu_isr(int irq, void *dev_id) }/* Interrupt clear */ - regval =readl_relaxed (data->base +REG_MMU_INT_CONTROL0 ); + regval =readl_relaxed (base +REG_MMU_INT_CONTROL0 ); regval |=F_INT_CLR_BIT ; -writel_relaxed (regval, data->base +REG_MMU_INT_CONTROL0 ); +writel_relaxed (regval, base +REG_MMU_INT_CONTROL0 );mtk_iommu_tlb_flush_all (data);
Signature · 1 line
2.18.0
Yong Wu
maintainerPATCH v2 21/29 iommu/mediatek: Just move code position in hw_init
In reply to Yong WuNo functional change too. mt8195 IOMMU support bank functions. some global control settings are in bank0. and the other banks have their bank independent setting. Here only move the global control settings and the independent registers together.
--- drivers/iommu/mtk_iommu.c | 48 +++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 24 deletions(-)
drivers/iommu/mtk_iommu.c +24 -24
@@ -750,30 +750,6 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) }writel_relaxed (regval, data->base +REG_MMU_CTRL_REG ); - regval =F_L2_MULIT_HIT_EN | -F_TABLE_WALK_FAULT_INT_EN | -F_PREETCH_FIFO_OVERFLOW_INT_EN | -F_MISS_FIFO_OVERFLOW_INT_EN | -F_PREFETCH_FIFO_ERR_INT_EN | -F_MISS_FIFO_ERR_INT_EN ; -writel_relaxed (regval, data->base +REG_MMU_INT_CONTROL0 ); - - regval =F_INT_TRANSLATION_FAULT | -F_INT_MAIN_MULTI_HIT_FAULT | -F_INT_INVALID_PA_FAULT | -F_INT_ENTRY_REPLACEMENT_FAULT | -F_INT_TLB_MISS_FAULT | -F_INT_MISS_TRANSACTION_FIFO_FAULT | -F_INT_PRETETCH_TRANSATION_FIFO_FAULT ; -writel_relaxed (regval, data->base +REG_MMU_INT_MAIN_CONTROL ); - -if (MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_LEGACY_IVRP_PADDR )) - regval = (data->protect_base >>1 ) | (data->enable_4GB <<31 ); -else - regval =lower_32_bits (data->protect_base) | -upper_32_bits (data->protect_base); -writel_relaxed (regval, data->base +REG_MMU_IVRP_PADDR ); -if (data->enable_4GB &&MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_VLD_PA_RNG )) {/*
@@ -807,6 +783,30 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) }writel_relaxed (regval, data->base +REG_MMU_MISC_CTRL ); + regval =F_L2_MULIT_HIT_EN | +F_TABLE_WALK_FAULT_INT_EN | +F_PREETCH_FIFO_OVERFLOW_INT_EN | +F_MISS_FIFO_OVERFLOW_INT_EN | +F_PREFETCH_FIFO_ERR_INT_EN | +F_MISS_FIFO_ERR_INT_EN ; +writel_relaxed (regval, data->base +REG_MMU_INT_CONTROL0 ); + + regval =F_INT_TRANSLATION_FAULT | +F_INT_MAIN_MULTI_HIT_FAULT | +F_INT_INVALID_PA_FAULT | +F_INT_ENTRY_REPLACEMENT_FAULT | +F_INT_TLB_MISS_FAULT | +F_INT_MISS_TRANSACTION_FIFO_FAULT | +F_INT_PRETETCH_TRANSATION_FIFO_FAULT ; +writel_relaxed (regval, data->base +REG_MMU_INT_MAIN_CONTROL ); + +if (MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_LEGACY_IVRP_PADDR )) + regval = (data->protect_base >>1 ) | (data->enable_4GB <<31 ); +else + regval =lower_32_bits (data->protect_base) | +upper_32_bits (data->protect_base); +writel_relaxed (regval, data->base +REG_MMU_IVRP_PADDR ); +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 );
Signature · 1 line
2.18.0
Yong Wu
maintainerPATCH v2 22/29 iommu/mediatek: Add mtk_iommu_bank_data structure
In reply to Yong WuPrepare for supporting multi-banks for the IOMMU HW, No functional change.
Add a new structure(mtk_iommu_bank_data) for each a bank. Each a bank have the independent HW base/IRQ, and each a bank has its special iommu-domain (independent pgtable), thus, also move the domain information and tlb_lock into it.
In previous SoC, we have only one bank which could be treated as bank0( bankid always is 0 for the previous SoC).
After adding this structure, the tlb operations and irq could use bank_data as parameter.
--- drivers/iommu/mtk_iommu.c | 151 +++++++++++++++++++++----------------- drivers/iommu/mtk_iommu.h | 24 +++++- 2 files changed, 105 insertions(+), 70 deletions(-)
drivers/iommu/mtk_iommu.c +84 -67
@@ -147,7 +147,7 @@ struct mtk_iommu_domain {struct io_pgtable_cfg cfg;struct io_pgtable_ops *iop; -struct mtk_iommu_data *data; +struct mtk_iommu_bank_data *bank;struct iommu_domain domain; };
@@ -220,33 +220,35 @@ static struct mtk_iommu_domain *to_mtk_domain(struct iommu_domain *dom) return container_of(dom, struct mtk_iommu_domain, domain); } -static void __mtk_iommu_tlb_flush_all (struct mtk_iommu_data *data) +static void __mtk_iommu_tlb_flush_all (struct mtk_iommu_bank_data *bank) {writel_relaxed (F_INVLD_EN1 |F_INVLD_EN0 , - data->base + data->plat_data->inv_sel_reg); -writel_relaxed (F_ALL_INVLD , data->base +REG_MMU_INVALIDATE ); + bank->base + bank->pdata->plat_data->inv_sel_reg); +writel_relaxed (F_ALL_INVLD , bank->base +REG_MMU_INVALIDATE );wmb ();/* Make sure the tlb flush all done */ } -static void mtk_iommu_tlb_flush_all (struct mtk_iommu_data *data) +static void mtk_iommu_tlb_flush_all (struct mtk_iommu_bank_data *bank) {unsigned long flags; -if (pm_runtime_get_if_in_use (data->dev) <=0 ) +if (pm_runtime_get_if_in_use (bank->pdev) <=0 )return ; -spin_lock_irqsave (&data->tlb_lock, flags); -__mtk_iommu_tlb_flush_all (data); -spin_unlock_irqrestore (&data->tlb_lock, flags); +spin_lock_irqsave (&bank->tlb_lock, flags); +__mtk_iommu_tlb_flush_all (bank); +spin_unlock_irqrestore (&bank->tlb_lock, flags); -pm_runtime_put (data->dev); +pm_runtime_put (bank->pdev); }static void mtk_iommu_tlb_flush_range_sync (unsigned long iova,size_t size, -struct mtk_iommu_data *data) +struct mtk_iommu_bank_data *bank) { -struct list_head *head = data->hw_list; -bool has_pm = !!data->dev->pm_domain; +struct list_head *head = bank->pdata->hw_list; +bool has_pm = !!bank->pdev->pm_domain; +struct mtk_iommu_bank_data *curbank; +struct mtk_iommu_data *data;unsigned long flags;void __iomem *base;int ret;
@@ -261,9 +263,10 @@ static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size, } } - base = data->base; + curbank = &data->bank[bank->id]; + base = curbank->base; -spin_lock_irqsave (&data->tlb_lock, flags); +spin_lock_irqsave (&curbank->tlb_lock, flags);writel_relaxed (F_INVLD_EN1 |F_INVLD_EN0 , base + data->plat_data->inv_sel_reg);
@@ -278,11 +281,11 @@ static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size,if (ret) {dev_warn (data->dev,"Partial TLB flush timed out, falling back to full flush\n" ); -__mtk_iommu_tlb_flush_all (data); +__mtk_iommu_tlb_flush_all (curbank); }/* Clear the CPE status */ writel_relaxed (0 , base +REG_MMU_CPE_DONE ); -spin_unlock_irqrestore (&data->tlb_lock, flags); +spin_unlock_irqrestore (&curbank->tlb_lock, flags);if (has_pm)pm_runtime_put (data->dev);
@@ -291,12 +294,13 @@ static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size,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; +struct mtk_iommu_bank_data *bank = dev_id; +struct mtk_iommu_data *data = bank->pdata; +struct mtk_iommu_domain *dom = bank->m4u_dom;unsigned int fault_larb =0 , fault_port =0 , sub_comm =0 ;u32 int_state, regval, va34_32, pa34_32;const struct mtk_iommu_plat_data *plat_data = data->plat_data; -void __iomem *base = data->base; +void __iomem *base = bank->base;u64 fault_iova, fault_pa;bool layer, write;
@@ -335,10 +339,10 @@ static irqreturn_t mtk_iommu_isr(int irq, void *dev_id) fault_larb = data->plat_data->larbid_remap[fault_larb][sub_comm]; } -if (report_iommu_fault (&dom->domain, data->dev, fault_iova, +if (report_iommu_fault (&dom->domain, bank->pdev, fault_iova, write ?IOMMU_FAULT_WRITE :IOMMU_FAULT_READ )) {dev_err_ratelimited ( - data->dev, + bank->pdev,"fault type=0x%x iova=0x%llx pa=0x%llx master=0x%x(larb=%d port=%d) layer=%d %s\n" , int_state, fault_iova, fault_pa, regval, fault_larb, fault_port, layer, write ?"write" :"read" );
@@ -349,7 +353,7 @@ static irqreturn_t mtk_iommu_isr(int irq, void *dev_id) regval |=F_INT_CLR_BIT ;writel_relaxed (regval, base +REG_MMU_INT_CONTROL0 ); -mtk_iommu_tlb_flush_all (data); +mtk_iommu_tlb_flush_all (bank);return IRQ_HANDLED ; }
@@ -436,12 +440,14 @@ static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom, unsigned int domid) {const struct mtk_iommu_iova_region *region; - -/* Use the exist domain as there is only one pgtable here. */ -if (data->m4u_dom) { - dom->iop = data->m4u_dom->iop; - dom->cfg = data->m4u_dom->cfg; - dom->domain.pgsize_bitmap = data->m4u_dom->cfg.pgsize_bitmap; +struct mtk_iommu_domain *m4u_dom; + +/* Always use bank0 in sharing pgtable case */ + m4u_dom = data->bank[0 ].m4u_dom; +if (m4u_dom) { + dom->iop = m4u_dom->iop; + dom->cfg = m4u_dom->cfg; + dom->domain.pgsize_bitmap = m4u_dom->cfg.pgsize_bitmap; goto update_iova_region; }
@@ -508,23 +514,26 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,struct mtk_iommu_data *data =dev_iommu_priv_get (dev), *frstdata;struct mtk_iommu_domain *dom =to_mtk_domain (domain);struct list_head *hw_list = data->hw_list; +struct mtk_iommu_bank_data *bank;struct device *m4udev = data->dev; +unsigned int bankid =0 ;int ret, domid; domid =mtk_iommu_get_domain_id (dev, data->plat_data);if (domid <0 )return domid; -if (!dom->data) { + bank = &data->bank[bankid]; +if (!dom->bank) {/* Data is in the frstdata in sharing pgtable case. */ frstdata =mtk_iommu_get_frst_data (hw_list);if (mtk_iommu_domain_finalise (dom, frstdata, domid))return -ENODEV ; - dom->data = data; + dom->bank = bank; } -if (!data->m4u_dom) {/* Initialize the M4U HW */ +if (!bank->m4u_dom) {/* Initialize the M4U HW */ ret =pm_runtime_resume_and_get (m4udev);if (ret <0 )return ret;
@@ -534,9 +543,9 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,pm_runtime_put (m4udev);return ret; } - data->m4u_dom = dom; + bank->m4u_dom = dom;writel (dom->cfg.arm_v7s_cfg.ttbr &MMU_PT_ADDR_MASK , - data->base +REG_MMU_PT_BASE_ADDR ); + bank->base +REG_MMU_PT_BASE_ADDR );pm_runtime_put (m4udev); }
@@ -558,7 +567,7 @@ static int mtk_iommu_map(struct iommu_domain *domain, unsigned long iova,struct mtk_iommu_domain *dom =to_mtk_domain (domain);/* The "4GB mode" M4U physically can not use the lower remap of Dram. */ -if (dom->data->enable_4GB) +if (dom->bank->pdata->enable_4GB) paddr |=BIT_ULL (32 );/* Synchronize with the tlb_lock */
@@ -583,7 +592,7 @@ static void mtk_iommu_flush_iotlb_all(struct iommu_domain *domain) {struct mtk_iommu_domain *dom =to_mtk_domain (domain); -mtk_iommu_tlb_flush_all (dom->data); +mtk_iommu_tlb_flush_all (dom->bank); } static void mtk_iommu_iotlb_sync(struct iommu_domain *domain,
@@ -592,7 +601,7 @@ static void mtk_iommu_iotlb_sync(struct iommu_domain *domain,struct mtk_iommu_domain *dom =to_mtk_domain (domain);size_t length = gather->end - gather->start +1 ; -mtk_iommu_tlb_flush_range_sync (gather->start, length, dom->data); +mtk_iommu_tlb_flush_range_sync (gather->start, length, dom->bank); } static void mtk_iommu_sync_map(struct iommu_domain *domain, unsigned long iova,
@@ -600,7 +609,7 @@ static void mtk_iommu_sync_map(struct iommu_domain *domain, unsigned long iova, {struct mtk_iommu_domain *dom =to_mtk_domain (domain); -mtk_iommu_tlb_flush_range_sync (iova, size, dom->data); +mtk_iommu_tlb_flush_range_sync (iova, size, dom->bank); } static phys_addr_t mtk_iommu_iova_to_phys(struct iommu_domain *domain,
@@ -610,7 +619,7 @@ static phys_addr_t mtk_iommu_iova_to_phys(struct iommu_domain *domain,phys_addr_t pa; pa = dom->iop->iova_to_phys (dom->iop, iova); -if (dom->data->enable_4GB && pa >=MTK_IOMMU_4GB_MODE_REMAP_BASE ) +if (dom->bank->pdata->enable_4GB && pa >=MTK_IOMMU_4GB_MODE_REMAP_BASE ) pa &= ~BIT_ULL (32 );return pa;
@@ -739,16 +748,17 @@ static const struct iommu_ops mtk_iommu_ops = {static int mtk_iommu_hw_init (const struct mtk_iommu_data *data) { +const struct mtk_iommu_bank_data *bank0 = &data->bank[0 ];u32 regval;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 =readl_relaxed (data->base +REG_MMU_CTRL_REG ); + regval =readl_relaxed (bank0->base +REG_MMU_CTRL_REG ); regval |=F_MMU_TF_PROT_TO_PROGRAM_ADDR ; } -writel_relaxed (regval, data->base +REG_MMU_CTRL_REG ); +writel_relaxed (regval, bank0->base +REG_MMU_CTRL_REG );if (data->enable_4GB &&MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_VLD_PA_RNG )) {
@@ -757,31 +767,31 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)* 0x1_0000_0000 to 0x1_ffff_ffff. here record bit[32:30]. */ regval =F_MMU_VLD_PA_RNG (7 ,4 ); -writel_relaxed (regval, data->base +REG_MMU_VLD_PA_RNG ); +writel_relaxed (regval, bank0->base +REG_MMU_VLD_PA_RNG ); }if (MTK_IOMMU_HAS_FLAG (data->plat_data,DCM_DISABLE )) -writel_relaxed (F_MMU_DCM , data->base +REG_MMU_DCM_DIS ); +writel_relaxed (F_MMU_DCM , bank0->base +REG_MMU_DCM_DIS );else -writel_relaxed (0 , data->base +REG_MMU_DCM_DIS ); +writel_relaxed (0 , bank0->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_CTRL ); + regval =readl_relaxed (bank0->base +REG_MMU_WR_LEN_CTRL ); regval &= ~F_MMU_WR_THROT_DIS_MASK ; -writel_relaxed (regval, data->base +REG_MMU_WR_LEN_CTRL ); +writel_relaxed (regval, bank0->base +REG_MMU_WR_LEN_CTRL ); }if (MTK_IOMMU_HAS_FLAG (data->plat_data,RESET_AXI )) {/* The register is called STANDARD_AXI_MODE in this case */ regval =0 ; }else { - regval =readl_relaxed (data->base +REG_MMU_MISC_CTRL ); + regval =readl_relaxed (bank0->base +REG_MMU_MISC_CTRL );if (MTK_IOMMU_HAS_FLAG (data->plat_data,NOT_STD_AXI_MODE )) regval &= ~F_MMU_STANDARD_AXI_MODE_MASK ;if (MTK_IOMMU_HAS_FLAG (data->plat_data,OUT_ORDER_WR_EN )) regval &= ~F_MMU_IN_ORDER_WR_EN_MASK ; } -writel_relaxed (regval, data->base +REG_MMU_MISC_CTRL ); +writel_relaxed (regval, bank0->base +REG_MMU_MISC_CTRL ); regval =F_L2_MULIT_HIT_EN | F_TABLE_WALK_FAULT_INT_EN |
@@ -789,7 +799,7 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)F_MISS_FIFO_OVERFLOW_INT_EN |F_PREFETCH_FIFO_ERR_INT_EN |F_MISS_FIFO_ERR_INT_EN ; -writel_relaxed (regval, data->base +REG_MMU_INT_CONTROL0 ); +writel_relaxed (regval, bank0->base +REG_MMU_INT_CONTROL0 ); regval =F_INT_TRANSLATION_FAULT | F_INT_MAIN_MULTI_HIT_FAULT |
@@ -798,19 +808,19 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)F_INT_TLB_MISS_FAULT |F_INT_MISS_TRANSACTION_FIFO_FAULT |F_INT_PRETETCH_TRANSATION_FIFO_FAULT ; -writel_relaxed (regval, data->base +REG_MMU_INT_MAIN_CONTROL ); +writel_relaxed (regval, bank0->base +REG_MMU_INT_MAIN_CONTROL );if (MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_LEGACY_IVRP_PADDR )) regval = (data->protect_base >>1 ) | (data->enable_4GB <<31 );else regval =lower_32_bits (data->protect_base) |upper_32_bits (data->protect_base); -writel_relaxed (regval, data->base +REG_MMU_IVRP_PADDR ); +writel_relaxed (regval, bank0->base +REG_MMU_IVRP_PADDR ); -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 ); -dev_err (data->dev,"Failed @ IRQ-%d Request\n" , data->irq); +if (devm_request_irq (bank0->pdev, bank0->irq, mtk_iommu_isr,0 , +dev_name (bank0->pdev), (void *)bank0)) { +writel_relaxed (0 , bank0->base +REG_MMU_PT_BASE_ADDR ); +dev_err (bank0->pdev,"Failed @ IRQ-%d Request\n" , bank0->irq);return -ENODEV ; }
@@ -904,6 +914,8 @@ static int mtk_iommu_probe(struct platform_device *pdev)int ret;u32 val;char *p; +struct mtk_iommu_bank_data *bank; +void __iomem *base; data =devm_kzalloc (dev,sizeof (*data),GFP_KERNEL );if (!data)
@@ -941,14 +953,20 @@ static int mtk_iommu_probe(struct platform_device *pdev) } res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); - data->base =devm_ioremap_resource (dev, res); -if (IS_ERR (data->base)) -return PTR_ERR (data->base); + base =devm_ioremap_resource (dev, res); +if (IS_ERR (base)) +return PTR_ERR (base); ioaddr = res->start; - data->irq =platform_get_irq (pdev,0 ); -if (data->irq <0 ) -return data->irq; + bank = &data->bank[0 ]; + bank->id =0 ; + bank->base = base; + bank->irq =platform_get_irq (pdev,0 ); +if (bank->irq <0 ) +return bank->irq; + bank->pdev = dev; + bank->pdata = data; +spin_lock_init (&bank->tlb_lock);if (MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_BCLK )) { data->bclk =devm_clk_get (dev,"bclk" );
@@ -984,8 +1002,6 @@ static int mtk_iommu_probe(struct platform_device *pdev)if (ret) goto out_sysfs_remove; -spin_lock_init (&data->tlb_lock); -if (MTK_IOMMU_HAS_FLAG (data->plat_data,SHARE_PGTABLE )) {list_add_tail (&data->list, data->plat_data->hw_list); data->hw_list = data->plat_data->hw_list;
@@ -1035,6 +1051,7 @@ static int mtk_iommu_probe(struct platform_device *pdev)static int mtk_iommu_remove (struct platform_device *pdev) {struct mtk_iommu_data *data =platform_get_drvdata (pdev); +struct mtk_iommu_bank_data *bank = &data->bank[0 ];iommu_device_sysfs_remove (&data->iommu);iommu_device_unregister (&data->iommu);
@@ -1046,7 +1063,7 @@ static int mtk_iommu_remove(struct platform_device *pdev)if (MTK_IOMMU_IS_TYPE (data->plat_data,MTK_IOMMU_TYPE_MM ))device_link_remove (data->smicomm_dev, &pdev->dev);pm_runtime_disable (&pdev->dev); -devm_free_irq (&pdev->dev, data->irq, data); +devm_free_irq (&pdev->dev, bank->irq, bank);component_master_del (&pdev->dev, &mtk_iommu_com_ops);return 0 ; }
@@ -1055,7 +1072,7 @@ static int __maybe_unused mtk_iommu_runtime_suspend(struct device *dev) {struct mtk_iommu_data *data =dev_get_drvdata (dev);struct mtk_iommu_suspend_reg *reg = &data->reg; -void __iomem *base = data->base; +void __iomem *base = data->bank[0 ].base; reg->wr_len_ctrl =readl_relaxed (base +REG_MMU_WR_LEN_CTRL ); reg->misc_ctrl =readl_relaxed (base +REG_MMU_MISC_CTRL );
@@ -1073,8 +1090,8 @@ static int __maybe_unused mtk_iommu_runtime_resume(struct device *dev) {struct mtk_iommu_data *data =dev_get_drvdata (dev);struct mtk_iommu_suspend_reg *reg = &data->reg; -struct mtk_iommu_domain *m4u_dom = data->m4u_dom; -void __iomem *base = data->base; +struct mtk_iommu_domain *m4u_dom = data->bank[0 ].m4u_dom; +void __iomem *base = data->bank[0 ].base;int ret; ret =clk_prepare_enable (data->bclk);
drivers/iommu/mtk_iommu.h +21 -3
@@ -24,6 +24,8 @@#define MTK_IOMMU_GROUP_MAX 8 +#define MTK_IOMMU_BANK_MAX 5 +struct mtk_iommu_suspend_reg {union {u32 standard_axi_mode;/* v1 */
@@ -65,17 +67,33 @@ struct mtk_iommu_plat_data {struct mtk_iommu_domain ; -struct mtk_iommu_data { +struct mtk_iommu_bank_data {void __iomem *base;int irq; +unsigned int id; +struct device *pdev; +struct mtk_iommu_data *pdata;/* parent data */ +spinlock_t tlb_lock;/* lock for tlb range flush */ +struct mtk_iommu_domain *m4u_dom;/* Each bank has a domain */ +}; + +struct mtk_iommu_data { +union { +struct {/* only for gen1 */ +void __iomem *base; +int irq; +struct mtk_iommu_domain *m4u_dom; + }; + +/* only for gen2 that support multi-banks */ +struct mtk_iommu_bank_data bank[MTK_IOMMU_BANK_MAX ]; + };struct device *dev;struct clk *bclk;phys_addr_t protect_base;/* protect memory base */ struct mtk_iommu_suspend_reg reg; -struct mtk_iommu_domain *m4u_dom;struct iommu_group *m4u_group[MTK_IOMMU_GROUP_MAX ];bool enable_4GB; -spinlock_t tlb_lock;/* lock for tlb range flush */ struct iommu_device iommu;const struct mtk_iommu_plat_data *plat_data;
Signature · 1 line
2.18.0
Yong Wu
maintainerPATCH v2 23/29 iommu/mediatek: Initialise bank HW for each a bank
In reply to Yong WuThe mt8195 IOMMU HW max support 5 banks, and regarding the banks' registers, it looks like:
----------------------------------------
|bank0 | bank1 | bank2 | bank3 | bank4|
----------------------------------------
|global | |control| null |regs | ----------------------------------------- |bank |bank |bank |bank |bank | |regs |regs |regs |regs |regs | | | | | | |
-----------------------------------------
Each bank has some special bank registers and it share bank0's global control registers. this patch initialise the bank hw with the bankid.
In the hw_init, we always initialise bank0's control register since we don't know if the bank0 is initialised.
Additionally, About each bank's register base, always delta 0x1000. like bank[x + 1] = bank[x] + 0x1000.
--- drivers/iommu/mtk_iommu.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-)
drivers/iommu/mtk_iommu.c +17 -11
@@ -153,7 +153,7 @@ struct mtk_iommu_domain {static const struct iommu_ops mtk_iommu_ops; -static int mtk_iommu_hw_init (const struct mtk_iommu_data *data); +static int mtk_iommu_hw_init (const struct mtk_iommu_data *data,unsigned int bankid);#define MTK_IOMMU_TLB_ADDR (iova) ({ \ dma_addr_t _addr = iova; \
@@ -533,12 +533,12 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain, dom->bank = bank; } -if (!bank->m4u_dom) {/* Initialize the M4U HW */ +if (!bank->m4u_dom) {/* Initialize the M4U HW for each a BANK */ ret =pm_runtime_resume_and_get (m4udev);if (ret <0 )return ret; - ret =mtk_iommu_hw_init (data); + ret =mtk_iommu_hw_init (data, bankid);if (ret) {pm_runtime_put (m4udev);return ret;
@@ -746,11 +746,16 @@ static const struct iommu_ops mtk_iommu_ops = { .owner = THIS_MODULE, }; -static int mtk_iommu_hw_init (const struct mtk_iommu_data *data) +static int mtk_iommu_hw_init (const struct mtk_iommu_data *data,unsigned int bankid) { +const struct mtk_iommu_bank_data *bankx = &data->bank[bankid];const struct mtk_iommu_bank_data *bank0 = &data->bank[0 ];u32 regval; +/* +* Global control settings are in bank0. May re-init these global registers +* since no sure if there is bank0 consumers. +*/ if (data->plat_data->m4u_plat ==M4U_MT8173 ) { regval =F_MMU_PREFETCH_RT_REPLACE_MOD |F_MMU_TF_PROT_TO_PROGRAM_ADDR_MT8173 ;
@@ -793,13 +798,14 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) }writel_relaxed (regval, bank0->base +REG_MMU_MISC_CTRL ); +/* Independent settings for each bank */ regval =F_L2_MULIT_HIT_EN |F_TABLE_WALK_FAULT_INT_EN |F_PREETCH_FIFO_OVERFLOW_INT_EN |F_MISS_FIFO_OVERFLOW_INT_EN |F_PREFETCH_FIFO_ERR_INT_EN |F_MISS_FIFO_ERR_INT_EN ; -writel_relaxed (regval, bank0->base +REG_MMU_INT_CONTROL0 ); +writel_relaxed (regval, bankx->base +REG_MMU_INT_CONTROL0 ); regval =F_INT_TRANSLATION_FAULT | F_INT_MAIN_MULTI_HIT_FAULT |
@@ -808,19 +814,19 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)F_INT_TLB_MISS_FAULT |F_INT_MISS_TRANSACTION_FIFO_FAULT |F_INT_PRETETCH_TRANSATION_FIFO_FAULT ; -writel_relaxed (regval, bank0->base +REG_MMU_INT_MAIN_CONTROL ); +writel_relaxed (regval, bankx->base +REG_MMU_INT_MAIN_CONTROL );if (MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_LEGACY_IVRP_PADDR )) regval = (data->protect_base >>1 ) | (data->enable_4GB <<31 );else regval =lower_32_bits (data->protect_base) |upper_32_bits (data->protect_base); -writel_relaxed (regval, bank0->base +REG_MMU_IVRP_PADDR ); +writel_relaxed (regval, bankx->base +REG_MMU_IVRP_PADDR ); -if (devm_request_irq (bank0->pdev, bank0->irq, mtk_iommu_isr,0 , -dev_name (bank0->pdev), (void *)bank0)) { -writel_relaxed (0 , bank0->base +REG_MMU_PT_BASE_ADDR ); -dev_err (bank0->pdev,"Failed @ IRQ-%d Request\n" , bank0->irq); +if (devm_request_irq (bankx->pdev, bankx->irq, mtk_iommu_isr,0 , +dev_name (bankx->pdev), (void *)bankx)) { +writel_relaxed (0 , bankx->base +REG_MMU_PT_BASE_ADDR ); +dev_err (bankx->pdev,"Failed @ IRQ-%d Request\n" , bankx->irq);return -ENODEV ; }
Signature · 1 line
2.18.0
Yong Wu
maintainerPATCH v2 24/29 iommu/mediatek: Add bank_nr and bank_enable
In reply to Yong WuPrepare for supporting multi banks, Adds two variables in the plat_data:bank_nr: the bank number that this SoC support;bank_enable: list if the banks is enabled.
Add them for all the current SoC, bank_nr always is 1 and only bank_enable[0] is enabled.
--- drivers/iommu/mtk_iommu.c | 18 ++++++++++++++++++ drivers/iommu/mtk_iommu.h | 3 +++ 2 files changed, 21 insertions(+)
drivers/iommu/mtk_iommu.c +18 -0
@@ -1137,6 +1137,8 @@ static const struct mtk_iommu_plat_data mt2712_data = { NOT_STD_AXI_MODE | MTK_IOMMU_TYPE_MM, .hw_list = &m4ulist, .inv_sel_reg = REG_MMU_INV_SEL_GEN1, + .bank_nr = 1, + .bank_enable = {true}, .iova_region = single_domain, .iova_region_nr = ARRAY_SIZE(single_domain), .larbid_remap = {{0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}},
@@ -1147,6 +1149,8 @@ static const struct mtk_iommu_plat_data mt6779_data = { .flags = HAS_SUB_COMM_2BITS | OUT_ORDER_WR_EN | WR_THROT_EN | NOT_STD_AXI_MODE | MTK_IOMMU_TYPE_MM, .inv_sel_reg = REG_MMU_INV_SEL_GEN2, + .bank_nr = 1, + .bank_enable = {true}, .iova_region = single_domain, .iova_region_nr = ARRAY_SIZE(single_domain), .larbid_remap = {{0}, {1}, {2}, {3}, {5}, {7, 8}, {10}, {9}},
@@ -1157,6 +1161,8 @@ static const struct mtk_iommu_plat_data mt8167_data = { .flags = RESET_AXI | HAS_LEGACY_IVRP_PADDR | NOT_STD_AXI_MODE | MTK_IOMMU_TYPE_MM, .inv_sel_reg = REG_MMU_INV_SEL_GEN1, + .bank_nr = 1, + .bank_enable = {true}, .iova_region = single_domain, .iova_region_nr = ARRAY_SIZE(single_domain), .larbid_remap = {{0}, {1}, {2}}, /* Linear mapping. */
@@ -1168,6 +1174,8 @@ static const struct mtk_iommu_plat_data mt8173_data = {HAS_LEGACY_IVRP_PADDR |NOT_STD_AXI_MODE | MTK_IOMMU_TYPE_MM, .inv_sel_reg = REG_MMU_INV_SEL_GEN1, + .bank_nr = 1, + .bank_enable = {true}, .iova_region = single_domain, .iova_region_nr = ARRAY_SIZE(single_domain), .larbid_remap = {{0}, {1}, {2}, {3}, {4}, {5}}, /* Linear mapping. */
@@ -1177,6 +1185,8 @@ static const struct mtk_iommu_plat_data mt8183_data = { .m4u_plat = M4U_MT8183, .flags = RESET_AXI | MTK_IOMMU_TYPE_MM, .inv_sel_reg = REG_MMU_INV_SEL_GEN1, + .bank_nr = 1, + .bank_enable = {true}, .iova_region = single_domain, .iova_region_nr = ARRAY_SIZE(single_domain), .larbid_remap = {{0}, {4}, {5}, {6}, {7}, {2}, {3}, {1}},
@@ -1188,6 +1198,8 @@ static const struct mtk_iommu_plat_data mt8192_data = {WR_THROT_EN |IOVA_34_EN |NOT_STD_AXI_MODE | MTK_IOMMU_TYPE_MM, .inv_sel_reg = REG_MMU_INV_SEL_GEN2, + .bank_nr = 1, + .bank_enable = {true}, .iova_region = mt8192_multi_dom, .iova_region_nr = ARRAY_SIZE(mt8192_multi_dom), .larbid_remap = {{0}, {1}, {4, 5}, {7}, {2}, {9, 11, 19, 20},
@@ -1199,6 +1211,8 @@ static const struct mtk_iommu_plat_data mt8195_data_infra = { .flags = WR_THROT_EN | DCM_DISABLE | MTK_IOMMU_TYPE_INFRA | IFA_IOMMU_PCIe_SUPPORT, .pericfg_comp_str = "mediatek,mt8195-pericfg_ao", + .bank_nr = 1, + .bank_enable = {true}, .inv_sel_reg = REG_MMU_INV_SEL_GEN2, .iova_region = single_domain, .iova_region_nr = ARRAY_SIZE(single_domain),
@@ -1211,6 +1225,8 @@ static const struct mtk_iommu_plat_data mt8195_data_vdo = { SHARE_PGTABLE | MTK_IOMMU_TYPE_MM, .hw_list = &m4ulist, .inv_sel_reg = REG_MMU_INV_SEL_GEN2, + .bank_nr = 1, + .bank_enable = {true}, .iova_region = mt8192_multi_dom, .iova_region_nr = ARRAY_SIZE(mt8192_multi_dom), .larbid_remap = {{2, 0}, {21}, {24}, {7}, {19}, {9, 10, 11},
@@ -1224,6 +1240,8 @@ static const struct mtk_iommu_plat_data mt8195_data_vpp = { SHARE_PGTABLE | MTK_IOMMU_TYPE_MM, .hw_list = &m4ulist, .inv_sel_reg = REG_MMU_INV_SEL_GEN2, + .bank_nr = 1, + .bank_enable = {true}, .iova_region = mt8192_multi_dom, .iova_region_nr = ARRAY_SIZE(mt8192_multi_dom), .larbid_remap = {{1}, {3}, {22, 0, 0, 0, 23}, {8},
drivers/iommu/mtk_iommu.h +3 -0
@@ -62,6 +62,9 @@ struct mtk_iommu_plat_data {struct list_head *hw_list;unsigned int iova_region_nr;const struct mtk_iommu_iova_region *iova_region; + +unsigned int bank_nr; +bool bank_enable[MTK_IOMMU_BANK_MAX ];unsigned char larbid_remap[MTK_LARB_COM_MAX ][MTK_LARB_SUBCOM_MAX ]; };
Signature · 1 line
2.18.0
Yong Wu
maintainerPATCH v2 25/29 iommu/mediatek: Change the domid to iova_region_id
In reply to Yong WuPrepare for adding bankid, also no functional change.
In the previous SoC, each a iova_region is a domain; In the multi-banks case, each a bank is a domain; then the original function name "mtk_iommu_get_domain_id" is not proper. the name "iova_region_id" should be proper. this patch only rename the domid to iova_region_id.
--- drivers/iommu/mtk_iommu.c | 46 +++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 23 deletions(-)
drivers/iommu/mtk_iommu.c +23 -23
@@ -358,8 +358,8 @@ static irqreturn_t mtk_iommu_isr(int irq, void *dev_id)return IRQ_HANDLED ; } -static int mtk_iommu_get_domain_id (struct device *dev, -const struct mtk_iommu_plat_data *plat_data) +static int mtk_iommu_get_iova_region_id (struct device *dev, +const struct mtk_iommu_plat_data *plat_data) {const struct mtk_iommu_iova_region *rgn = plat_data->iova_region;const struct bus_dma_region *dma_rgn = dev->dma_range_map;
@@ -389,7 +389,7 @@ static int mtk_iommu_get_domain_id(struct device *dev, }static int mtk_iommu_config (struct mtk_iommu_data *data,struct device *dev, -bool enable,unsigned int domid) +bool enable,unsigned int regionid) {struct mtk_smi_larb_iommu *larb_mmu;unsigned int larbid, portid;
@@ -405,12 +405,12 @@ static int mtk_iommu_config(struct mtk_iommu_data *data, struct device *dev,if (MTK_IOMMU_IS_TYPE (data->plat_data,MTK_IOMMU_TYPE_MM )) { larb_mmu = &data->larb_imu[larbid]; - region = data->plat_data->iova_region + domid; + region = data->plat_data->iova_region + regionid; larb_mmu->bank[portid] =upper_32_bits (region->iova_base); -dev_dbg (dev,"%s iommu for larb(%s) port %d dom %d bank %d.\n" , +dev_dbg (dev,"%s iommu for larb(%s) port %d region %d rgn-bank %d.\n" , enable ?"enable" :"disable" ,dev_name (larb_mmu->dev), - portid, domid, larb_mmu->bank[portid]); + portid, regionid, larb_mmu->bank[portid]);if (enable) larb_mmu->mmu |=MTK_SMI_MMU_EN (portid);
@@ -437,7 +437,7 @@ static int mtk_iommu_config(struct mtk_iommu_data *data, struct device *dev,static int mtk_iommu_domain_finalise (struct mtk_iommu_domain *dom,struct mtk_iommu_data *data, -unsigned int domid) +unsigned int region_id) {const struct mtk_iommu_iova_region *region;struct mtk_iommu_domain *m4u_dom;
@@ -476,7 +476,7 @@ static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom, update_iova_region:/* Update the iova region for this domain */ - region = data->plat_data->iova_region + domid; + region = data->plat_data->iova_region + region_id; dom->domain.geometry.aperture_start = region->iova_base; dom->domain.geometry.aperture_end = region->iova_base + region->size -1 ; dom->domain.geometry.force_aperture = true;
@@ -517,18 +517,18 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,struct mtk_iommu_bank_data *bank;struct device *m4udev = data->dev;unsigned int bankid =0 ; -int ret, domid; +int ret, region_id; - domid =mtk_iommu_get_domain_id (dev, data->plat_data); -if (domid <0 ) -return domid; + region_id =mtk_iommu_get_iova_region_id (dev, data->plat_data); +if (region_id <0 ) +return region_id; bank = &data->bank[bankid];if (!dom->bank) {/* Data is in the frstdata in sharing pgtable case. */ frstdata =mtk_iommu_get_frst_data (hw_list); -if (mtk_iommu_domain_finalise (dom, frstdata, domid)) +if (mtk_iommu_domain_finalise (dom, frstdata, region_id))return -ENODEV ; dom->bank = bank; }
@@ -550,7 +550,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,pm_runtime_put (m4udev); } -return mtk_iommu_config (data, dev, true, domid); +return mtk_iommu_config (data, dev, true, region_id); } static void mtk_iommu_detach_device(struct iommu_domain *domain,
@@ -653,21 +653,21 @@ static struct iommu_group *mtk_iommu_device_group(struct device *dev)struct mtk_iommu_data *c_data =dev_iommu_priv_get (dev), *data;struct list_head *hw_list = c_data->hw_list;struct iommu_group *group; -int domid; +int regionid; data =mtk_iommu_get_frst_data (hw_list);if (!data)return ERR_PTR (-ENODEV ); - domid =mtk_iommu_get_domain_id (dev, data->plat_data); -if (domid <0 ) -return ERR_PTR (domid); + regionid =mtk_iommu_get_iova_region_id (dev, data->plat_data); +if (regionid <0 ) +return ERR_PTR (regionid); - group = data->m4u_group[domid]; + group = data->m4u_group[regionid];if (!group) { group =iommu_group_alloc ();if (!IS_ERR (group)) - data->m4u_group[domid] = group; + data->m4u_group[regionid] = group; }else {iommu_group_ref_get (group); }
@@ -700,14 +700,14 @@ static void mtk_iommu_get_resv_regions(struct device *dev, struct list_head *head) {struct mtk_iommu_data *data =dev_iommu_priv_get (dev); -unsigned int domid =mtk_iommu_get_domain_id (dev, data->plat_data), i; +unsigned int regionid =mtk_iommu_get_iova_region_id (dev, data->plat_data), i;const struct mtk_iommu_iova_region *resv, *curdom;struct iommu_resv_region *region;int prot =IOMMU_WRITE |IOMMU_READ ; -if ((int )domid <0 ) +if ((int )regionid <0 )return ; - curdom = data->plat_data->iova_region + domid; + curdom = data->plat_data->iova_region + regionid;for (i =0 ; i < data->plat_data->iova_region_nr; i++) { resv = data->plat_data->iova_region + i;
Signature · 1 line
2.18.0
Yong Wu
maintainerPATCH v2 26/29 iommu/mediatek: Get the proper bankid for multi banks
In reply to Yong WuWe preassign some ports in a special bank via the new defined bank_portmsk. Put it in the plat_data means it is not expected to be adjusted dynamically.
If the iommu id in the iommu consumer's dtsi node is inside this bank_portmsk, then we switch it to this special iommu bank, and initialise the IOMMU bank HW.
Each a bank has the independent pgtable(4GB iova range). Each a bank is a independent iommu domain/group. Currently we don't separate different iova ranges inside a bank.
--- drivers/iommu/mtk_iommu.c | 38 +++++++++++++++++++++++++++++++++++--- drivers/iommu/mtk_iommu.h | 1 + 2 files changed, 36 insertions(+), 3 deletions(-)
drivers/iommu/mtk_iommu.c +35 -3
@@ -358,6 +358,30 @@ static irqreturn_t mtk_iommu_isr(int irq, void *dev_id)return IRQ_HANDLED ; } +static unsigned int mtk_iommu_get_bank_id (struct device *dev, +const struct mtk_iommu_plat_data *plat_data) +{ +struct iommu_fwspec *fwspec =dev_iommu_fwspec_get (dev); +unsigned int i, portmsk =0 , bankid =0 ;/* bank default is 0 */ + +if (plat_data->bank_nr ==1 ) +return bankid; + +for (i =0 ; i < fwspec->num_ids; i++) + portmsk |=BIT (MTK_M4U_TO_PORT (fwspec->ids[i])); + +for (i =0 ; i < plat_data->bank_nr; i++) { +if (!plat_data->bank_enable[i]) +continue ; + +if (portmsk & plat_data->bank_portmsk[i]) { + bankid = i; +break ; + } + } +return bankid; +} +static int mtk_iommu_get_iova_region_id (struct device *dev,const struct mtk_iommu_plat_data *plat_data) {
@@ -516,13 +540,14 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,struct list_head *hw_list = data->hw_list;struct mtk_iommu_bank_data *bank;struct device *m4udev = data->dev; -unsigned int bankid =0 ; +unsigned int bankid;int ret, region_id; region_id =mtk_iommu_get_iova_region_id (dev, data->plat_data);if (region_id <0 )return region_id; + bankid =mtk_iommu_get_bank_id (dev, data->plat_data); bank = &data->bank[bankid];if (!dom->bank) {/* Data is in the frstdata in sharing pgtable case. */
@@ -653,6 +678,7 @@ static struct iommu_group *mtk_iommu_device_group(struct device *dev)struct mtk_iommu_data *c_data =dev_iommu_priv_get (dev), *data;struct list_head *hw_list = c_data->hw_list;struct iommu_group *group; +unsigned int bankid, groupid;int regionid; data =mtk_iommu_get_frst_data (hw_list);
@@ -662,12 +688,18 @@ static struct iommu_group *mtk_iommu_device_group(struct device *dev) regionid =mtk_iommu_get_iova_region_id (dev, data->plat_data);if (regionid <0 )return ERR_PTR (regionid); + bankid =mtk_iommu_get_bank_id (dev, data->plat_data); - group = data->m4u_group[regionid]; +/* +* If the bank function is enabled, each a bank is a iommu group/domain. +* otherwise, each a iova region is a iommu group/domain. +*/ + groupid = bankid ? bankid : regionid; + group = data->m4u_group[groupid];if (!group) { group =iommu_group_alloc ();if (!IS_ERR (group)) - data->m4u_group[regionid] = group; + data->m4u_group[groupid] = group; }else {iommu_group_ref_get (group); }
drivers/iommu/mtk_iommu.h +1 -0
@@ -65,6 +65,7 @@ struct mtk_iommu_plat_data {unsigned int bank_nr;bool bank_enable[MTK_IOMMU_BANK_MAX ]; +unsigned int bank_portmsk[MTK_IOMMU_BANK_MAX ];unsigned char larbid_remap[MTK_LARB_COM_MAX ][MTK_LARB_SUBCOM_MAX ]; };
Signature · 1 line
2.18.0
Yong Wu
maintainerPATCH v2 27/29 iommu/mediatek: Initialise/Remove for multi bank dev
In reply to Yong WuThe registers for each bank of the IOMMU base are in order, delta is 0x1000. Initialise the base for each bank.
For all the previous SoC, we only have bank0. thus use "do {} while()" to allow bank0 always go.
When removing the device, Not always all the banks are initialised, it depend on if there is masters for some banks. thus, use a register to confirm this.
--- drivers/iommu/mtk_iommu.c | 51 +++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 13 deletions(-)
drivers/iommu/mtk_iommu.c +38 -13
@@ -113,6 +113,7 @@#define F_MMU_INT_ID_PORT_ID (a) (((a) >> 2) & 0x1f)#define MTK_PROTECT_PA_ALIGN 256 +#define MTK_IOMMU_BANK_SZ 0x1000#define PERICFG_IOMMU_1 0x714
@@ -945,11 +946,11 @@ static int mtk_iommu_probe(struct platform_device *pdev)struct mtk_iommu_data *data;struct device *dev = &pdev->dev;struct resource *res; -resource_size_t ioaddr; +resource_size_t ioaddr, size;struct component_match *match =NULL ;struct regmap *infracfg;void *protect; -int ret; +int ret, i =0 ;u32 val;char *p;struct mtk_iommu_bank_data *bank;
@@ -991,20 +992,31 @@ static int mtk_iommu_probe(struct platform_device *pdev) } res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); + size =resource_size (res); +if (size < data->plat_data->bank_nr *MTK_IOMMU_BANK_SZ ) { +dev_err (dev,"banknr %d. res %pR is not enough.\n" , + data->plat_data->bank_nr, res); +return -EINVAL ; + } base =devm_ioremap_resource (dev, res);if (IS_ERR (base))return PTR_ERR (base); ioaddr = res->start; - bank = &data->bank[0 ]; - bank->id =0 ; - bank->base = base; - bank->irq =platform_get_irq (pdev,0 ); -if (bank->irq <0 ) -return bank->irq; - bank->pdev = dev; - bank->pdata = data; -spin_lock_init (&bank->tlb_lock); +do { +if (!data->plat_data->bank_enable[i]) +continue ; + bank = &data->bank[i]; + bank->id = i; + bank->base = base + i *MTK_IOMMU_BANK_SZ ; + + bank->irq =platform_get_irq (pdev, i); +if (bank->irq <0 ) +return bank->irq; + bank->pdev = dev; + bank->pdata = data; +spin_lock_init (&bank->tlb_lock); + }while (++i < data->plat_data->bank_nr);if (MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_BCLK )) { data->bclk =devm_clk_get (dev,"bclk" );
@@ -1089,7 +1101,9 @@ static int mtk_iommu_probe(struct platform_device *pdev)static int mtk_iommu_remove (struct platform_device *pdev) {struct mtk_iommu_data *data =platform_get_drvdata (pdev); -struct mtk_iommu_bank_data *bank = &data->bank[0 ]; +struct mtk_iommu_bank_data *bank; +bool bank_hwinit; +int i;iommu_device_sysfs_remove (&data->iommu);iommu_device_unregister (&data->iommu);
@@ -1101,7 +1115,18 @@ static int mtk_iommu_remove(struct platform_device *pdev)if (MTK_IOMMU_IS_TYPE (data->plat_data,MTK_IOMMU_TYPE_MM ))device_link_remove (data->smicomm_dev, &pdev->dev);pm_runtime_disable (&pdev->dev); -devm_free_irq (&pdev->dev, bank->irq, bank); +for (i =0 ; i < data->plat_data->bank_nr; i++) { + bank = &data->bank[i]; +/* +* Use a register value to confirm if this bank HW is initialised. +* If the bank has no consumer, the bank HW still won't be +* initialised even though bank_enable is true. +*/ + bank_hwinit = !!readl_relaxed (bank->base +REG_MMU_PT_BASE_ADDR ); +if (!bank_hwinit) +continue ; +devm_free_irq (&pdev->dev, bank->irq, bank); + }component_master_del (&pdev->dev, &mtk_iommu_com_ops);return 0 ; }
Signature · 1 line
2.18.0
Yong Wu
maintainerPATCH v2 28/29 iommu/mediatek: Backup/restore regsiters for multi banks
In reply to Yong WuEach bank has some independent registers. thus backup/restore them for each a bank when suspend and resume.
--- drivers/iommu/mtk_iommu.c | 39 +++++++++++++++++++++++++++------------ drivers/iommu/mtk_iommu.h | 14 +++++++++++--- 2 files changed, 38 insertions(+), 15 deletions(-)
drivers/iommu/mtk_iommu.c +27 -12
@@ -1135,16 +1135,23 @@ static int __maybe_unused mtk_iommu_runtime_suspend(struct device *dev) {struct mtk_iommu_data *data =dev_get_drvdata (dev);struct mtk_iommu_suspend_reg *reg = &data->reg; -void __iomem *base = data->bank[0 ].base; +void __iomem *base; +int i =0 ; + base = data->bank[i].base; reg->wr_len_ctrl =readl_relaxed (base +REG_MMU_WR_LEN_CTRL ); 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 ); - reg->int_main_control =readl_relaxed (base +REG_MMU_INT_MAIN_CONTROL ); - reg->ivrp_paddr =readl_relaxed (base +REG_MMU_IVRP_PADDR ); reg->vld_pa_rng =readl_relaxed (base +REG_MMU_VLD_PA_RNG ); +do { +if (!data->plat_data->bank_enable[i]) +continue ; + base = data->bank[i].base; + reg->int_control[i] =readl_relaxed (base +REG_MMU_INT_CONTROL0 ); + reg->int_main_control[i] =readl_relaxed (base +REG_MMU_INT_MAIN_CONTROL ); + reg->ivrp_paddr[i] =readl_relaxed (base +REG_MMU_IVRP_PADDR ); + }while (++i < data->plat_data->bank_nr);clk_disable_unprepare (data->bclk);return 0 ; }
@@ -1153,9 +1160,9 @@ static int __maybe_unused mtk_iommu_runtime_resume(struct device *dev) {struct mtk_iommu_data *data =dev_get_drvdata (dev);struct mtk_iommu_suspend_reg *reg = &data->reg; -struct mtk_iommu_domain *m4u_dom = data->bank[0 ].m4u_dom; -void __iomem *base = data->bank[0 ].base; -int ret; +struct mtk_iommu_domain *m4u_dom; +void __iomem *base; +int ret, i =0 ; ret =clk_prepare_enable (data->bclk);if (ret) {
@@ -1167,18 +1174,26 @@ static int __maybe_unused mtk_iommu_runtime_resume(struct device *dev)* Uppon first resume, only enable the clk and return, since the values of the * registers are not yet set. */ -if (!m4u_dom) +if (!reg->wr_len_ctrl)return 0 ; + base = data->bank[i].base;writel_relaxed (reg->wr_len_ctrl, base +REG_MMU_WR_LEN_CTRL );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 ); -writel_relaxed (reg->int_main_control, base +REG_MMU_INT_MAIN_CONTROL ); -writel_relaxed (reg->ivrp_paddr, base +REG_MMU_IVRP_PADDR );writel_relaxed (reg->vld_pa_rng, base +REG_MMU_VLD_PA_RNG ); -writel (m4u_dom->cfg.arm_v7s_cfg.ttbr &MMU_PT_ADDR_MASK , base +REG_MMU_PT_BASE_ADDR ); +do { + m4u_dom = data->bank[i].m4u_dom; +if (!data->plat_data->bank_enable[i] || !m4u_dom) +continue ; + base = data->bank[i].base; +writel_relaxed (reg->int_control[i], base +REG_MMU_INT_CONTROL0 ); +writel_relaxed (reg->int_main_control[i], base +REG_MMU_INT_MAIN_CONTROL ); +writel_relaxed (reg->ivrp_paddr[i], base +REG_MMU_IVRP_PADDR ); +writel (m4u_dom->cfg.arm_v7s_cfg.ttbr &MMU_PT_ADDR_MASK , + base +REG_MMU_PT_BASE_ADDR ); + }while (++i < data->plat_data->bank_nr);return 0 ; }
drivers/iommu/mtk_iommu.h +11 -3
@@ -33,11 +33,19 @@ struct mtk_iommu_suspend_reg { };u32 dcm_dis;u32 ctrl_reg; -u32 int_control0; -u32 int_main_control; -u32 ivrp_paddr;u32 vld_pa_rng;u32 wr_len_ctrl; +union { +struct {/* only for gen1 */ +u32 int_control0; + }; + +struct {/* only for gen2 that support multi-banks */ +u32 int_control[MTK_IOMMU_BANK_MAX ]; +u32 int_main_control[MTK_IOMMU_BANK_MAX ]; +u32 ivrp_paddr[MTK_IOMMU_BANK_MAX ]; + }; + }; };enum mtk_iommu_plat {
Signature · 1 line
2.18.0
Yong Wu
maintainerPATCH v2 29/29 iommu/mediatek: mt8195: Enable multi banks for infra iommu
In reply to Yong WuEnable the multi-bank functions for infra-iommu. We put PCIE in bank0 and USB in the last bank(bank4). and we don't use the other banks currently, disable them.
--- drivers/iommu/mtk_iommu.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/iommu/mtk_iommu.c +5 -2
@@ -1283,8 +1283,11 @@ static const struct mtk_iommu_plat_data mt8195_data_infra = { .flags = WR_THROT_EN | DCM_DISABLE | MTK_IOMMU_TYPE_INFRA | IFA_IOMMU_PCIe_SUPPORT, .pericfg_comp_str = "mediatek,mt8195-pericfg_ao", - .bank_nr = 1, - .bank_enable = {true}, + .bank_nr = 5, + .bank_enable = {true, false, false, false, true}, + .bank_portmsk = {[0] = GENMASK(19, 16), /* PCIe */ + [4 ] =GENMASK (31 ,20 ),/* USB */ + }, .inv_sel_reg = REG_MMU_INV_SEL_GEN2, .iova_region = single_domain, .iova_region_nr = ARRAY_SIZE(single_domain),
Signature · 1 line
2.18.0