MT8195 IOMMU SUPPORT
Subsystems (5)
Yong Wu
maintainerv5 cover MT8195 IOMMU SUPPORT
This patchset adds 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.
This patchset bases on next-20220216 which has already contained the smi clean-up v10[1] patchset and the tlb logic patchset[2] for MediaTek iommu.
[1] https://lore.kernel.org/linux-iommu/[email protected]/
[2] https://lore.kernel.org/linux-mediatek/[email protected]/
Change note:
v5:1) Base on next-20220216
2) Remove a patch for kmalloc for protect buffer. keep the kzalloc for it.
3) minor fix from AngeloGioacchino, like rename the error label name (data_unlock to err_unlock).
Note, keep the TODO for component compare_of[26/34].
v4: https://lore.kernel.org/linux-iommu/[email protected]/
1) Base on v5.16-rc1
2) Base on tlb logic 2 patchset, some patches in v3 has already gone through that patchset.
3) Due to the unreadable union for v1/v2(comment in 26/33 of v3), I separate mtk_iommu_data for v1 and v2 totally, then remove mtk_iommu.h. please see patch[26/35][27/35].
4) add two mutex for the internal data. patch[6/35][7/35].
5) add a new flag PM_CLK_AO.
v3: https://lore.kernel.org/linux-mediatek/[email protected]/
1) base on v5.15-rc1
2) Adjust devlink with smi-common, not use the property(sub-sommon).
3) Adjust tlb_flush_all flow,
a) Fix tlb_flush_all only is supported in bank0.
b) add tlb-flush-all in the resume callback.
c) remove the pm status checking in tlb-flush-all.
The reason are showed in the commit message.
4) Allow IOMMU_DOMAIN_UNMANAGED since PCIe VFIO use that.
5) Fix a clk warning and a null abort when unbind the iommu driver.
v2: https://lore.kernel.org/linux-mediatek/[email protected]/
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 (34):
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: Add list_del in mtk_iommu_remove iommu/mediatek: Remove clk_disable in mtk_iommu_remove iommu/mediatek: Add mutex for m4u_group and m4u_dom in data iommu/mediatek: Add mutex for data in the mtk_iommu_domain 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 the granule in the 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: Allow IOMMU_DOMAIN_UNMANAGED for PCIe VFIO iommu/mediatek: Add a PM_CLK_AO flag for infra iommu 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: Separate mtk_iommu_data for v1 and v2 iommu/mediatek: Remove mtk_iommu.h iommu/mediatek-v1: Just rename mtk_iommu to mtk_iommu_v1 iommu/mediatek: Add mtk_iommu_bank_data structure iommu/mediatek: Initialise bank HW for each a bank 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 | 966 +++++++++++++----- drivers/iommu/mtk_iommu.h | 111 -- drivers/iommu/mtk_iommu_v1.c | 243 +++-- .../dt-bindings/memory/mt8195-memory-port.h | 408 ++++++++ include/dt-bindings/memory/mtk-memory-port.h | 2 + 6 files changed, 1264 insertions(+), 486 deletions(-) delete mode 100644 drivers/iommu/mtk_iommu.h create mode 100644 include/dt-bindings/memory/mt8195-memory-port.h
Signature · 1 line
2.18.0
Yong Wu
maintainerPATCH v5 1/34 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 v5 2/34 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.
--- .../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 · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v5 3/34 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
@@ -446,7 +446,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;
@@ -456,7 +456,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 · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v5 4/34 iommu/mediatek: Add list_del in mtk_iommu_remove
In reply to Yong WuLack the list_del in the mtk_iommu_remove, and remove bus_set_iommu(*, NULL) since there may be several iommu HWs. we can not bus_set_iommu null when one iommu driver unbind.
This could be a fix for mt2712 which support 2 M4U HW and list them.
--- drivers/iommu/mtk_iommu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/iommu/mtk_iommu.c +1 -2
@@ -953,8 +953,7 @@ static int mtk_iommu_remove(struct platform_device *pdev)iommu_device_sysfs_remove (&data->iommu);iommu_device_unregister (&data->iommu); -if (iommu_present (&platform_bus_type)) -bus_set_iommu (&platform_bus_type,NULL ); +list_del (&data->list);clk_disable_unprepare (data->bclk);device_link_remove (data->smicomm_dev, &pdev->dev);
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v5 5/34 iommu/mediatek: Remove clk_disable in mtk_iommu_remove
In reply to Yong WuAfter the commit b34ea31fe013 ("iommu/mediatek: Always enable the clk on resume"), the iommu clock is controlled by the runtime callback. thus remove the clk control in the mtk_iommu_remove.
Otherwise, it will warning like:
echo 14018000.iommu > /sys/bus/platform/drivers/mtk-iommu/unbind
[ 51.413044] ------------[ cut here ]------------
[ 51.413648] vpp0_smi_iommu already disabled
[ 51.414233] WARNING: CPU: 2 PID: 157 at */v5.15-rc1/kernel/mediatek/
drivers/clk/clk.c:952 clk_core_disable+0xb0/0xb8
[ 51.417174] Hardware name: MT8195V/C(ENG) (DT)
[ 51.418635] pc : clk_core_disable+0xb0/0xb8
[ 51.419177] lr : clk_core_disable+0xb0/0xb8
...
[ 51.429375] Call trace:
[ 51.429694] clk_core_disable+0xb0/0xb8
[ 51.430193] clk_core_disable_lock+0x24/0x40
[ 51.430745] clk_disable+0x20/0x30
[ 51.431189] mtk_iommu_remove+0x58/0x118
[ 51.431705] platform_remove+0x28/0x60
[ 51.432197] device_release_driver_internal+0x110/0x1f0
[ 51.432873] device_driver_detach+0x18/0x28
[ 51.433418] unbind_store+0xd4/0x108
[ 51.433886] drv_attr_store+0x24/0x38
[ 51.434363] sysfs_kf_write+0x40/0x58
[ 51.434843] kernfs_fop_write_iter+0x164/0x1e0--- drivers/iommu/mtk_iommu.c | 1 - 1 file changed, 1 deletion(-)
drivers/iommu/mtk_iommu.c +0 -1
@@ -955,7 +955,6 @@ static int mtk_iommu_remove(struct platform_device *pdev)list_del (&data->list); -clk_disable_unprepare (data->bclk);device_link_remove (data->smicomm_dev, &pdev->dev);pm_runtime_disable (&pdev->dev);devm_free_irq (&pdev->dev, data->irq, data);
Signature · 1 line
2.18.0
Yong Wu
maintainerPATCH v5 6/34 iommu/mediatek: Add mutex for m4u_group and m4u_dom in data
In reply to Yong WuAdd a mutex to protect the data in the structure mtk_iommu_data, like ->"m4u_group" ->"m4u_dom". For the internal data, we should protect it in ourselves driver. Add a mutex for this. This could be a fix for the multi-groups support.
--- drivers/iommu/mtk_iommu.c | 13 +++++++++++-- drivers/iommu/mtk_iommu.h | 2 ++ 2 files changed, 13 insertions(+), 2 deletions(-)
drivers/iommu/mtk_iommu.c +11 -2
@@ -464,15 +464,16 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain, dom->data = data; } +mutex_lock (&data->mutex);if (!data->m4u_dom) {/* Initialize the M4U HW */ ret =pm_runtime_resume_and_get (m4udev);if (ret <0 ) -return ret; + goto err_unlock; ret =mtk_iommu_hw_init (data);if (ret) {pm_runtime_put (m4udev); -return ret; + goto err_unlock; } data->m4u_dom = dom; writel(dom->cfg.arm_v7s_cfg.ttbr & MMU_PT_ADDR_MASK,
@@ -480,9 +481,14 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,pm_runtime_put (m4udev); } +mutex_unlock (&data->mutex);mtk_iommu_config (data, dev, true, domid);return 0 ; + +err_unlock: +mutex_unlock (&data->mutex); +return ret; } static void mtk_iommu_detach_device(struct iommu_domain *domain,
@@ -622,6 +628,7 @@ static struct iommu_group *mtk_iommu_device_group(struct device *dev)if (domid <0 )return ERR_PTR (domid); +mutex_lock (&data->mutex); group = data->m4u_group[domid];if (!group) { group =iommu_group_alloc ();
@@ -630,6 +637,7 @@ static struct iommu_group *mtk_iommu_device_group(struct device *dev) }else {iommu_group_ref_get (group); } +mutex_unlock (&data->mutex);return group; }
@@ -908,6 +916,7 @@ static int mtk_iommu_probe(struct platform_device *pdev) }platform_set_drvdata (pdev, data); +mutex_init (&data->mutex); ret =iommu_device_sysfs_add (&data->iommu, dev,NULL ,"mtk-iommu.%pa" , &ioaddr);
drivers/iommu/mtk_iommu.h +2 -0
@@ -80,6 +80,8 @@ struct mtk_iommu_data {struct dma_iommu_mapping *mapping;/* For mtk_iommu_v1.c */ +struct mutex mutex;/* Protect m4u_group/m4u_dom above */ +struct list_head list;struct mtk_smi_larb_iommu larb_imu[MTK_LARB_NR_MAX ]; };
Signature · 1 line
2.18.0
Yong Wu
maintainerPATCH v5 7/34 iommu/mediatek: Add mutex for data in the mtk_iommu_domain
In reply to Yong WuSame with the previous patch, add a mutex for the "data" in the mtk_iommu_domain. Just improve the safety for multi devices enter attach_device at the same time. We don't get the real issue for this.
--- drivers/iommu/mtk_iommu.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/iommu/mtk_iommu.c +9 -1
@@ -128,6 +128,8 @@ struct mtk_iommu_domain {struct mtk_iommu_data *data;struct iommu_domain domain; + +struct mutex mutex;/* Protect "data" in this structure */ };static const struct iommu_ops mtk_iommu_ops;
@@ -434,6 +436,7 @@ static struct iommu_domain *mtk_iommu_domain_alloc(unsigned type) dom =kzalloc (sizeof (*dom),GFP_KERNEL );if (!dom)return NULL ; +mutex_init (&dom->mutex);return &dom->domain; }
@@ -455,14 +458,19 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,if (domid <0 )return domid; +mutex_lock (&dom->mutex);if (!dom->data) {/* Data is in the frstdata in sharing pgtable case. */ frstdata =mtk_iommu_get_m4u_data (); -if (mtk_iommu_domain_finalise (dom, frstdata, domid)) + ret =mtk_iommu_domain_finalise (dom, frstdata, domid); +if (ret) { +mutex_unlock (&dom->mutex);return -ENODEV ; + } dom->data = data; } +mutex_unlock (&dom->mutex);mutex_lock (&data->mutex);if (!data->m4u_dom) {/* Initialize the M4U HW */
Signature · 1 line
2.18.0
Yong Wu
maintainerPATCH v5 8/34 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 | 43 +++++++++++++++++++++------------------ drivers/iommu/mtk_iommu.h | 7 +++++++ 2 files changed, 30 insertions(+), 20 deletions(-)
drivers/iommu/mtk_iommu.c +23 -20
@@ -118,6 +118,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))
@@ -167,7 +168,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;
@@ -188,21 +189,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)
@@ -226,11 +216,12 @@ 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;unsigned long flags;int ret;u32 tmp; -for_each_m4u (data) { +for_each_m4u (data, head) {if (pm_runtime_get_if_in_use (data->dev) <=0 )continue ;
@@ -451,6 +442,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;
@@ -461,7 +453,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,mutex_lock (&dom->mutex);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); ret =mtk_iommu_domain_finalise (dom, frstdata, domid);if (ret) {
@@ -625,10 +617,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 );
@@ -936,7 +930,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);
@@ -1045,7 +1047,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 ];
@@ -82,6 +83,12 @@ struct mtk_iommu_data {struct mutex mutex;/* Protect m4u_group/m4u_dom above */ +/* +* 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 · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v5 9/34 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
@@ -180,10 +180,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 v5 10/34 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
@@ -51,6 +51,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))
@@ -119,6 +121,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))
@@ -763,7 +766,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 v5 11/34 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
@@ -122,6 +122,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))
@@ -783,7 +784,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 ; }
@@ -1056,7 +1058,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,
@@ -1066,7 +1069,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),
@@ -1075,7 +1079,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),
@@ -1085,7 +1089,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),
@@ -1104,7 +1108,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 · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v5 12/34 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
@@ -219,7 +219,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;
@@ -541,8 +540,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,
@@ -550,7 +548,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 · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v5 13/34 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
@@ -283,11 +283,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 · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v5 14/34 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 previous 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
@@ -105,6 +105,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)
@@ -116,13 +118,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))
@@ -290,9 +293,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); }
@@ -1067,7 +1073,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,
@@ -1105,7 +1111,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 · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v5 15/34 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
@@ -126,9 +126,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 · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v5 16/34 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.
The device link between iommu consumer device and smi-larb device only is needed in MM iommu case.
--- drivers/iommu/mtk_iommu.c | 212 ++++++++++++++++++++++---------------- 1 file changed, 121 insertions(+), 91 deletions(-)
drivers/iommu/mtk_iommu.c +121 -91
@@ -138,6 +138,8 @@#define MTK_IOMMU_IS_TYPE (pdata, _x) MTK_IOMMU_HAS_FLAG_MASK(pdata, _x,\ MTK_IOMMU_TYPE_MASK) +#define MTK_INVALID_LARBID MTK_LARB_NR_MAX +struct mtk_iommu_domain {struct io_pgtable_cfg cfg;struct io_pgtable_ops *iop;
@@ -274,7 +276,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 =MTK_INVALID_LARBID , fault_port =0 , sub_comm =0 ;u32 int_state, regval, va34_32, pa34_32;u64 fault_iova, fault_pa;bool layer, write;
@@ -300,17 +302,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 )) {
@@ -374,19 +378,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); + } } }
@@ -593,6 +599,9 @@ static struct iommu_device *mtk_iommu_probe_device(struct device *dev) data =dev_iommu_priv_get (dev); +if (!MTK_IOMMU_IS_TYPE (data->plat_data,MTK_IOMMU_TYPE_MM )) +return &data->iommu; +/* * Link the consumer device with the smi-larb device(supplier). * The device that connects with each a larb is a independent HW.
@@ -626,9 +635,11 @@ static void mtk_iommu_release_device(struct device *dev)return ; data =dev_iommu_priv_get (dev); - larbid =MTK_M4U_TO_LARB (fwspec->ids[0 ]); - larbdev = data->larb_imu[larbid].dev; -device_link_remove (dev, larbdev); +if (MTK_IOMMU_IS_TYPE (data->plat_data,MTK_IOMMU_TYPE_MM )) { + larbid =MTK_M4U_TO_LARB (fwspec->ids[0 ]); + larbdev = data->larb_imu[larbid].dev; +device_link_remove (dev, larbdev); + }iommu_fwspec_free (dev); }
@@ -818,19 +829,77 @@ 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 device_node *larbnode, *smicomm_node; +struct platform_device *plarbdev; +struct device_link *link; +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 -ENODEV ; + } +if (!plarbdev->dev.driver) { +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;
@@ -885,59 +954,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 -ENODEV ; - } -if (!plarbdev->dev.driver) { -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);
@@ -969,9 +991,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:
@@ -982,7 +1006,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;
@@ -997,10 +1022,12 @@ static int mtk_iommu_remove(struct platform_device *pdev)list_del (&data->list); -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); +component_master_del (&pdev->dev, &mtk_iommu_com_ops); + }pm_runtime_disable (&pdev->dev);devm_free_irq (&pdev->dev, data->irq, data); -component_master_del (&pdev->dev, &mtk_iommu_com_ops);return 0 ; }
@@ -1071,7 +1098,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,
@@ -1082,7 +1109,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),
@@ -1091,7 +1118,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),
@@ -1101,7 +1129,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),
@@ -1110,7 +1139,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),
@@ -1120,7 +1149,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 · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v5 17/34 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 | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/iommu/mtk_iommu.c +14 -4
@@ -832,7 +832,7 @@ static const struct component_master_ops mtk_iommu_com_ops = {static int mtk_iommu_mm_dts_parse (struct device *dev,struct component_match **match,struct mtk_iommu_data *data) { -struct device_node *larbnode, *smicomm_node; +struct device_node *larbnode, *smicomm_node, *smi_subcomm_node;struct platform_device *plarbdev;struct device_link *link;int i, larb_nr, ret;
@@ -872,11 +872,21 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **m compare_of, larbnode); } -/* Get smi-common dev from the last larb. */ - smicomm_node =of_parse_phandle (larbnode,"mediatek,smi" ,0 ); -if (!smicomm_node) +/* Get smi-(sub)-common dev from the last larb. */ + smi_subcomm_node =of_parse_phandle (larbnode,"mediatek,smi" ,0 ); +if (!smi_subcomm_node)return -EINVAL ; +/* +* It may have two level smi-common. the node is smi-sub-common if it +* has a new mediatek,smi property. otherwise it is smi-commmon. +*/ + smicomm_node =of_parse_phandle (smi_subcomm_node,"mediatek,smi" ,0 ); +if (smicomm_node) +of_node_put (smi_subcomm_node); +else + smicomm_node = smi_subcomm_node; + plarbdev =of_find_device_by_node (smicomm_node);of_node_put (smicomm_node); data->smicomm_dev = &plarbdev->dev;
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v5 18/34 iommu/mediatek: Allow IOMMU_DOMAIN_UNMANAGED for PCIe VFIO
In reply to Yong WuAllow the type IOMMU_DOMAIN_UNMANAGED since vfio_iommu_type1.c always call iommu_domain_alloc. The PCIe EP works ok when going through vfio.
--- drivers/iommu/mtk_iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/mtk_iommu.c +1 -1
@@ -446,7 +446,7 @@ static struct iommu_domain *mtk_iommu_domain_alloc(unsigned type) {struct mtk_iommu_domain *dom; -if (type !=IOMMU_DOMAIN_DMA ) +if (type !=IOMMU_DOMAIN_DMA && type !=IOMMU_DOMAIN_UNMANAGED )return NULL ; dom =kzalloc (sizeof (*dom),GFP_KERNEL );
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v5 19/34 iommu/mediatek: Add a PM_CLK_AO flag for infra iommu
In reply to Yong WuThe power/clock of infra iommu is always on, and it doesn't have the device link with the master devices, then the infra iommu device's pm statua is not active, thus we add A PM_CLK_AO flag for infra iommu.
The tlb operation is a bit not clear in this file, Comment them in the code here.
--- drivers/iommu/mtk_iommu.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-)
drivers/iommu/mtk_iommu.c +26 -3
@@ -130,6 +130,8 @@#define MTK_IOMMU_TYPE_MM (0x0 << 13)#define MTK_IOMMU_TYPE_INFRA (0x1 << 13)#define MTK_IOMMU_TYPE_MASK (0x3 << 13) +/* PM and clock always on. e.g. infra iommu */ +#define PM_CLK_AO BIT(15)#define MTK_IOMMU_HAS_FLAG (pdata, _x) (!!(((pdata)->flags) & (_x)))
@@ -235,13 +237,33 @@ static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size, struct mtk_iommu_data *data) {struct list_head *head = data->hw_list; +bool check_pm_status;unsigned long flags;int ret;u32 tmp;for_each_m4u (data, head) { -if (pm_runtime_get_if_in_use (data->dev) <=0 ) -continue ; +/* +* To avoid resume the iommu device frequently when the iommu device +* is not active, it doesn't always call pm_runtime_get here, then tlb +* flush depends on the tlb flush all in the runtime resume. +* +* There are 2 special cases: +* +* Case1: The iommu dev doesn't have power domain but has bclk. This case +* should also avoid the tlb flush while the dev is not active to mute +* the tlb timeout log. like mt8173. +* +* Case2: The power/clock of infra iommu is always on, and it doesn't +* have the device link with the master devices. This case should avoid +* the PM status check. +*/ + check_pm_status = !MTK_IOMMU_HAS_FLAG (data->plat_data,PM_CLK_AO ); + +if (check_pm_status) { +if (pm_runtime_get_if_in_use (data->dev) <=0 ) +continue ; + }spin_lock_irqsave (&data->tlb_lock, flags); writel_relaxed(F_INVLD_EN1 | F_INVLD_EN0,
@@ -268,7 +290,8 @@ static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size,mtk_iommu_tlb_flush_all (data); } -pm_runtime_put (data->dev); +if (check_pm_status) +pm_runtime_put (data->dev); } }
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v5 19/34] iommu/mediatek: Add a PM_CLK_AO flag for infra iommu
Il 17/02/22 12:34, Yong Wu ha scritto:
Quoted 8 lines
The power/clock of infra iommu is always on, and it doesn't have the device link with the master devices, then the infra iommu device's pm statua is not active, thus we add A
PM_CLK_AOflag for infra iommu.The tlb operation is a bit not clear in this file, Comment them in the code here.
Signed-off-by Yong Wu <[email protected]>
Yong Wu
maintainerPATCH v5 20/34 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 doesn'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 | 2 ++ 2 files changed, 31 insertions(+), 7 deletions(-)
drivers/iommu/mtk_iommu.c +29 -7
@@ -112,6 +112,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)
@@ -343,8 +345,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" ); }
@@ -388,14 +390,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]);
@@ -415,8 +418,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,
@@ -531,8 +545,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain, }mutex_unlock (&data->mutex); -mtk_iommu_config (data, dev, true, domid); -return 0 ; +return mtk_iommu_config (data, dev, true, domid); err_unlock:mutex_unlock (&data->mutex);
@@ -993,6 +1006,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 +2 -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,7 @@ struct mtk_iommu_data {struct device *smicomm_dev;struct dma_iommu_mapping *mapping;/* For mtk_iommu_v1.c */ +struct regmap *pericfg;struct mutex mutex;/* Protect m4u_group/m4u_dom above */
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v5 21/34 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 | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-)
drivers/iommu/mtk_iommu.c +20 -1
@@ -20,6 +20,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>
@@ -134,6 +135,7 @@#define MTK_IOMMU_TYPE_MASK (0x3 << 13)/* PM and clock always on. e.g. infra iommu */ #define PM_CLK_AO BIT(15) +#define IFA_IOMMU_PCIE_SUPPORT BIT(16)#define MTK_IOMMU_HAS_FLAG (pdata, _x) (!!(((pdata)->flags) & (_x)))
@@ -420,8 +422,11 @@ 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 ; +/* PCI dev 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)
@@ -1050,6 +1055,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;
@@ -1080,6 +1094,11 @@ 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);component_master_del (&pdev->dev, &mtk_iommu_com_ops); + }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 +bus_set_iommu (&pci_bus_type,NULL ); +#endif }pm_runtime_disable (&pdev->dev);devm_free_irq (&pdev->dev, data->irq, data);
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v5 21/34] iommu/mediatek: Add PCIe support
Il 17/02/22 12:34, Yong Wu ha scritto:
Quoted 18 lines
Currently the code for
of_iommu_configure_dev_idis 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 changeof_map_idto support outputMAX_PHANDLE_ARGS.
Quoted 6 lines
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.
Signed-off-by Yong Wu <[email protected]>
Yong Wu
maintainerPATCH v5 22/34 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 | 43 +++++++++++++++++++++++++++++++++++++++ drivers/iommu/mtk_iommu.h | 1 + 2 files changed, 44 insertions(+)
drivers/iommu/mtk_iommu.c +43 -0
@@ -1232,6 +1232,46 @@ 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 |PM_CLK_AO | +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 ,MTK_INVALID_LARBID ,MTK_INVALID_LARBID ,MTK_INVALID_LARBID ,23 }, + {8 }, {20 }, {12 }, +/* 16: 16a; 29: 16b; 30: CCUtop0; 31: CCUtop1 */ + {14 ,16 ,29 ,26 ,30 ,31 ,18 }, + {4 ,MTK_INVALID_LARBID ,MTK_INVALID_LARBID ,MTK_INVALID_LARBID ,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},
@@ -1239,6 +1279,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 · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v5 23/34 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 | 51 +++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 24 deletions(-)
drivers/iommu/mtk_iommu.c +27 -24
@@ -227,12 +227,12 @@ static struct mtk_iommu_domain *to_mtk_domain(struct iommu_domain *dom)static void mtk_iommu_tlb_flush_all (struct mtk_iommu_data *data) { +void __iomem *base = data->base;unsigned long flags;spin_lock_irqsave (&data->tlb_lock, flags); -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 ); +writel_relaxed (F_INVLD_EN1 |F_INVLD_EN0 , base + data->plat_data->inv_sel_reg); +writel_relaxed (F_ALL_INVLD , base +REG_MMU_INVALIDATE );wmb ();/* Make sure the tlb flush all done */ spin_unlock_irqrestore (&data->tlb_lock, flags); }
@@ -243,6 +243,7 @@ static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size,struct list_head *head = data->hw_list;bool check_pm_status;unsigned long flags; +void __iomem *base;int ret;u32 tmp;
@@ -269,23 +270,23 @@ static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size,continue ; } + 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 );/* 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 (ret) {
@@ -305,23 +306,25 @@ static irqreturn_t mtk_iommu_isr(int irq, void *dev_id)struct mtk_iommu_domain *dom = data->m4u_dom;unsigned int fault_larb =MTK_INVALID_LARBID , 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 ;
@@ -329,12 +332,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 {
@@ -353,9 +356,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 · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v5 24/34 iommu/mediatek: Just move code position in hw_init
In reply to Yong WuNo functional change too, prepare for mt8195 IOMMU support bank functions. Some global control settings are in bank0 while 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
@@ -801,30 +801,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 )) {/*
@@ -858,6 +834,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 · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v5 25/34 iommu/mediatek: Separate mtk_iommu_data for v1 and v2
In reply to Yong WuPrepare for adding the structure "mtk_iommu_bank_data". No functional change. The mtk_iommu_domain in v1 and v2 are different, we could not add current data as bank[0] in v1 simplistically.
Currently we have no plan to add new SoC for v1, in order to avoid affect v1 when we add many new features for v2, I totally separate v1 and v2 in this patch, there are many structures only for v2.
--- drivers/iommu/mtk_iommu.c | 82 +++++++++++++++++++++++++++++++++--- drivers/iommu/mtk_iommu.h | 81 ----------------------------------- drivers/iommu/mtk_iommu_v1.c | 29 +++++++++++++ 3 files changed, 106 insertions(+), 86 deletions(-)
drivers/iommu/mtk_iommu.c +77 -5
@@ -146,6 +146,69 @@#define MTK_INVALID_LARBID MTK_LARB_NR_MAX +#define MTK_LARB_COM_MAX 8 +#define MTK_LARB_SUBCOM_MAX 8 + +#define MTK_IOMMU_GROUP_MAX 8 + +enum mtk_iommu_plat { +M4U_MT2712 , +M4U_MT6779 , +M4U_MT8167 , +M4U_MT8173 , +M4U_MT8183 , +M4U_MT8192 , +M4U_MT8195 , +}; + +struct mtk_iommu_iova_region { +dma_addr_t iova_base; +unsigned long long size; +}; + +struct mtk_iommu_plat_data { +enum mtk_iommu_plat m4u_plat; +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; +unsigned char larbid_remap[MTK_LARB_COM_MAX ][MTK_LARB_SUBCOM_MAX ]; +}; + +struct mtk_iommu_data { +void __iomem *base; +int irq; +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; +struct device *smicomm_dev; + +struct dma_iommu_mapping *mapping;/* For mtk_iommu_v1.c */ +struct regmap *pericfg; + +struct mutex mutex;/* Protect m4u_group/m4u_dom above */ + +/* +* 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 ]; +}; +struct mtk_iommu_domain {struct io_pgtable_cfg cfg;struct io_pgtable_ops *iop;
@@ -156,6 +219,20 @@ struct mtk_iommu_domain {struct mutex mutex;/* Protect "data" in this structure */ }; +static int mtk_iommu_bind (struct device *dev) +{ +struct mtk_iommu_data *data =dev_get_drvdata (dev); + +return component_bind_all (dev, &data->larb_imu); +} + +static void mtk_iommu_unbind (struct device *dev) +{ +struct mtk_iommu_data *data =dev_get_drvdata (dev); + +component_unbind_all (dev, &data->larb_imu); +} +static const struct iommu_ops mtk_iommu_ops;static int mtk_iommu_hw_init (const struct mtk_iommu_data *data);
@@ -193,11 +270,6 @@ static LIST_HEAD(m4ulist); /* List all the M4U HWs */#define for_each_m4u (data, head) list_for_each_entry(data, head, list) -struct mtk_iommu_iova_region { -dma_addr_t iova_base; -unsigned long long size; -}; -static const struct mtk_iommu_iova_region single_domain[] = { {.iova_base =0 , .size =SZ_4G }, };
drivers/iommu/mtk_iommu.h +0 -81
105 lines not on this page · raw message
drivers/iommu/mtk_iommu_v1.c +29 -0
@@ -87,6 +87,21 @@*/ #define M2701_IOMMU_PGT_SIZE SZ_4M +struct mtk_iommu_data { +void __iomem *base; +int irq; +struct device *dev; +struct clk *bclk; +phys_addr_t protect_base;/* protect memory base */ +struct mtk_iommu_domain *m4u_dom; + +struct iommu_device iommu; +struct dma_iommu_mapping *mapping; +struct mtk_smi_larb_iommu larb_imu[MTK_LARB_NR_MAX ]; + +struct mtk_iommu_suspend_reg reg; +}; +struct mtk_iommu_domain {spinlock_t pgtlock;/* lock for page table */ struct iommu_domain domain;
@@ -95,6 +110,20 @@ struct mtk_iommu_domain {struct mtk_iommu_data *data; }; +static int mtk_iommu_bind (struct device *dev) +{ +struct mtk_iommu_data *data =dev_get_drvdata (dev); + +return component_bind_all (dev, &data->larb_imu); +} + +static void mtk_iommu_unbind (struct device *dev) +{ +struct mtk_iommu_data *data =dev_get_drvdata (dev); + +component_unbind_all (dev, &data->larb_imu); +} +static struct mtk_iommu_domain *to_mtk_domain (struct iommu_domain *dom) { return container_of(dom, struct mtk_iommu_domain, domain);
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v5 25/34] iommu/mediatek: Separate mtk_iommu_data for v1 and v2
Il 17/02/22 12:34, Yong Wu ha scritto:
Quoted 9 lines
Prepare for adding the structure "
mtk_iommu_bank_data". No functional change. Themtk_iommu_domainin v1 and v2 are different, we could not add current data as bank[0] in v1 simplistically.Currently we have no plan to add new SoC for v1, in order to avoid affect v1 when we add many new features for v2, I totally separate v1 and v2 in this patch, there are many structures only for v2.
Signed-off-by Yong Wu <[email protected]>
Quoted 6 lines
--- drivers/iommu/mtk_iommu.c | 82 +++++++++++++++++++++++++++++++++--- drivers/iommu/mtk_iommu.h | 81 ----------------------------------- drivers/iommu/mtk_iommu_v1.c | 29 +++++++++++++ 3 files changed, 106 insertions(+), 86 deletions(-)
Yong Wu
maintainerPATCH v5 26/34 iommu/mediatek: Remove mtk_iommu.h
In reply to Yong WuCurrently there is only compare_of/release_of/a suspend structure in the header file. I think it is no need to keep a header file only for these. Move these into the c file and rm this header file.
I think there should be a common helper for compare_of and release_of. There is many copy in drm, it should be another topic.
--- drivers/iommu/mtk_iommu.c | 25 ++++++++++++++++++++- drivers/iommu/mtk_iommu.h | 42 ------------------------------------ drivers/iommu/mtk_iommu_v1.c | 21 +++++++++++++++--- 3 files changed, 42 insertions(+), 46 deletions(-) delete mode 100644 drivers/iommu/mtk_iommu.h
drivers/iommu/mtk_iommu.c +24 -1
@@ -14,6 +14,7 @@#include <linux/io.h> #include <linux/iommu.h> #include <linux/iopoll.h> +#include <linux/io-pgtable.h> #include <linux/list.h> #include <linux/mfd/syscon.h> #include <linux/module.h>
@@ -30,7 +31,7 @@#include <asm/barrier.h> #include <soc/mediatek/smi.h> -#include "mtk_iommu.h" +#include <dt-bindings/memory/mtk-memory-port.h> #define REG_MMU_PT_BASE_ADDR 0x000#define MMU_PT_ADDR_MASK GENMASK(31, 7)
@@ -166,6 +167,17 @@ struct mtk_iommu_iova_region {unsigned long long size; }; +struct mtk_iommu_suspend_reg { +u32 misc_ctrl; +u32 dcm_dis; +u32 ctrl_reg; +u32 int_control0; +u32 int_main_control; +u32 ivrp_paddr; +u32 vld_pa_rng; +u32 wr_len_ctrl; +}; +struct mtk_iommu_plat_data {enum mtk_iommu_plat m4u_plat;u32 flags;
@@ -219,6 +231,17 @@ struct mtk_iommu_domain {struct mutex mutex;/* Protect "data" in this structure */ }; +/* TODO: A common helper is expected. */ +static int compare_of (struct device *dev,void *data) +{ +return dev->of_node == data; +} + +static void release_of (struct device *dev,void *data) +{ +of_node_put (data); +} +static int mtk_iommu_bind (struct device *dev) {struct mtk_iommu_data *data =dev_get_drvdata (dev);
drivers/iommu/mtk_iommu.h deleted +0 -42
42 lines not on this page · raw message
drivers/iommu/mtk_iommu_v1.c +18 -3
@@ -7,7 +7,6 @@* * Based on driver/iommu/mtk_iommu.c */ -#include <linux/memblock.h> #include <linux/bug.h> #include <linux/clk.h> #include <linux/component.h>
@@ -28,10 +27,9 @@#include <linux/spinlock.h> #include <asm/barrier.h> #include <asm/dma-iommu.h> -#include <linux/init.h> +#include <dt-bindings/memory/mtk-memory-port.h> #include <dt-bindings/memory/mt2701-larb-port.h> #include <soc/mediatek/smi.h> -#include "mtk_iommu.h" #define REG_MMU_PT_BASE_ADDR 0x000
@@ -87,6 +85,13 @@*/ #define M2701_IOMMU_PGT_SIZE SZ_4M +struct mtk_iommu_suspend_reg { +u32 standard_axi_mode; +u32 dcm_dis; +u32 ctrl_reg; +u32 int_control0; +}; +struct mtk_iommu_data {void __iomem *base;int irq;
@@ -110,6 +115,16 @@ struct mtk_iommu_domain {struct mtk_iommu_data *data; }; +static int compare_of (struct device *dev,void *data) +{ +return dev->of_node == data; +} + +static void release_of (struct device *dev,void *data) +{ +of_node_put (data); +} +static int mtk_iommu_bind (struct device *dev) {struct mtk_iommu_data *data =dev_get_drvdata (dev);
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v5 26/34] iommu/mediatek: Remove mtk_iommu.h
Il 17/02/22 12:34, Yong Wu ha scritto:
Quoted 8 lines
Currently there is only compare_of/release_of/a suspend structure in the header file. I think it is no need to keep a header file only for these. Move these into the c file and rm this header file.
I think there should be a common helper for
compare_ofandrelease_of. There is many copy in drm, it should be another topic.Signed-off-by Yong Wu <[email protected]>
Quoted 7 lines
--- drivers/iommu/mtk_iommu.c | 25 ++++++++++++++++++++- drivers/iommu/mtk_iommu.h | 42 ------------------------------------ drivers/iommu/mtk_iommu_v1.c | 21 +++++++++++++++--- 3 files changed, 42 insertions(+), 46 deletions(-)delete mode 100644
drivers/iommu/mtk_iommu.h
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v5 27/34 iommu/mediatek-v1: Just rename mtk_iommu to mtk_iommu_v1
In reply to Yong WuNo functional change. Just rename this for readable. Differentiate this from mtk_iommu.c
--- drivers/iommu/mtk_iommu_v1.c | 211 +++++++++++++++++------------------ 1 file changed, 103 insertions(+), 108 deletions(-)
drivers/iommu/mtk_iommu_v1.c +103 -108
@@ -85,34 +85,34 @@*/ #define M2701_IOMMU_PGT_SIZE SZ_4M -struct mtk_iommu_suspend_reg { +struct mtk_iommu_v1_suspend_reg {u32 standard_axi_mode;u32 dcm_dis;u32 ctrl_reg;u32 int_control0; }; -struct mtk_iommu_data { +struct mtk_iommu_v1_data {void __iomem *base;int irq;struct device *dev;struct clk *bclk;phys_addr_t protect_base;/* protect memory base */ -struct mtk_iommu_domain *m4u_dom; +struct mtk_iommu_v1_domain *m4u_dom;struct iommu_device iommu;struct dma_iommu_mapping *mapping;struct mtk_smi_larb_iommu larb_imu[MTK_LARB_NR_MAX ]; -struct mtk_iommu_suspend_reg reg; +struct mtk_iommu_v1_suspend_reg reg; }; -struct mtk_iommu_domain { +struct mtk_iommu_v1_domain {spinlock_t pgtlock;/* lock for page table */ struct iommu_domain domain;u32 *pgt_va;dma_addr_t pgt_pa; -struct mtk_iommu_data *data; +struct mtk_iommu_v1_data *data; };static int compare_of (struct device *dev,void *data)
@@ -125,23 +125,23 @@ static void release_of(struct device *dev, void *data)of_node_put (data); } -static int mtk_iommu_bind (struct device *dev) +static int mtk_iommu_v1_bind (struct device *dev) { -struct mtk_iommu_data *data =dev_get_drvdata (dev); +struct mtk_iommu_v1_data *data =dev_get_drvdata (dev);return component_bind_all (dev, &data->larb_imu); } -static void mtk_iommu_unbind (struct device *dev) +static void mtk_iommu_v1_unbind (struct device *dev) { -struct mtk_iommu_data *data =dev_get_drvdata (dev); +struct mtk_iommu_v1_data *data =dev_get_drvdata (dev);component_unbind_all (dev, &data->larb_imu); } -static struct mtk_iommu_domain *to_mtk_domain (struct iommu_domain *dom) +static struct mtk_iommu_v1_domain *to_mtk_domain (struct iommu_domain *dom) { - return container_of(dom, struct mtk_iommu_domain, domain); + return container_of(dom, struct mtk_iommu_v1_domain, domain); }static const int mt2701_m4u_in_larb[] = {
@@ -167,7 +167,7 @@ static inline int mt2701_m4u_to_port(int id)return id - mt2701_m4u_in_larb[larb]; } -static void mtk_iommu_tlb_flush_all (struct mtk_iommu_data *data) +static void mtk_iommu_v1_tlb_flush_all (struct mtk_iommu_v1_data *data) {writel_relaxed (F_INVLD_EN1 |F_INVLD_EN0 , data->base +REG_MMU_INV_SEL );
@@ -175,8 +175,8 @@ static void mtk_iommu_tlb_flush_all(struct mtk_iommu_data *data)wmb ();/* Make sure the tlb flush all done */ } -static void mtk_iommu_tlb_flush_range (struct mtk_iommu_data *data, -unsigned long iova,size_t size) +static void mtk_iommu_v1_tlb_flush_range (struct mtk_iommu_v1_data *data, +unsigned long iova,size_t size) {int ret;u32 tmp;
@@ -194,16 +194,16 @@ static void mtk_iommu_tlb_flush_range(struct mtk_iommu_data *data,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_v1_tlb_flush_all (data); }/* Clear the CPE status */ writel_relaxed (0 , data->base +REG_MMU_CPE_DONE ); } -static irqreturn_t mtk_iommu_isr (int irq,void *dev_id) +static irqreturn_t mtk_iommu_v1_isr (int irq,void *dev_id) { -struct mtk_iommu_data *data = dev_id; -struct mtk_iommu_domain *dom = data->m4u_dom; +struct mtk_iommu_v1_data *data = dev_id; +struct mtk_iommu_v1_domain *dom = data->m4u_dom;u32 int_state, regval, fault_iova, fault_pa;unsigned int fault_larb, fault_port;
@@ -233,13 +233,13 @@ static irqreturn_t mtk_iommu_isr(int irq, void *dev_id) regval |=F_INT_CLR_BIT ;writel_relaxed (regval, data->base +REG_MMU_INT_CONTROL ); -mtk_iommu_tlb_flush_all (data); +mtk_iommu_v1_tlb_flush_all (data);return IRQ_HANDLED ; } -static void mtk_iommu_config (struct mtk_iommu_data *data, -struct device *dev,bool enable) +static void mtk_iommu_v1_config (struct mtk_iommu_v1_data *data, +struct device *dev,bool enable) {struct mtk_smi_larb_iommu *larb_mmu;unsigned int larbid, portid;
@@ -261,9 +261,9 @@ static void mtk_iommu_config(struct mtk_iommu_data *data, } } -static int mtk_iommu_domain_finalise (struct mtk_iommu_data *data) +static int mtk_iommu_v1_domain_finalise (struct mtk_iommu_v1_data *data) { -struct mtk_iommu_domain *dom = data->m4u_dom; +struct mtk_iommu_v1_domain *dom = data->m4u_dom;spin_lock_init (&dom->pgtlock);
@@ -279,9 +279,9 @@ static int mtk_iommu_domain_finalise(struct mtk_iommu_data *data)return 0 ; } -static struct iommu_domain *mtk_iommu_domain_alloc (unsigned type) +static struct iommu_domain *mtk_iommu_v1_domain_alloc (unsigned type) { -struct mtk_iommu_domain *dom; +struct mtk_iommu_v1_domain *dom;if (type !=IOMMU_DOMAIN_UNMANAGED )return NULL ;
@@ -293,21 +293,20 @@ static struct iommu_domain *mtk_iommu_domain_alloc(unsigned type)return &dom->domain; } -static void mtk_iommu_domain_free (struct iommu_domain *domain) +static void mtk_iommu_v1_domain_free (struct iommu_domain *domain) { -struct mtk_iommu_domain *dom =to_mtk_domain (domain); -struct mtk_iommu_data *data = dom->data; +struct mtk_iommu_v1_domain *dom =to_mtk_domain (domain); +struct mtk_iommu_v1_data *data = dom->data;dma_free_coherent (data->dev,M2701_IOMMU_PGT_SIZE , dom->pgt_va, dom->pgt_pa);kfree (to_mtk_domain (domain)); } -static int mtk_iommu_attach_device (struct iommu_domain *domain, -struct device *dev) +static int mtk_iommu_v1_attach_device (struct iommu_domain *domain,struct device *dev) { -struct mtk_iommu_data *data =dev_iommu_priv_get (dev); -struct mtk_iommu_domain *dom =to_mtk_domain (domain); +struct mtk_iommu_v1_data *data =dev_iommu_priv_get (dev); +struct mtk_iommu_v1_domain *dom =to_mtk_domain (domain);struct dma_iommu_mapping *mtk_mapping;int ret;
@@ -318,29 +317,28 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,if (!data->m4u_dom) { data->m4u_dom = dom; - ret =mtk_iommu_domain_finalise (data); + ret =mtk_iommu_v1_domain_finalise (data);if (ret) { data->m4u_dom =NULL ;return ret; } } -mtk_iommu_config (data, dev, true); +mtk_iommu_v1_config (data, dev, true);return 0 ; } -static void mtk_iommu_detach_device (struct iommu_domain *domain, -struct device *dev) +static void mtk_iommu_v1_detach_device (struct iommu_domain *domain,struct device *dev) { -struct mtk_iommu_data *data =dev_iommu_priv_get (dev); +struct mtk_iommu_v1_data *data =dev_iommu_priv_get (dev); -mtk_iommu_config (data, dev, false); +mtk_iommu_v1_config (data, dev, false); } -static int mtk_iommu_map (struct iommu_domain *domain,unsigned long iova, -phys_addr_t paddr,size_t size,int prot,gfp_t gfp) +static int mtk_iommu_v1_map (struct iommu_domain *domain,unsigned long iova, +phys_addr_t paddr,size_t size,int prot,gfp_t gfp) { -struct mtk_iommu_domain *dom =to_mtk_domain (domain); +struct mtk_iommu_v1_domain *dom =to_mtk_domain (domain);unsigned int page_num = size >>MT2701_IOMMU_PAGE_SHIFT ;unsigned long flags;unsigned int i;
@@ -361,16 +359,15 @@ static int mtk_iommu_map(struct iommu_domain *domain, unsigned long iova,spin_unlock_irqrestore (&dom->pgtlock, flags); -mtk_iommu_tlb_flush_range (dom->data, iova, size); +mtk_iommu_v1_tlb_flush_range (dom->data, iova, size);return map_size == size ?0 : -EEXIST ; } -static size_t mtk_iommu_unmap (struct iommu_domain *domain, -unsigned long iova,size_t size, -struct iommu_iotlb_gather *gather) +static size_t mtk_iommu_v1_unmap (struct iommu_domain *domain,unsigned long iova, +size_t size,struct iommu_iotlb_gather *gather) { -struct mtk_iommu_domain *dom =to_mtk_domain (domain); +struct mtk_iommu_v1_domain *dom =to_mtk_domain (domain);unsigned long flags;u32 *pgt_base_iova = dom->pgt_va + (iova >>MT2701_IOMMU_PAGE_SHIFT );unsigned int page_num = size >>MT2701_IOMMU_PAGE_SHIFT ;
@@ -379,15 +376,14 @@ static size_t mtk_iommu_unmap(struct iommu_domain *domain,memset (pgt_base_iova,0 , page_num *sizeof (u32));spin_unlock_irqrestore (&dom->pgtlock, flags); -mtk_iommu_tlb_flush_range (dom->data, iova, size); +mtk_iommu_v1_tlb_flush_range (dom->data, iova, size);return size; } -static phys_addr_t mtk_iommu_iova_to_phys (struct iommu_domain *domain, -dma_addr_t iova) +static phys_addr_t mtk_iommu_v1_iova_to_phys (struct iommu_domain *domain,dma_addr_t iova) { -struct mtk_iommu_domain *dom =to_mtk_domain (domain); +struct mtk_iommu_v1_domain *dom =to_mtk_domain (domain);unsigned long flags;phys_addr_t pa;
@@ -399,17 +395,16 @@ static phys_addr_t mtk_iommu_iova_to_phys(struct iommu_domain *domain,return pa; } -static const struct iommu_ops mtk_iommu_ops; +static const struct iommu_ops mtk_iommu_v1_ops;/* * MTK generation one iommu HW only support one iommu domain, and all the client * sharing the same iova address space. */ -static int mtk_iommu_create_mapping (struct device *dev, -struct of_phandle_args *args) +static int mtk_iommu_v1_create_mapping (struct device *dev,struct of_phandle_args *args) {struct iommu_fwspec *fwspec =dev_iommu_fwspec_get (dev); -struct mtk_iommu_data *data; +struct mtk_iommu_v1_data *data;struct platform_device *m4updev;struct dma_iommu_mapping *mtk_mapping;int ret;
@@ -421,11 +416,11 @@ static int mtk_iommu_create_mapping(struct device *dev, }if (!fwspec) { - ret =iommu_fwspec_init (dev, &args->np->fwnode, &mtk_iommu_ops); + ret =iommu_fwspec_init (dev, &args->np->fwnode, &mtk_iommu_v1_ops);if (ret)return ret; fwspec =dev_iommu_fwspec_get (dev); - }else if (dev_iommu_fwspec_get (dev)->ops != &mtk_iommu_ops) { + }else if (dev_iommu_fwspec_get (dev)->ops != &mtk_iommu_v1_ops) {return -EINVAL ; }
@@ -457,16 +452,16 @@ static int mtk_iommu_create_mapping(struct device *dev,return 0 ; } -static int mtk_iommu_def_domain_type (struct device *dev) +static int mtk_iommu_v1_def_domain_type (struct device *dev) {return IOMMU_DOMAIN_UNMANAGED ; } -static struct iommu_device *mtk_iommu_probe_device (struct device *dev) +static struct iommu_device *mtk_iommu_v1_probe_device (struct device *dev) {struct iommu_fwspec *fwspec =dev_iommu_fwspec_get (dev);struct of_phandle_args iommu_spec; -struct mtk_iommu_data *data; +struct mtk_iommu_v1_data *data;int err, idx =0 , larbid, larbidx;struct device_link *link;struct device *larbdev;
@@ -484,7 +479,7 @@ static struct iommu_device *mtk_iommu_probe_device(struct device *dev) "#iommu-cells", idx, &iommu_spec)) { - err =mtk_iommu_create_mapping (dev, &iommu_spec); + err =mtk_iommu_v1_create_mapping (dev, &iommu_spec);of_node_put (iommu_spec.np);if (err)return ERR_PTR (err);
@@ -494,7 +489,7 @@ static struct iommu_device *mtk_iommu_probe_device(struct device *dev) idx++; } -if (!fwspec || fwspec->ops != &mtk_iommu_ops) +if (!fwspec || fwspec->ops != &mtk_iommu_v1_ops)return ERR_PTR (-ENODEV );/* Not a iommu client device */ data =dev_iommu_priv_get (dev);
@@ -519,10 +514,10 @@ static struct iommu_device *mtk_iommu_probe_device(struct device *dev)return &data->iommu; } -static void mtk_iommu_probe_finalize (struct device *dev) +static void mtk_iommu_v1_probe_finalize (struct device *dev) {struct dma_iommu_mapping *mtk_mapping; -struct mtk_iommu_data *data; +struct mtk_iommu_v1_data *data;int err; data =dev_iommu_priv_get (dev);
@@ -533,14 +528,14 @@ static void mtk_iommu_probe_finalize(struct device *dev)dev_err (dev,"Can't create IOMMU mapping - DMA-OPS will not work\n" ); } -static void mtk_iommu_release_device (struct device *dev) +static void mtk_iommu_v1_release_device (struct device *dev) {struct iommu_fwspec *fwspec =dev_iommu_fwspec_get (dev); -struct mtk_iommu_data *data; +struct mtk_iommu_v1_data *data;struct device *larbdev;unsigned int larbid; -if (!fwspec || fwspec->ops != &mtk_iommu_ops) +if (!fwspec || fwspec->ops != &mtk_iommu_v1_ops)return ; data =dev_iommu_priv_get (dev);
@@ -551,7 +546,7 @@ static void mtk_iommu_release_device(struct device *dev)iommu_fwspec_free (dev); } -static int mtk_iommu_hw_init (const struct mtk_iommu_data *data) +static int mtk_iommu_v1_hw_init (const struct mtk_iommu_v1_data *data) {u32 regval;int ret;
@@ -581,7 +576,7 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)writel_relaxed (F_MMU_DCM_ON , data->base +REG_MMU_DCM ); -if (devm_request_irq (data->dev, data->irq, mtk_iommu_isr,0 , +if (devm_request_irq (data->dev, data->irq, mtk_iommu_v1_isr,0 ,dev_name (data->dev), (void *)data)) {writel_relaxed (0 , data->base +REG_MMU_PT_BASE_ADDR );clk_disable_unprepare (data->bclk);
@@ -592,36 +587,36 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data)return 0 ; } -static const struct iommu_ops mtk_iommu_ops = { - .domain_alloc = mtk_iommu_domain_alloc, - .domain_free = mtk_iommu_domain_free, - .attach_dev = mtk_iommu_attach_device, - .detach_dev = mtk_iommu_detach_device, - .map = mtk_iommu_map, - .unmap = mtk_iommu_unmap, - .iova_to_phys = mtk_iommu_iova_to_phys, - .probe_device = mtk_iommu_probe_device, - .probe_finalize = mtk_iommu_probe_finalize, - .release_device = mtk_iommu_release_device, - .def_domain_type = mtk_iommu_def_domain_type, +static const struct iommu_ops mtk_iommu_v1_ops = { + .domain_alloc = mtk_iommu_v1_domain_alloc, + .domain_free = mtk_iommu_v1_domain_free, + .attach_dev = mtk_iommu_v1_attach_device, + .detach_dev = mtk_iommu_v1_detach_device, + .map = mtk_iommu_v1_map, + .unmap = mtk_iommu_v1_unmap, + .iova_to_phys = mtk_iommu_v1_iova_to_phys, + .probe_device = mtk_iommu_v1_probe_device, + .probe_finalize = mtk_iommu_v1_probe_finalize, + .release_device = mtk_iommu_v1_release_device, + .def_domain_type = mtk_iommu_v1_def_domain_type, .device_group = generic_device_group, .pgsize_bitmap = ~0UL <<MT2701_IOMMU_PAGE_SHIFT , .owner =THIS_MODULE , }; -static const struct of_device_id mtk_iommu_of_ids[] = { +static const struct of_device_id mtk_iommu_v1_of_ids[] = { { .compatible ="mediatek,mt2701-m4u" , }, {} }; -static const struct component_master_ops mtk_iommu_com_ops = { - .bind = mtk_iommu_bind, - .unbind = mtk_iommu_unbind, +static const struct component_master_ops mtk_iommu_v1_com_ops = { + .bind = mtk_iommu_v1_bind, + .unbind = mtk_iommu_v1_unbind, }; -static int mtk_iommu_probe (struct platform_device *pdev) +static int mtk_iommu_v1_probe (struct platform_device *pdev) { -struct mtk_iommu_data *data; +struct mtk_iommu_v1_data *data;struct device *dev = &pdev->dev;struct resource *res;struct component_match *match =NULL ;
@@ -689,7 +684,7 @@ static int mtk_iommu_probe(struct platform_device *pdev)platform_set_drvdata (pdev, data); - ret =mtk_iommu_hw_init (data); + ret =mtk_iommu_v1_hw_init (data);if (ret)return ret;
@@ -698,17 +693,17 @@ static int mtk_iommu_probe(struct platform_device *pdev)if (ret)return ret; - ret =iommu_device_register (&data->iommu, &mtk_iommu_ops, dev); + ret =iommu_device_register (&data->iommu, &mtk_iommu_v1_ops, dev);if (ret) goto out_sysfs_remove;if (!iommu_present (&platform_bus_type)) { - ret =bus_set_iommu (&platform_bus_type, &mtk_iommu_ops); + ret =bus_set_iommu (&platform_bus_type, &mtk_iommu_v1_ops);if (ret) goto out_dev_unreg; } - ret =component_master_add_with_match (dev, &mtk_iommu_com_ops, match); + ret =component_master_add_with_match (dev, &mtk_iommu_v1_com_ops, match);if (ret) goto out_bus_set_null;return ret;
@@ -722,9 +717,9 @@ static int mtk_iommu_probe(struct platform_device *pdev)return ret; } -static int mtk_iommu_remove (struct platform_device *pdev) +static int mtk_iommu_v1_remove (struct platform_device *pdev) { -struct mtk_iommu_data *data =platform_get_drvdata (pdev); +struct mtk_iommu_v1_data *data =platform_get_drvdata (pdev);iommu_device_sysfs_remove (&data->iommu);iommu_device_unregister (&data->iommu);
@@ -734,14 +729,14 @@ static int mtk_iommu_remove(struct platform_device *pdev)clk_disable_unprepare (data->bclk);devm_free_irq (&pdev->dev, data->irq, data); -component_master_del (&pdev->dev, &mtk_iommu_com_ops); +component_master_del (&pdev->dev, &mtk_iommu_v1_com_ops);return 0 ; } -static int __maybe_unused mtk_iommu_suspend (struct device *dev) +static int __maybe_unused mtk_iommu_v1_suspend (struct device *dev) { -struct mtk_iommu_data *data =dev_get_drvdata (dev); -struct mtk_iommu_suspend_reg *reg = &data->reg; +struct mtk_iommu_v1_data *data =dev_get_drvdata (dev); +struct mtk_iommu_v1_suspend_reg *reg = &data->reg;void __iomem *base = data->base; reg->standard_axi_mode = readl_relaxed(base +
@@ -752,10 +747,10 @@ static int __maybe_unused mtk_iommu_suspend(struct device *dev)return 0 ; } -static int __maybe_unused mtk_iommu_resume (struct device *dev) +static int __maybe_unused mtk_iommu_v1_resume (struct device *dev) { -struct mtk_iommu_data *data =dev_get_drvdata (dev); -struct mtk_iommu_suspend_reg *reg = &data->reg; +struct mtk_iommu_v1_data *data =dev_get_drvdata (dev); +struct mtk_iommu_v1_suspend_reg *reg = &data->reg;void __iomem *base = data->base;writel_relaxed (data->m4u_dom->pgt_pa, base +REG_MMU_PT_BASE_ADDR );
@@ -768,20 +763,20 @@ static int __maybe_unused mtk_iommu_resume(struct device *dev)return 0 ; } -static const struct dev_pm_ops mtk_iommu_pm_ops = { -SET_SYSTEM_SLEEP_PM_OPS (mtk_iommu_suspend, mtk_iommu_resume) +static const struct dev_pm_ops mtk_iommu_v1_pm_ops = { +SET_SYSTEM_SLEEP_PM_OPS (mtk_iommu_v1_suspend, mtk_iommu_v1_resume) }; -static struct platform_driver mtk_iommu_driver = { - .probe = mtk_iommu_probe, - .remove = mtk_iommu_remove, +static struct platform_driver mtk_iommu_v1_driver = { + .probe = mtk_iommu_v1_probe, + .remove = mtk_iommu_v1_remove, .driver = { .name ="mtk-iommu-v1" , - .of_match_table = mtk_iommu_of_ids, - .pm = &mtk_iommu_pm_ops, + .of_match_table = mtk_iommu_v1_of_ids, + .pm = &mtk_iommu_v1_pm_ops, } }; -module_platform_driver (mtk_iommu_driver); +module_platform_driver (mtk_iommu_v1_driver);MODULE_DESCRIPTION ("IOMMU API for MediaTek M4U v1 implementations" );MODULE_LICENSE ("GPL v2" );
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v5 27/34] iommu/mediatek-v1: Just rename mtk_iommu to mtk_iommu_v1
Il 17/02/22 12:34, Yong Wu ha scritto:
Quoted 4 lines
No functional change. Just rename this for readable. Differentiate this from
mtk_iommu.cSigned-off-by Yong Wu <[email protected]>
Quoted 4 lines
--- drivers/iommu/mtk_iommu_v1.c | 211 +++++++++++++++++------------------ 1 file changed, 103 insertions(+), 108 deletions(-)
Yong Wu
maintainerPATCH v5 28/34 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/tlb-range ops, and each a bank has its special iommu-domain(independent pgtable), thus, also move the domain information 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 | 179 +++++++++++++++++++++++++------------- 1 file changed, 117 insertions(+), 62 deletions(-)
drivers/iommu/mtk_iommu.c +117 -62
@@ -151,6 +151,7 @@#define MTK_LARB_SUBCOM_MAX 8#define MTK_IOMMU_GROUP_MAX 8 +#define MTK_IOMMU_BANK_MAX 5enum mtk_iommu_plat {M4U_MT2712 ,
@@ -187,25 +188,36 @@ struct mtk_iommu_plat_data {struct list_head *hw_list;unsigned int iova_region_nr;const struct mtk_iommu_iova_region *iova_region; + +u8 banks_num; +bool banks_enable[MTK_IOMMU_BANK_MAX ];unsigned char larbid_remap[MTK_LARB_COM_MAX ][MTK_LARB_SUBCOM_MAX ]; }; -struct mtk_iommu_data { +struct mtk_iommu_bank_data {void __iomem *base;int irq; +u8 id; +struct device *parent_dev; +struct mtk_iommu_data *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 {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;struct device *smicomm_dev; +struct mtk_iommu_bank_data *bank; +struct dma_iommu_mapping *mapping;/* For mtk_iommu_v1.c */ struct regmap *pericfg;
@@ -225,7 +237,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;struct mutex mutex;/* Protect "data" in this structure */
@@ -322,20 +334,24 @@ static struct mtk_iommu_domain *to_mtk_domain(struct iommu_domain *dom)static void mtk_iommu_tlb_flush_all (struct mtk_iommu_data *data) { -void __iomem *base = data->base; +/* Tlb flush all always is in bank0. */ +struct mtk_iommu_bank_data *bank = &data->bank[0 ]; +void __iomem *base = bank->base;unsigned long flags; -spin_lock_irqsave (&data->tlb_lock, flags); +spin_lock_irqsave (&bank->tlb_lock, flags);writel_relaxed (F_INVLD_EN1 |F_INVLD_EN0 , base + data->plat_data->inv_sel_reg);writel_relaxed (F_ALL_INVLD , base +REG_MMU_INVALIDATE );wmb ();/* Make sure the tlb flush all done */ -spin_unlock_irqrestore (&data->tlb_lock, flags); +spin_unlock_irqrestore (&bank->tlb_lock, flags); }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; +struct list_head *head = bank->parent_data->hw_list; +struct mtk_iommu_bank_data *curbank; +struct mtk_iommu_data *data;bool check_pm_status;unsigned long flags;void __iomem *base;
@@ -365,9 +381,10 @@ static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size,continue ; } - 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);
@@ -382,7 +399,7 @@ static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size,/* 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 (ret) { dev_warn(data->dev,
@@ -397,12 +414,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->parent_data; +struct mtk_iommu_domain *dom = bank->m4u_dom;unsigned int fault_larb =MTK_INVALID_LARBID , 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;
@@ -441,10 +459,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->parent_dev, fault_iova, write ?IOMMU_FAULT_WRITE :IOMMU_FAULT_READ )) {dev_err_ratelimited ( - data->dev, + bank->parent_dev,"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" );
@@ -541,12 +559,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; }
@@ -609,6 +629,8 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,struct mtk_iommu_domain *dom =to_mtk_domain (domain);struct list_head *hw_list = data->hw_list;struct device *m4udev = data->dev; +struct mtk_iommu_bank_data *bank; +unsigned int bankid =0 ;int ret, domid; domid =mtk_iommu_get_domain_id (dev, data->plat_data);
@@ -616,7 +638,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,return domid;mutex_lock (&dom->mutex); -if (!dom->data) { +if (!dom->bank) {/* Data is in the frstdata in sharing pgtable case. */ frstdata =mtk_iommu_get_frst_data (hw_list);
@@ -625,12 +647,13 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,mutex_unlock (&dom->mutex);return -ENODEV ; } - dom->data = data; + dom->bank = &data->bank[bankid]; }mutex_unlock (&dom->mutex);mutex_lock (&data->mutex); -if (!data->m4u_dom) {/* Initialize the M4U HW */ + bank = &data->bank[bankid]; +if (!bank->m4u_dom) {/* Initialize the M4U HW */ ret =pm_runtime_resume_and_get (m4udev);if (ret <0 ) goto err_unlock;
@@ -640,9 +663,9 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,pm_runtime_put (m4udev); goto err_unlock; } - 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); }
@@ -669,7 +692,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->parent_data->enable_4GB) paddr |=BIT_ULL (32 );/* Synchronize with the tlb_lock */
@@ -690,7 +713,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->parent_data); } static void mtk_iommu_iotlb_sync(struct iommu_domain *domain,
@@ -699,7 +722,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,
@@ -707,7 +730,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,
@@ -718,7 +741,7 @@ static phys_addr_t mtk_iommu_iova_to_phys(struct iommu_domain *domain, pa = dom->iop->iova_to_phys (dom->iop, iova);if (IS_ENABLED (CONFIG_PHYS_ADDR_T_64BIT ) && - dom->data->enable_4GB && + dom->bank->parent_data->enable_4GB && pa >=MTK_IOMMU_4GB_MODE_REMAP_BASE ) pa &= ~BIT_ULL (32 );
@@ -885,16 +908,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 )) {
@@ -903,31 +927,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 |
@@ -935,7 +959,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 |
@@ -944,19 +968,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->parent_dev, bank0->irq, mtk_iommu_isr,0 , +dev_name (bank0->parent_dev), (void *)bank0)) { +writel_relaxed (0 , bank0->base +REG_MMU_PT_BASE_ADDR ); +dev_err (bank0->parent_dev,"Failed @ IRQ-%d Request\n" , bank0->irq);return -ENODEV ; }
@@ -1048,9 +1072,11 @@ static int mtk_iommu_probe(struct platform_device *pdev)struct component_match *match =NULL ;struct regmap *infracfg;void *protect; -int ret; +int ret, banks_num;u32 val;char *p; +struct mtk_iommu_bank_data *bank; +void __iomem *base; data =devm_kzalloc (dev,sizeof (*data),GFP_KERNEL );if (!data)
@@ -1088,14 +1114,26 @@ 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; + banks_num = data->plat_data->banks_num; + data->bank =devm_kmalloc (dev, banks_num *sizeof (*data->bank),GFP_KERNEL ); +if (!data->bank) +return -ENOMEM ; + + bank = &data->bank[0 ]; + bank->id =0 ; + bank->base = base; + bank->m4u_dom =NULL ; + bank->irq =platform_get_irq (pdev,0 ); +if (bank->irq <0 ) +return bank->irq; + bank->parent_dev = dev; + bank->parent_data = data; +spin_lock_init (&bank->tlb_lock);if (MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_BCLK )) { data->bclk =devm_clk_get (dev,"bclk" );
@@ -1132,8 +1170,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;
@@ -1183,6 +1219,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);
@@ -1199,7 +1236,7 @@ static int mtk_iommu_remove(struct platform_device *pdev)#endif }pm_runtime_disable (&pdev->dev); -devm_free_irq (&pdev->dev, data->irq, data); +devm_free_irq (&pdev->dev, bank->irq, bank);return 0 ; }
@@ -1207,7 +1244,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 );
@@ -1225,8 +1262,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);
@@ -1274,6 +1311,8 @@ static const struct mtk_iommu_plat_data mt2712_data = { .hw_list = &m4ulist, .inv_sel_reg = REG_MMU_INV_SEL_GEN1, .iova_region = single_domain, + .banks_num = 1, + .banks_enable = {true}, .iova_region_nr = ARRAY_SIZE(single_domain), .larbid_remap = {{0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}}, };
@@ -1283,6 +1322,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, + .banks_num = 1, + .banks_enable = {true}, .iova_region = single_domain, .iova_region_nr = ARRAY_SIZE(single_domain), .larbid_remap = {{0}, {1}, {2}, {3}, {5}, {7, 8}, {10}, {9}},
@@ -1293,6 +1334,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, + .banks_num = 1, + .banks_enable = {true}, .iova_region = single_domain, .iova_region_nr = ARRAY_SIZE(single_domain), .larbid_remap = {{0}, {1}, {2}}, /* Linear mapping. */
@@ -1304,6 +1347,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, + .banks_num = 1, + .banks_enable = {true}, .iova_region = single_domain, .iova_region_nr = ARRAY_SIZE(single_domain), .larbid_remap = {{0}, {1}, {2}, {3}, {4}, {5}}, /* Linear mapping. */
@@ -1313,6 +1358,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, + .banks_num = 1, + .banks_enable = {true}, .iova_region = single_domain, .iova_region_nr = ARRAY_SIZE(single_domain), .larbid_remap = {{0}, {4}, {5}, {6}, {7}, {2}, {3}, {1}},
@@ -1324,6 +1371,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, + .banks_num = 1, + .banks_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},
@@ -1336,6 +1385,8 @@ static const struct mtk_iommu_plat_data mt8195_data_infra = { MTK_IOMMU_TYPE_INFRA | IFA_IOMMU_PCIE_SUPPORT, .pericfg_comp_str = "mediatek,mt8195-pericfg_ao", .inv_sel_reg = REG_MMU_INV_SEL_GEN2, + .banks_num = 1, + .banks_enable = {true}, .iova_region = single_domain, .iova_region_nr = ARRAY_SIZE(single_domain), };
@@ -1347,6 +1398,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, + .banks_num = 1, + .banks_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},
@@ -1360,6 +1413,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, + .banks_num = 1, + .banks_enable = {true}, .iova_region = mt8192_multi_dom, .iova_region_nr = ARRAY_SIZE(mt8192_multi_dom), .larbid_remap = {{1}, {3},
Signature · 1 line
2.18.0
Yong Wu
maintainerPATCH v5 29/34 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 | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-)
drivers/iommu/mtk_iommu.c +20 -12
@@ -270,7 +270,7 @@ static void mtk_iommu_unbind(struct device *dev)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; \
@@ -653,12 +653,14 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,mutex_lock (&data->mutex); bank = &data->bank[bankid]; -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 ) +if (ret <0 ) { +dev_err (m4udev,"pm get fail(%d) in attach.\n" , ret); goto err_unlock; + } - ret =mtk_iommu_hw_init (data); + ret =mtk_iommu_hw_init (data, bankid);if (ret) {pm_runtime_put (m4udev); goto err_unlock;
@@ -906,11 +908,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 ;
@@ -953,13 +960,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 |
@@ -968,19 +976,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->parent_dev, bank0->irq, mtk_iommu_isr,0 , -dev_name (bank0->parent_dev), (void *)bank0)) { -writel_relaxed (0 , bank0->base +REG_MMU_PT_BASE_ADDR ); -dev_err (bank0->parent_dev,"Failed @ IRQ-%d Request\n" , bank0->irq); +if (devm_request_irq (bankx->parent_dev, bankx->irq, mtk_iommu_isr,0 , +dev_name (bankx->parent_dev), (void *)bankx)) { +writel_relaxed (0 , bankx->base +REG_MMU_PT_BASE_ADDR ); +dev_err (bankx->parent_dev,"Failed @ IRQ-%d Request\n" , bankx->irq);return -ENODEV ; }
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v5 30/34 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. Use "iova_region_id" instead of "domain_id".
--- drivers/iommu/mtk_iommu.c | 46 +++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 23 deletions(-)
drivers/iommu/mtk_iommu.c +23 -23
@@ -478,8 +478,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;
@@ -509,7 +509,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;
@@ -525,12 +525,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);
@@ -556,7 +556,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;
@@ -595,7 +595,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;
@@ -631,18 +631,18 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,struct device *m4udev = data->dev;struct mtk_iommu_bank_data *bank;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;mutex_lock (&dom->mutex);if (!dom->bank) {/* Data is in the frstdata in sharing pgtable case. */ frstdata =mtk_iommu_get_frst_data (hw_list); - ret =mtk_iommu_domain_finalise (dom, frstdata, domid); + ret =mtk_iommu_domain_finalise (dom, frstdata, region_id);if (ret) {mutex_unlock (&dom->mutex);return -ENODEV ;
@@ -673,7 +673,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain, }mutex_unlock (&data->mutex); -return mtk_iommu_config (data, dev, true, domid); +return mtk_iommu_config (data, dev, true, region_id); err_unlock:mutex_unlock (&data->mutex);
@@ -813,22 +813,22 @@ 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);mutex_lock (&data->mutex); - 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); }
@@ -862,14 +862,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 · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v5 31/34 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 banks_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 banks_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 | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-)
drivers/iommu/mtk_iommu.c +36 -3
@@ -191,6 +191,7 @@ struct mtk_iommu_plat_data {u8 banks_num;bool banks_enable[MTK_IOMMU_BANK_MAX ]; +unsigned int banks_portmsk[MTK_IOMMU_BANK_MAX ];unsigned char larbid_remap[MTK_LARB_COM_MAX ][MTK_LARB_SUBCOM_MAX ]; };
@@ -478,6 +479,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 ; + +if (plat_data->banks_num ==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->banks_num && i <MTK_IOMMU_BANK_MAX ; i++) { +if (!plat_data->banks_enable[i]) +continue ; + +if (portmsk & plat_data->banks_portmsk[i]) { + bankid = i; +break ; + } + } +return bankid;/* default is 0 */ +} +static int mtk_iommu_get_iova_region_id (struct device *dev,const struct mtk_iommu_plat_data *plat_data) {
@@ -630,13 +655,14 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,struct list_head *hw_list = data->hw_list;struct device *m4udev = data->dev;struct mtk_iommu_bank_data *bank; -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);mutex_lock (&dom->mutex);if (!dom->bank) {/* Data is in the frstdata in sharing pgtable case. */
@@ -813,6 +839,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);
@@ -823,12 +850,18 @@ static struct iommu_group *mtk_iommu_device_group(struct device *dev)if (regionid <0 )return ERR_PTR (regionid); + bankid =mtk_iommu_get_bank_id (dev, data->plat_data);mutex_lock (&data->mutex); - 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); }
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v5 32/34 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 that bank.
--- drivers/iommu/mtk_iommu.c | 44 ++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 14 deletions(-)
drivers/iommu/mtk_iommu.c +30 -14
@@ -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
@@ -1113,7 +1114,7 @@ static int mtk_iommu_probe(struct platform_device *pdev)struct component_match *match =NULL ;struct regmap *infracfg;void *protect; -int ret, banks_num; +int ret, banks_num, i =0 ;u32 val;char *p;struct mtk_iommu_bank_data *bank;
@@ -1154,27 +1155,36 @@ static int mtk_iommu_probe(struct platform_device *pdev) data->enable_4GB = !!(val &F_DDR_4GB_SUPPORT_EN ); } + banks_num = data->plat_data->banks_num; res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (resource_size (res) < banks_num *MTK_IOMMU_BANK_SZ ) { +dev_err (dev,"banknr %d. res %pR is not enough.\n" , banks_num, res); +return -EINVAL ; + } base =devm_ioremap_resource (dev, res);if (IS_ERR (base))return PTR_ERR (base); ioaddr = res->start; - banks_num = data->plat_data->banks_num; data->bank =devm_kmalloc (dev, banks_num *sizeof (*data->bank),GFP_KERNEL );if (!data->bank)return -ENOMEM ; - bank = &data->bank[0 ]; - bank->id =0 ; - bank->base = base; - bank->m4u_dom =NULL ; - bank->irq =platform_get_irq (pdev,0 ); -if (bank->irq <0 ) -return bank->irq; - bank->parent_dev = dev; - bank->parent_data = data; -spin_lock_init (&bank->tlb_lock); +do { +if (!data->plat_data->banks_enable[i]) +continue ; + bank = &data->bank[i]; + bank->id = i; + bank->base = base + i *MTK_IOMMU_BANK_SZ ; + bank->m4u_dom =NULL ; + + bank->irq =platform_get_irq (pdev, i); +if (bank->irq <0 ) +return bank->irq; + bank->parent_dev = dev; + bank->parent_data = data; +spin_lock_init (&bank->tlb_lock); + }while (++i < banks_num);if (MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_BCLK )) { data->bclk =devm_clk_get (dev,"bclk" );
@@ -1260,7 +1270,8 @@ 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; +int i;iommu_device_sysfs_remove (&data->iommu);iommu_device_unregister (&data->iommu);
@@ -1277,7 +1288,12 @@ static int mtk_iommu_remove(struct platform_device *pdev)#endif }pm_runtime_disable (&pdev->dev); -devm_free_irq (&pdev->dev, bank->irq, bank); +for (i =0 ; i < data->plat_data->banks_num; i++) { + bank = &data->bank[i]; +if (!bank->m4u_dom) +continue ; +devm_free_irq (&pdev->dev, bank->irq, bank); + }return 0 ; }
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v5 32/34] iommu/mediatek: Initialise/Remove for multi bank dev
Il 17/02/22 12:34, Yong Wu ha scritto:
Quoted 10 lines
The 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 that bank.
Signed-off-by Yong Wu <[email protected]>
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v5 33/34 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 | 46 ++++++++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 15 deletions(-)
drivers/iommu/mtk_iommu.c +31 -15
@@ -173,11 +173,12 @@ struct mtk_iommu_suspend_reg {u32 misc_ctrl;u32 dcm_dis;u32 ctrl_reg; -u32 int_control0; -u32 int_main_control; -u32 ivrp_paddr;u32 vld_pa_rng;u32 wr_len_ctrl; + +u32 int_control[MTK_IOMMU_BANK_MAX ]; +u32 int_main_control[MTK_IOMMU_BANK_MAX ]; +u32 ivrp_paddr[MTK_IOMMU_BANK_MAX ]; };struct mtk_iommu_plat_data {
@@ -1301,16 +1302,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->banks_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->banks_num);clk_disable_unprepare (data->bclk);return 0 ; }
@@ -1319,9 +1327,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) {
@@ -1333,18 +1341,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->banks_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->banks_num);/* * Users may allocate dma buffer before they call pm_runtime_get,
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v5 34/34 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
@@ -1458,8 +1458,11 @@ static const struct mtk_iommu_plat_data mt8195_data_infra = { MTK_IOMMU_TYPE_INFRA | IFA_IOMMU_PCIE_SUPPORT, .pericfg_comp_str = "mediatek,mt8195-pericfg_ao", .inv_sel_reg = REG_MMU_INV_SEL_GEN2, - .banks_num = 1, - .banks_enable = {true}, + .banks_num = 5, + .banks_enable = {true, false, false, false, true}, + .banks_portmsk = {[0] = GENMASK(19, 16), /* PCIe */ + [4 ] =GENMASK (31 ,20 ),/* USB */ + }, .iova_region = single_domain, .iova_region_nr = ARRAY_SIZE(single_domain), };
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Joerg Roedel
maintainerHi Yong Wu,
Quoted 27 lines · Yong Wu
Yong Wu (34):
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: Addlist_delinmtk_iommu_removeiommu/mediatek: Removeclk_disableinmtk_iommu_removeiommu/mediatek: Add mutex form4u_groupandm4u_domin data iommu/mediatek: Add mutex for data in themtk_iommu_domainiommu/mediatek: Adapt sharing and non-sharing pgtable case iommu/mediatek: Add 12G~16G support for multi domains iommu/mediatek: Add a flagDCM_DISABLEiommu/mediatek: Add a flagNON_STD_AXIiommu/mediatek: Remove the granule in the tlb flush iommu/mediatek: Always enable output PA over 32bits in isr iommu/mediatek: AddSUB_COMMON_3BITSflag iommu/mediatek: AddIOMMU_TYPEflag iommu/mediatek: Contain MM IOMMU flow with the MM TYPE iommu/mediatek: Adjust device link when it is sub-common iommu/mediatek: AllowIOMMU_DOMAIN_UNMANAGEDfor PCIe VFIO iommu/mediatek: Add aPM_CLK_AOflag for infra iommu 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 inhw_initiommu/mediatek: Separatemtk_iommu_datafor v1 and v2 iommu/mediatek: Removemtk_iommu.h
Quoted 8 lines
iommu/mediatek-v1: Just rename
mtk_iommutomtk_iommu_v1iommu/mediatek: Addmtk_iommu_bank_datastructure iommu/mediatek: Initialise bank HW for each a bank iommu/mediatek: Change the domid toiova_region_idiommu/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
This doesn't apply cleanly, can you please send a version rebased to v5.17-rc4?
Thanks,
Joerg
AngeloGioacchino Del Regno
maintainerIl 28/02/22 13:34, Joerg Roedel ha scritto:
Quoted 39 lines
Hi Yong Wu,
Quoted 27 lines · Yong Wu
Yong Wu (34):
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: Addlist_delinmtk_iommu_removeiommu/mediatek: Removeclk_disableinmtk_iommu_removeiommu/mediatek: Add mutex form4u_groupandm4u_domin data iommu/mediatek: Add mutex for data in themtk_iommu_domainiommu/mediatek: Adapt sharing and non-sharing pgtable case iommu/mediatek: Add 12G~16G support for multi domains iommu/mediatek: Add a flagDCM_DISABLEiommu/mediatek: Add a flagNON_STD_AXIiommu/mediatek: Remove the granule in the tlb flush iommu/mediatek: Always enable output PA over 32bits in isr iommu/mediatek: AddSUB_COMMON_3BITSflag iommu/mediatek: AddIOMMU_TYPEflag iommu/mediatek: Contain MM IOMMU flow with the MM TYPE iommu/mediatek: Adjust device link when it is sub-common iommu/mediatek: AllowIOMMU_DOMAIN_UNMANAGEDfor PCIe VFIO iommu/mediatek: Add aPM_CLK_AOflag for infra iommu 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 inhw_initiommu/mediatek: Separatemtk_iommu_datafor v1 and v2 iommu/mediatek: Removemtk_iommu.hQuoted 8 lines
iommu/mediatek-v1: Just rename
mtk_iommutomtk_iommu_v1iommu/mediatek: Addmtk_iommu_bank_datastructure iommu/mediatek: Initialise bank HW for each a bank iommu/mediatek: Change the domid toiova_region_idiommu/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
Quoted 6 lines
This doesn't apply cleanly, can you please send a version rebased to v5.17-rc4?
Thanks,
Joerg
Hello Joerg,
this series depends on the following series:
https://patchwork.kernel.org/project/linux-mediatek/list/?series=592275
...which is also well tested and ready to be merged in.
Applying Yong's series without the mentioned series from Dafna would not work.
Thanks,
Angelo
Yong Wu
maintainerQuoted 43 lines · AngeloGioacchino Del Regno
Il 28/02/22 13:34, Joerg Roedel ha scritto:
Quoted 42 lines
Hi Yong Wu,
Quoted 27 lines · Yong Wu
Yong Wu (34):
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: Addlist_delinmtk_iommu_removeiommu/mediatek: Removeclk_disableinmtk_iommu_removeiommu/mediatek: Add mutex form4u_groupandm4u_domin data iommu/mediatek: Add mutex for data in themtk_iommu_domainiommu/mediatek: Adapt sharing and non-sharing pgtable case iommu/mediatek: Add 12G~16G support for multi domains iommu/mediatek: Add a flagDCM_DISABLEiommu/mediatek: Add a flagNON_STD_AXIiommu/mediatek: Remove the granule in the tlb flush iommu/mediatek: Always enable output PA over 32bits in isr iommu/mediatek: AddSUB_COMMON_3BITSflag iommu/mediatek: AddIOMMU_TYPEflag iommu/mediatek: Contain MM IOMMU flow with the MM TYPE iommu/mediatek: Adjust device link when it is sub-common iommu/mediatek: AllowIOMMU_DOMAIN_UNMANAGEDfor PCIe VFIO iommu/mediatek: Add aPM_CLK_AOflag for infra iommu 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 inhw_initiommu/mediatek: Separatemtk_iommu_datafor v1 and v2 iommu/mediatek: Removemtk_iommu.hQuoted 8 lines
iommu/mediatek-v1: Just rename
mtk_iommutomtk_iommu_v1iommu/mediatek: Addmtk_iommu_bank_datastructure iommu/mediatek: Initialise bank HW for each a bank iommu/mediatek: Change the domid toiova_region_idiommu/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 iommuThis doesn't apply cleanly, can you please send a version rebased to
v5.17-rc4?
As in the cover letter, this patchset doesn't base on v5.17-rc4, it bases on next-20220216 which has contained [1] and Dafna's patchset below.
By the way, It still conflicts with the latest next-20220228 which has just contained[2].
In this case, How should I do? Send a version base on the latest next?
[1]
https://lore.kernel.org/linux-iommu/[email protected]/
Thanks.
Quoted 9 lines
Quoted 4 lines
Thanks,
Joerg
Hello Joerg,
this series depends on the following series:
https://patchwork.kernel.org/project/linux-mediatek/list/?series=592275
Quoted 5 lines
...which is also well tested and ready to be merged in.
Applying Yong's series without the mentioned series from Dafna would not work.
Yes. Thanks.
Quoted 4 lines
Thanks,
Angelo
Joerg Roedel
maintainerQuoted 1 line · Yong Wu
https://patchwork.kernel.org/project/linux-mediatek/list/?series=592275
Okay, thanks for the clarification. So I can't include linux-next in my tree, so I think the best option is to wait until v5.18-rc1 (or rather -rc3, which is where I start merging new stuff) is out and merge it then.
Another option would be if there is a branch which only contains the dependencies of this patch-set, which I could pull into my tree, but it is already pretty late in the cycle.
So please re-send when the next -rc1 is out and I will pick it up then.
Regards,
Joerg
Yong Wu
maintainerQuoted 2 lines · Joerg Roedel
Quoted 1 line · Yong Wu
https://patchwork.kernel.org/project/linux-mediatek/list/?series=592275
Quoted 13 lines
Okay, thanks for the clarification. So I can't include linux-next in my
tree, so I think the best option is to wait until v5.18-rc1 (or rather
-rc3, which is where I start merging new stuff) is out and merge it then.
Another option would be if there is a branch which only contains the dependencies of this patch-set, which I could pull into my tree, but it
is already pretty late in the cycle.
So please re-send when the next -rc1 is out and I will pick it up then.
Thanks for this info. I will re-send this patchset after the next -rc1.
Could you help apply Dafna's patchset at this time? This patchset depends on it and it won't conflict with the others.
Thanks.
Quoted 4 lines
Regards,
Joerg
Joerg Roedel
maintainerQuoted 4 lines · Yong Wu
Thanks for this info. I will re-send this patchset after the next -rc1.
Could you help apply Dafna's patchset at this time? This patchset depends on it and it won't conflict with the others.
Alright, picked up Dafna's patch-set.
Regards,
Joerg
AngeloGioacchino Del Regno
maintainerIl 04/03/22 11:05, Joerg Roedel ha scritto:
Quoted 11 lines · Yong Wu
Quoted 4 lines
Thanks for this info. I will re-send this patchset after the next -rc1.
Could you help apply Dafna's patchset at this time? This patchset depends on it and it won't conflict with the others.
Alright, picked up Dafna's patch-set.
Regards,
Joerg
Thanks for picking Dafna's series right now, this was very appreciated.
Regards,
Angelo