MT8192 IOMMU support
Subsystems (8)
Yong Wu
maintainerv6 cover MT8192 IOMMU support
This patch mainly adds support for mt8192 Multimedia IOMMU and SMI.
mt8192 also is MTK IOMMU gen2 which uses ARM Short-Descriptor translation table format. The M4U-SMI HW diagram is as below:
EMI
|
M4U
|
------------
SMI Common
------------
|
+-------+------+------+----------------------+-------+
| | | | ...... | |
| | | | | |
larb0 larb1 larb2 larb4 ...... larb19 larb20
disp0 disp1 mdp vdec IPE IPEAll the connections are HW fixed, SW can NOT adjust it.
Comparing with the preview SoC, this patchset mainly adds two new functions:
a) add iova 34 bits support.
b) add multi domains support since several HW has the special iova region requirement.
change note:
v6:a) base on v5.11-rc1. and tlb v4:
https://lore.kernel.org/linux-mediatek/[email protected]/T/#t
b) Remove the "domain id" definition in the binding header file. Get the domain from dev->dma_range_map.
After this, Change many codes flow.
c) the patchset adds a new common file(mtk_smi-larb-port.h). This version changes that name into mtk-memory-port.h which reflect its file path. This only changes the file name. no other change. thus I keep all the Reviewed-by Tags.
(another reason is that we will add some iommu ports unrelated with
smi-larb)
d) Refactor the power-domain flow suggestted by Tomasz.
e) Some other small fix. use different oas for different soc; Change the macro for 34bit iova tlb flush.
v5: https://lore.kernel.org/linux-iommu/[email protected]/
a) Add a new patch for the header guard for smi-larb-port.h in [5/27].
b) Add a new patch for error handle for iommu_device_sysfs_add and
iommu_device_register[15/27].
c) Add a flag for the iova "ias == 34" case. the previous SoC still keep
32bits to save 16KB*3 lvl1 pgtable memory[13/27].
d) Add include <linux/bitfield.h> for FIELD_GET build fail.
e) In PM power domain patch, add a checking "pm_runtime_enabled" when call
pm_runtime_get_sync for non power-domain case. and add a pm_runtime_put_noidle while pm_runtime_get_sync fail case.
v4: https://lore.kernel.org/linux-iommu/[email protected]/
a) rebase on v5.10-rc1
b) Move the smi part to a independent patchset.
c) Improve v7s code from Robin and Will.
d) Add a mediatek iommu entry patch in MAINTAIN.
v3: https://lore.kernel.org/linux-iommu/[email protected]/
a) Fix DT schema issue commented from Rob.
b) Fix a v7s issue. Use "_lvl" instead of "_l" in the macro(ARM_V7S_PTES_PER_LVL) since it is called in ARM_V7S_LVL_IDX which has already used "_l".
c) Fix a PM suspend issue: Avoid pm suspend in pm runtime case.
v2: https://lore.kernel.org/linux-iommu/[email protected]/
a) Convert IOMMU/SMI dt-binding to DT schema.
b) Fix some comment from Pi-Hsun and Nicolas. like use generic_iommu_put_resv_regions.
c) Reword some comment, like add how to use domain-id.
v1: https://lore.kernel.org/linux-iommu/[email protected]/
Yong Wu (33):
dt-bindings: iommu: mediatek: Convert IOMMU to DT schema
dt-bindings: memory: mediatek: Add a common memory header file
dt-bindings: memory: mediatek: Extend LARB_NR_MAX to 32
dt-bindings: memory: mediatek: Rename header guard for SMI header file
dt-bindings: mediatek: Add binding for mt8192 IOMMU of/device: Move dma_range_map before of_iommu_configure
iommu: Avoid reallocate default domain for a group iommu/mediatek: Use the common mtk-memory-port.h iommu/io-pgtable-arm-v7s: Use ias to check the valid iova in unmap iommu/io-pgtable-arm-v7s: Extend PA34 for MediaTek iommu/io-pgtable-arm-v7s: Clarify LVL_SHIFT/BITS macro iommu/io-pgtable-arm-v7s: Add cfg as a param in some macros iommu/io-pgtable-arm-v7s: Quad lvl1 pgtable for MediaTek iommu/mediatek: Add a flag for iova 34bits case iommu/mediatek: Update oas for v7s
iommu/mediatek: Move hw_init into attach_device iommu/mediatek: Add error handle for mtk_iommu_probe iommu/mediatek: Add device link for smi-common and m4u iommu/mediatek: Add pm runtime callback
iommu/mediatek: Add power-domain operation
iommu/mediatek: Support up to 34bit iova in tlb flush iommu/mediatek: Support report iova 34bit translation fault in ISR iommu/mediatek: Adjust the structure
iommu/mediatek: Move domain_finalise into attach_device iommu/mediatek: Move geometry.aperture updating into domain_finalise iommu/mediatek: Add iova_region structure
iommu/mediatek: Add get_domain_id from dev->dma_range_map iommu/mediatek: Support for multi domains
iommu/mediatek: Add iova reserved function
iommu/mediatek: Support master use iova over 32bit iommu/mediatek: Remove unnecessary check in attach_device iommu/mediatek: Add mt8192 support
MAINTAINERS: Add entry for MediaTek IOMMU
.../bindings/iommu/mediatek,iommu.txt | 105 ----- .../bindings/iommu/mediatek,iommu.yaml | 183 +++++++++ MAINTAINERS | 9 + drivers/iommu/io-pgtable-arm-v7s.c | 56 +-- drivers/iommu/iommu.c | 3 +- drivers/iommu/mtk_iommu.c | 366 ++++++++++++++---- drivers/iommu/mtk_iommu.h | 12 +- drivers/memory/mtk-smi.c | 8 + drivers/of/device.c | 3 +- include/dt-bindings/memory/mt2701-larb-port.h | 4 +- include/dt-bindings/memory/mt2712-larb-port.h | 6 +- include/dt-bindings/memory/mt6779-larb-port.h | 6 +- include/dt-bindings/memory/mt8167-larb-port.h | 6 +- include/dt-bindings/memory/mt8173-larb-port.h | 6 +- include/dt-bindings/memory/mt8183-larb-port.h | 6 +- include/dt-bindings/memory/mt8192-larb-port.h | 243 ++++++++++++ include/dt-bindings/memory/mtk-memory-port.h | 15 + include/linux/io-pgtable.h | 4 +- include/soc/mediatek/smi.h | 3 +- 19 files changed, 810 insertions(+), 234 deletions(-) delete mode 100644 Documentation/devicetree/bindings/iommu/mediatek,iommu.txt create mode 100644 Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml create mode 100644 include/dt-bindings/memory/mt8192-larb-port.h create mode 100644 include/dt-bindings/memory/mtk-memory-port.h
Signature · 7 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v6 1/33 dt-bindings: iommu: mediatek: Convert IOMMU to DT schema
Convert MediaTek IOMMU to DT schema.
--- .../bindings/iommu/mediatek,iommu.txt | 105 ----------- .../bindings/iommu/mediatek,iommu.yaml | 167 ++++++++++++++++++ 2 files changed, 167 insertions(+), 105 deletions(-) delete mode 100644 Documentation/devicetree/bindings/iommu/mediatek,iommu.txt create mode 100644 Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml
Documentation/devicetree/bindings/iommu/mediatek,iommu.txt deleted +0 -105
@@ -1,105 +0,0 @@ -* Mediatek IOMMU Architecture Implementation - - Some Mediatek SOCs contain a Multimedia Memory Management Unit (M4U), and -this M4U have two generations of HW architecture. Generation one uses flat -pagetable, and only supports 4K size page mapping. Generation two uses the -ARM Short-Descriptor translation table format for address translation. - - About the M4U Hardware Block Diagram, please check below: - - EMI (External Memory Interface) - | - m4u (Multimedia Memory Management Unit) - | - +--------+ - | | - gals0-rx gals1-rx (Global Async Local Sync rx) - | | - | | - gals0-tx gals1-tx (Global Async Local Sync tx) - | | Some SoCs may have GALS. - +--------+ - | - SMI Common(Smart Multimedia Interface Common) - | - +----------------+------- - | | - | gals-rx There may be GALS in some larbs. - | | - | | - | gals-tx - | | - SMI larb0 SMI larb1 ... SoCs have several SMI local arbiter(larb). - (display) (vdec) - | | - | | - +-----+-----+ +----+----+ - | | | | | | - | | |... | | | ... There are different ports in each larb. - | | | | | | -OVL0 RDMA0 WDMA0 MC PP VLD - - As above, The Multimedia HW will go through SMI and M4U while it -access EMI. SMI is a bridge between m4u and the Multimedia HW. It contain -smi local arbiter and smi common. It will control whether the Multimedia -HW should go though the m4u for translation or bypass it and talk -directly with EMI. And also SMI help control the power domain and clocks for -each local arbiter. - Normally we specify a local arbiter(larb) for each multimedia HW -like display, video decode, and camera. And there are different ports -in each larb. Take a example, There are many ports like MC, PP, VLD in the -video decode local arbiter, all these ports are according to the video HW. - In some SoCs, there may be a GALS(Global Async Local Sync) module between -smi-common and m4u, and additional GALS module between smi-larb and -smi-common. GALS can been seen as a "asynchronous fifo" which could help -synchronize for the modules in different clock frequency. - -Required properties: -- compatible : must be one of the following string: - "mediatek,mt2701-m4u" for mt2701 which uses generation one m4u HW. - "mediatek,mt2712-m4u" for mt2712 which uses generation two m4u HW. - "mediatek,mt6779-m4u" for mt6779 which uses generation two m4u HW. - "mediatek,mt7623-m4u", "mediatek,mt2701-m4u" for mt7623 which uses - generation one m4u HW. - "mediatek,mt8167-m4u" for mt8167 which uses generation two m4u HW. - "mediatek,mt8173-m4u" for mt8173 which uses generation two m4u HW. - "mediatek,mt8183-m4u" for mt8183 which uses generation two m4u HW. -- reg : m4u register base and size. -- interrupts : the interrupt of m4u. -- clocks : must contain one entry for each clock-names. -- clock-names : Only 1 optional clock: - - "bclk": the block clock of m4u. - Here is the list which require this "bclk": - - mt2701, mt2712, mt7623 and mt8173. - Note that m4u use the EMI clock which always has been enabled before kernel - if there is no this "bclk". -- mediatek,larbs : List of phandle to the local arbiters in the current Socs. - Refer to bindings/memory-controllers/mediatek,smi-larb.txt. It must sort - according to the local arbiter index, like larb0, larb1, larb2... -- iommu-cells : must be 1. This is the mtk_m4u_id according to the HW. - Specifies the mtk_m4u_id as defined in - dt-binding/memory/mt2701-larb-port.h for mt2701, mt7623 - dt-binding/memory/mt2712-larb-port.h for mt2712, - dt-binding/memory/mt6779-larb-port.h for mt6779, - dt-binding/memory/mt8167-larb-port.h for mt8167, - dt-binding/memory/mt8173-larb-port.h for mt8173, and - dt-binding/memory/mt8183-larb-port.h for mt8183. - -Example: - iommu: iommu@10205000 { - compatible = "mediatek,mt8173-m4u"; - reg = <0 0x10205000 0 0x1000>; - interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_LOW>; - clocks = <&infracfg CLK_INFRA_M4U>; - clock-names = "bclk"; - mediatek,larbs = <&larb0 &larb1 &larb2 &larb3 &larb4 &larb5>; - #iommu-cells = <1>; - }; - -Example for a client device: - display { - compatible = "mediatek,mt8173-disp"; - iommus = <&iommu M4U_PORT_DISP_OVL0>, - <&iommu M4U_PORT_DISP_RDMA0>; - ... - };
Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml new file +167 -0
167 lines not on this page · raw message
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v6 2/33 dt-bindings: memory: mediatek: Add a common memory header file
In reply to Yong WuPut all the macros about smi larb/port togethers.
--- include/dt-bindings/memory/mt2712-larb-port.h | 2 +- include/dt-bindings/memory/mt6779-larb-port.h | 2 +- include/dt-bindings/memory/mt8167-larb-port.h | 2 +- include/dt-bindings/memory/mt8173-larb-port.h | 2 +- include/dt-bindings/memory/mt8183-larb-port.h | 2 +- include/dt-bindings/memory/mtk-memory-port.h | 15 +++++++++++++++ 6 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 include/dt-bindings/memory/mtk-memory-port.h
include/dt-bindings/memory/mt2712-larb-port.h +1 -1
@@ -6,7 +6,7 @@#ifndef __DTS_IOMMU_PORT_MT2712_H#define __DTS_IOMMU_PORT_MT2712_H -#define MTK_M4U_ID (larb, port) (((larb) << 5) | (port)) +#include <dt-bindings/memory/mtk-memory-port.h> #define M4U_LARB0_ID 0#define M4U_LARB1_ID 1
include/dt-bindings/memory/mt6779-larb-port.h +1 -1
@@ -7,7 +7,7 @@#ifndef _DTS_IOMMU_PORT_MT6779_H_#define _DTS_IOMMU_PORT_MT6779_H_ -#define MTK_M4U_ID (larb, port) (((larb) << 5) | (port)) +#include <dt-bindings/memory/mtk-memory-port.h> #define M4U_LARB0_ID 0#define M4U_LARB1_ID 1
include/dt-bindings/memory/mt8167-larb-port.h +1 -1
@@ -8,7 +8,7 @@#ifndef __DTS_IOMMU_PORT_MT8167_H#define __DTS_IOMMU_PORT_MT8167_H -#define MTK_M4U_ID (larb, port) (((larb) << 5) | (port)) +#include <dt-bindings/memory/mtk-memory-port.h> #define M4U_LARB0_ID 0#define M4U_LARB1_ID 1
include/dt-bindings/memory/mt8173-larb-port.h +1 -1
@@ -6,7 +6,7 @@#ifndef __DTS_IOMMU_PORT_MT8173_H#define __DTS_IOMMU_PORT_MT8173_H -#define MTK_M4U_ID (larb, port) (((larb) << 5) | (port)) +#include <dt-bindings/memory/mtk-memory-port.h> #define M4U_LARB0_ID 0#define M4U_LARB1_ID 1
include/dt-bindings/memory/mt8183-larb-port.h +1 -1
@@ -6,7 +6,7 @@#ifndef __DTS_IOMMU_PORT_MT8183_H#define __DTS_IOMMU_PORT_MT8183_H -#define MTK_M4U_ID (larb, port) (((larb) << 5) | (port)) +#include <dt-bindings/memory/mtk-memory-port.h> #define M4U_LARB0_ID 0#define M4U_LARB1_ID 1
include/dt-bindings/memory/mtk-memory-port.h new file +15 -0
@@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (c) 2020 MediaTek Inc. +* Author: Yong Wu <[email protected]> +*/ +#ifndef __DT_BINDINGS_MEMORY_MTK_MEMORY_PORT_H_ +#define __DT_BINDINGS_MEMORY_MTK_MEMORY_PORT_H_ + +#define MTK_LARB_NR_MAX 16 + +#define MTK_M4U_ID (larb, port) (((larb) << 5) | (port)) +#define MTK_M4U_TO_LARB (id) (((id) >> 5) & 0xf) +#define MTK_M4U_TO_PORT (id) ((id) & 0x1f) + +#endif
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v6 3/33 dt-bindings: memory: mediatek: Extend LARB_NR_MAX to 32
In reply to Yong WuExtend the max larb number definition as mt8192 has larb_nr over 16.
--- Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml | 2 +- include/dt-bindings/memory/mtk-memory-port.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml +1 -1
@@ -99,7 +99,7 @@ properties: mediatek,larbs: $ref: /schemas/types.yaml#/definitions/phandle-array minItems: 1 - maxItems: 16 + maxItems: 32 description: | List of phandle to the local arbiters in the current Socs. Refer to bindings/memory-controllers/mediatek,smi-larb.yaml. It must sort
include/dt-bindings/memory/mtk-memory-port.h +2 -2
@@ -6,10 +6,10 @@#ifndef __DT_BINDINGS_MEMORY_MTK_MEMORY_PORT_H_#define __DT_BINDINGS_MEMORY_MTK_MEMORY_PORT_H_ -#define MTK_LARB_NR_MAX 16 +#define MTK_LARB_NR_MAX 32#define MTK_M4U_ID (larb, port) (((larb) << 5) | (port)) -#define MTK_M4U_TO_LARB (id) (((id) >> 5) & 0xf) +#define MTK_M4U_TO_LARB (id) (((id) >> 5) & 0x1f)#define MTK_M4U_TO_PORT (id) ((id) & 0x1f)#endif
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v6 4/33 dt-bindings: memory: mediatek: Rename header guard for SMI header file
In reply to Yong WuOnly rename the header guard for all the SoC larb port header file. No funtional change.
--- include/dt-bindings/memory/mt2701-larb-port.h | 4 ++-- include/dt-bindings/memory/mt2712-larb-port.h | 4 ++-- include/dt-bindings/memory/mt6779-larb-port.h | 4 ++-- include/dt-bindings/memory/mt8167-larb-port.h | 4 ++-- include/dt-bindings/memory/mt8173-larb-port.h | 4 ++-- include/dt-bindings/memory/mt8183-larb-port.h | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-)
include/dt-bindings/memory/mt2701-larb-port.h +2 -2
@@ -4,8 +4,8 @@* Author: Honghui Zhang <[email protected]> */ -#ifndef _MT2701_LARB_PORT_H_ -#define _MT2701_LARB_PORT_H_ +#ifndef _DT_BINDINGS_MEMORY_MT2701_LARB_PORT_H_ +#define _DT_BINDINGS_MEMORY_MT2701_LARB_PORT_H_/* * Mediatek m4u generation 1 such as mt2701 has flat m4u port numbers,
include/dt-bindings/memory/mt2712-larb-port.h +2 -2
@@ -3,8 +3,8 @@* Copyright (c) 2017 MediaTek Inc. * Author: Yong Wu <[email protected]> */ -#ifndef __DTS_IOMMU_PORT_MT2712_H -#define __DTS_IOMMU_PORT_MT2712_H +#ifndef _DT_BINDINGS_MEMORY_MT2712_LARB_PORT_H_ +#define _DT_BINDINGS_MEMORY_MT2712_LARB_PORT_H_#include <dt-bindings/memory/mtk-memory-port.h>
include/dt-bindings/memory/mt6779-larb-port.h +2 -2
@@ -4,8 +4,8 @@* Author: Chao Hao <[email protected]> */ -#ifndef _DTS_IOMMU_PORT_MT6779_H_ -#define _DTS_IOMMU_PORT_MT6779_H_ +#ifndef _DT_BINDINGS_MEMORY_MT6779_LARB_PORT_H_ +#define _DT_BINDINGS_MEMORY_MT6779_LARB_PORT_H_#include <dt-bindings/memory/mtk-memory-port.h>
include/dt-bindings/memory/mt8167-larb-port.h +2 -2
@@ -5,8 +5,8 @@* Author: Honghui Zhang <[email protected]> * Author: Fabien Parent <[email protected]> */ -#ifndef __DTS_IOMMU_PORT_MT8167_H -#define __DTS_IOMMU_PORT_MT8167_H +#ifndef _DT_BINDINGS_MEMORY_MT8167_LARB_PORT_H_ +#define _DT_BINDINGS_MEMORY_MT8167_LARB_PORT_H_#include <dt-bindings/memory/mtk-memory-port.h>
include/dt-bindings/memory/mt8173-larb-port.h +2 -2
@@ -3,8 +3,8 @@* Copyright (c) 2015-2016 MediaTek Inc. * Author: Yong Wu <[email protected]> */ -#ifndef __DTS_IOMMU_PORT_MT8173_H -#define __DTS_IOMMU_PORT_MT8173_H +#ifndef _DT_BINDINGS_MEMORY_MT8173_LARB_PORT_H_ +#define _DT_BINDINGS_MEMORY_MT8173_LARB_PORT_H_#include <dt-bindings/memory/mtk-memory-port.h>
include/dt-bindings/memory/mt8183-larb-port.h +2 -2
@@ -3,8 +3,8 @@* Copyright (c) 2018 MediaTek Inc. * Author: Yong Wu <[email protected]> */ -#ifndef __DTS_IOMMU_PORT_MT8183_H -#define __DTS_IOMMU_PORT_MT8183_H +#ifndef _DT_BINDINGS_MEMORY_MT8183_LARB_PORT_H_ +#define _DT_BINDINGS_MEMORY_MT8183_LARB_PORT_H_#include <dt-bindings/memory/mtk-memory-port.h>
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v6 5/33 dt-bindings: mediatek: Add binding for mt8192 IOMMU
In reply to Yong WuThis patch adds decriptions for mt8192 IOMMU and SMI.
mt8192 also is MTK IOMMU gen2 which uses ARM Short-Descriptor translation table format. The M4U-SMI HW diagram is as below:
EMI
|
M4U
|
------------
SMI Common
------------
|
+-------+------+------+----------------------+-------+
| | | | ...... | |
| | | | | |
larb0 larb1 larb2 larb4 ...... larb19 larb20
disp0 disp1 mdp vdec IPE IPEAll the connections are HW fixed, SW can NOT adjust it.
mt8192 M4U support 0~16GB iova range. we preassign different engines into different iova ranges:
domain-id module iova-range larbs 0 disp 0 ~ 4G larb0/1 1 vcodec 4G ~ 8G larb4/5/7 2 cam/mdp 8G ~ 12G larb2/9/11/13/14/16/17/18/19/20 3 CCU0 0x4000_0000 ~ 0x43ff_ffff larb13: port 9/10 4 CCU1 0x4400_0000 ~ 0x47ff_ffff larb14: port 4/5
The iova range for CCU0/1(camera control unit) is HW requirement.
--- .../bindings/iommu/mediatek,iommu.yaml | 18 +- include/dt-bindings/memory/mt8192-larb-port.h | 243 ++++++++++++++++++ 2 files changed, 260 insertions(+), 1 deletion(-) create mode 100644 include/dt-bindings/memory/mt8192-larb-port.h
Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml +17 -1
@@ -76,6 +76,7 @@ properties: - mediatek,mt8167-m4u # generation two - mediatek,mt8173-m4u # generation two - mediatek,mt8183-m4u # generation two + - mediatek,mt8192-m4u # generation two - description: mt7623 generation one items:
@@ -115,7 +116,11 @@ properties: dt-binding/memory/mt6779-larb-port.h for mt6779, dt-binding/memory/mt8167-larb-port.h for mt8167, dt-binding/memory/mt8173-larb-port.h for mt8173, - dt-binding/memory/mt8183-larb-port.h for mt8183. + dt-binding/memory/mt8183-larb-port.h for mt8183, + dt-binding/memory/mt8192-larb-port.h for mt8192. + + power-domains: + maxItems: 1 required: - compatible
@@ -133,11 +138,22 @@ allOf: - mediatek,mt2701-m4u - mediatek,mt2712-m4u - mediatek,mt8173-m4u + - mediatek,mt8192-m4u then: required: - clocks + - if: + properties: + compatible: + enum: + - mediatek,mt8192-m4u + + then: + required: + - power-domains + additionalProperties: false examples:
include/dt-bindings/memory/mt8192-larb-port.h new file +243 -0
243 lines not on this page · raw message
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v6 6/33 of/device: Move dma_range_map before of_iommu_configure
In reply to Yong Wu"dev->dma_range_map" contains the devices' dma_ranges information, This patch moves dma_range_map before of_iommu_configure. The iommu driver may need to know the dma_address requirements of its iommu consumer devices.
--- drivers/of/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/of/device.c +2 -1
@@ -170,9 +170,11 @@ int of_dma_configure_id(struct device *dev, struct device_node *np,dev_dbg (dev,"device is%sdma coherent\n" , coherent ?" " :" not " ); + dev->dma_range_map = map; iommu =of_iommu_configure (dev, np, id);if (PTR_ERR (iommu) == -EPROBE_DEFER ) {kfree (map); + dev->dma_range_map =NULL ;return -EPROBE_DEFER ; }
@@ -181,7 +183,6 @@ int of_dma_configure_id(struct device *dev, struct device_node *np,arch_setup_dma_ops (dev, dma_start, size, iommu, coherent); - dev->dma_range_map = map;return 0 ; }EXPORT_SYMBOL_GPL (of_dma_configure_id);
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v6 06/33] of/device: Move dma_range_map before of_iommu_configure
Quoted 17 lines · Yong Wu
"
dev->dma_range_map" contains the devices'dma_rangesinformation, This patch movesdma_range_mapbeforeof_iommu_configure. The iommu driver may need to know thedma_addressrequirements of its iommu consumer devices.CC Rob Herring <[email protected]>CC Frank Rowand <[email protected]>Signed-off-by Yong Wu <[email protected]>--- drivers/of/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/of/device.c +0
-0
drivers/of/device.c int of_dma_configure_id(struct device *dev, struct device_node *np, · line 177
Quoted 8 lines
drivers/of/device.c +2
-0@@ -170,9 +170,11 @@ int of_dma_configure_id(struct device *dev, struct device_node *np,dev_dbg (dev,"device is%sdma coherent\n" , coherent ?" " :" not " ); + dev->dma_range_map = map; iommu =of_iommu_configure (dev, np, id);if (PTR_ERR (iommu) == -EPROBE_DEFER ) {kfree (map); + dev->dma_range_map =NULL ;
Not really going to matter, but you should probably clear dma_range_map before what it points to is freed.
With that,
Quoted 14 lines
drivers/of/device.c +0
-1return -EPROBE_DEFER ; }@@ -181,7 +183,6 @@ int of_dma_configure_id(struct device *dev, struct device_node *np,arch_setup_dma_ops (dev, dma_start, size, iommu, coherent); - dev->dma_range_map = map;return 0 ; }EXPORT_SYMBOL_GPL (of_dma_configure_id);Signature · 1 line
2.18.0
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerRe: [PATCH v6 06/33] of/device: Move dma_range_map before of_iommu_configure
Quoted 30 lines · Rob Herring
Quoted 17 lines · Yong Wu
"
dev->dma_range_map" contains the devices'dma_rangesinformation, This patch movesdma_range_mapbeforeof_iommu_configure. The iommu driver may need to know thedma_addressrequirements of its iommu consumer devices.CC Rob Herring <[email protected]>CC Frank Rowand <[email protected]>Signed-off-by Yong Wu <[email protected]>--- drivers/of/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/of/device.c +0
-0drivers/of/device.c int of_dma_configure_id(struct device *dev, struct device_node *np, · line 177
Quoted 8 lines
drivers/of/device.c +2
-0@@ -170,9 +170,11 @@ int of_dma_configure_id(struct device *dev, struct device_node *np,dev_dbg (dev,"device is%sdma coherent\n" , coherent ?" " :" not " ); + dev->dma_range_map = map; iommu =of_iommu_configure (dev, np, id);if (PTR_ERR (iommu) == -EPROBE_DEFER ) {kfree (map); + dev->dma_range_map =NULL ;Not really going to matter, but you should probably clear
dma_range_mapbefore what it points to is freed.
Quoted 3 lines
With that,
Reviewed-by Rob Herring <[email protected]>
Thanks for the review. I will move it before "kfree(map)" in next version.
Quoted 8 lines
Quoted 8 lines
drivers/of/device.c +0
-0return -EPROBE_DEFER ; }@@ -181,7 +183,6 @@ int of_dma_configure_id(struct device *dev, struct device_node *np,arch_setup_dma_ops (dev, dma_start, size, iommu, coherent);
Quoted 7 lines
Quoted 7 lines
drivers/of/device.c +0
-1- dev->dma_range_map = map;return 0 ; }EXPORT_SYMBOL_GPL (of_dma_configure_id);Signature · 1 line
2.18.0
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Robin Murphy
reviewerRe: [PATCH v6 06/33] of/device: Move dma_range_map before of_iommu_configure
Quoted 31 lines · Yong Wu
Quoted 30 lines · Rob Herring
Quoted 17 lines · Yong Wu
"
dev->dma_range_map" contains the devices'dma_rangesinformation, This patch movesdma_range_mapbeforeof_iommu_configure. The iommu driver may need to know thedma_addressrequirements of its iommu consumer devices.CC Rob Herring <[email protected]>CC Frank Rowand <[email protected]>Signed-off-by Yong Wu <[email protected]>--- drivers/of/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/of/device.c +0
-0drivers/of/device.c int of_dma_configure_id(struct device *dev, struct device_node *np, · line 177
Quoted 8 lines
drivers/of/device.c +2
-0@@ -170,9 +170,11 @@ int of_dma_configure_id(struct device *dev, struct device_node *np,dev_dbg (dev,"device is%sdma coherent\n" , coherent ?" " :" not " ); + dev->dma_range_map = map; iommu =of_iommu_configure (dev, np, id);if (PTR_ERR (iommu) == -EPROBE_DEFER ) {kfree (map); + dev->dma_range_map =NULL ;Not really going to matter, but you should probably clear
dma_range_mapbefore what it points to is freed.
Quoted 6 lines
Quoted 3 lines
With that,
Reviewed-by Rob Herring <[email protected]>Thanks for the review. I will move it before "kfree(map)" in next version.
Paul noticed that we already have a bug in assigning to this unconditionally[1] - I'd totally forgotten about this series when I theorised about IOMMU drivers wanting the information earlier, but sweeping my inbox now only goes to show I was right to think of it :)
We should really get something in as a fix independent of this series, taking both angles into account.
Robin.
[1] https://lore.kernel.org/linux-arm-kernel/[email protected]/
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/of/device.c +0
-0return -EPROBE_DEFER ; }@@ -181,7 +183,6 @@ int of_dma_configure_id(struct device *dev, struct device_node *np,arch_setup_dma_ops (dev, dma_start, size, iommu, coherent);
Quoted 13 lines
Quoted 7 lines
Quoted 7 lines
drivers/of/device.c +0
-1- dev->dma_range_map = map;return 0 ; }EXPORT_SYMBOL_GPL (of_dma_configure_id);Signature · 1 line
2.18.0_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v6 06/33] of/device: Move dma_range_map before of_iommu_configure
Hi,
Quoted 38 lines · Robin Murphy
Quoted 30 lines · Yong Wu
Quoted 29 lines · Rob Herring
Quoted 17 lines · Yong Wu
"
dev->dma_range_map" contains the devices'dma_rangesinformation, This patch movesdma_range_mapbeforeof_iommu_configure. The iommu driver may need to know thedma_addressrequirements of its iommu consumer devices.CC Rob Herring <[email protected]>CC Frank Rowand <[email protected]>Signed-off-by Yong Wu <[email protected]>--- drivers/of/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/of/device.c +0
-0drivers/of/device.c int of_dma_configure_id(struct device *dev, struct device_node *np, · line 176
Quoted 7 lines
drivers/of/device.c +2
-0@@ -170,9 +170,11 @@ int of_dma_configure_id(struct device *dev, struct device_node *np,dev_dbg (dev,"device is%sdma coherent\n" , coherent ?" " :" not " ); + dev->dma_range_map = map; iommu =of_iommu_configure (dev, np, id);if (PTR_ERR (iommu) == -EPROBE_DEFER ) {kfree (map); + dev->dma_range_map =NULL ;Not really going to matter, but you should probably clear
dma_range_mapbefore what it points to is freed.Quoted 6 lines
Quoted 3 lines
With that,
Reviewed-by Rob Herring <[email protected]>Thanks for the review. I will move it before "kfree(map)" in next version.
Quoted 7 lines
Paul noticed that we already have a bug in assigning to this unconditionally[1] - I'd totally forgotten about this series when I theorised about IOMMU drivers wanting the information earlier, but sweeping my inbox now only goes to show I was right to think of it :)
We should really get something in as a fix independent of this series, taking both angles into account.
Okay, I can also fix this while fixing my case. So we'd go for setting dev->dma_range_map = map; under the if (!ret).
Then I think the error case for of_iommu_configure should be to set dev->dma_range_map = NULL; only if map != NULL (otherwise we'd be overwriting and leaking the previously-set map).
I think a comment to remind that dev->dma_range_map can be set prior to this function would be useful too.
What do you think?
Cheers,
Paul
Quoted 22 lines
Robin.
[1] https://lore.kernel.org/linux-arm-kernel/[email protected]/
Quoted 18 lines
Quoted 12 lines
Quoted 12 lines
drivers/of/device.c +0
-1return -EPROBE_DEFER ; }@@ -181,7 +183,6 @@ int of_dma_configure_id(struct device *dev, struct device_node *np,arch_setup_dma_ops (dev, dma_start, size, iommu, coherent); - dev->dma_range_map = map;return 0 ; }EXPORT_SYMBOL_GPL (of_dma_configure_id);Signature · 1 line
2.18.0_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Signature · 3 lines
Paul Kocialkowski, Bootlin Embedded Linux and kernel engineering https://bootlin.com
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerRe: [PATCH v6 06/33] of/device: Move dma_range_map before of_iommu_configure
In reply to Robin MurphyQuoted 39 lines · Robin Murphy
Quoted 31 lines · Yong Wu
Quoted 30 lines · Rob Herring
Quoted 17 lines · Yong Wu
"
dev->dma_range_map" contains the devices'dma_rangesinformation, This patch movesdma_range_mapbeforeof_iommu_configure. The iommu driver may need to know thedma_addressrequirements of its iommu consumer devices.CC Rob Herring <[email protected]>CC Frank Rowand <[email protected]>Signed-off-by Yong Wu <[email protected]>--- drivers/of/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/of/device.c +0
-0drivers/of/device.c int of_dma_configure_id(struct device *dev, struct device_node *np, · line 177
Quoted 8 lines
drivers/of/device.c +2
-0@@ -170,9 +170,11 @@ int of_dma_configure_id(struct device *dev, struct device_node *np,dev_dbg (dev,"device is%sdma coherent\n" , coherent ?" " :" not " ); + dev->dma_range_map = map; iommu =of_iommu_configure (dev, np, id);if (PTR_ERR (iommu) == -EPROBE_DEFER ) {kfree (map); + dev->dma_range_map =NULL ;Not really going to matter, but you should probably clear
dma_range_mapbefore what it points to is freed.Quoted 6 lines
Quoted 3 lines
With that,
Reviewed-by Rob Herring <[email protected]>Thanks for the review. I will move it before "kfree(map)" in next version.
Quoted 7 lines
Paul noticed that we already have a bug in assigning to this unconditionally[1] - I'd totally forgotten about this series when I theorised about IOMMU drivers wanting the information earlier, but sweeping my inbox now only goes to show I was right to think of it :)
We should really get something in as a fix independent of this series, taking both angles into account.
Thanks this info. Following your suggestion, Move this into the "if (! ret)". Then it is like this:
drivers/of/device.c +0 -0
@@ -163,8 +163,10 @@ int of_dma_configure_id(struct device *dev, struct
device_node *np,
dev->coherent_dma_mask &= mask;
*dev->dma_mask &= mask;
/* ...but only set bus limit if we found valid dma-ranges earlier */
- if (!ret)
+ if (!ret) {
dev->bus_dma_limit = end;
+ dev->dma_range_map = map;
+ }
coherent = of_dma_is_coherent(np);
dev_dbg(dev, "device is%sdma coherent\n",
@@ -172,6 +174,8 @@ int of_dma_configure_id(struct device *dev, struct device_node *np,
iommu = of_iommu_configure(dev, np, id);
if (PTR_ERR(iommu) == -EPROBE_DEFER) {
+ if (!ret)
+ dev->dma_range_map = NULL;
kfree(map);
return -EPROBE_DEFER;
}
@@ -181,7 +185,6 @@ int of_dma_configure_id(struct device *dev, struct device_node *np,
arch_setup_dma_ops(dev, dma_start, size, iommu, coherent);
- dev->dma_range_map = map;
return 0;
}
EXPORT_SYMBOL_GPL(of_dma_configure_id);
If this is ok, I will send this as a independent patch.
Quoted 27 lines
Robin.
[1]
https://lore.kernel.org/linux-arm-kernel/[email protected]/Quoted 21 lines
Quoted 8 lines
Quoted 8 lines
drivers/of/device.c +0
-0return -EPROBE_DEFER ; }@@ -181,7 +183,6 @@ int of_dma_configure_id(struct device *dev, struct device_node *np,arch_setup_dma_ops (dev, dma_start, size, iommu, coherent);Quoted 7 lines
Quoted 7 lines
drivers/of/device.c +0
-1- dev->dma_range_map = map;return 0 ; }EXPORT_SYMBOL_GPL (of_dma_configure_id);Signature · 1 line
2.18.0_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH v6 06/33] of/device: Move dma_range_map before of_iommu_configure
Hi,
Quoted 45 lines · Yong Wu
Quoted 44 lines · Robin Murphy
Quoted 31 lines · Yong Wu
Quoted 30 lines · Rob Herring
Quoted 17 lines · Yong Wu
"
dev->dma_range_map" contains the devices'dma_rangesinformation, This patch movesdma_range_mapbeforeof_iommu_configure. The iommu driver may need to know thedma_addressrequirements of its iommu consumer devices.CC Rob Herring <[email protected]>CC Frank Rowand <[email protected]>Signed-off-by Yong Wu <[email protected]>--- drivers/of/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/of/device.c +0
-0drivers/of/device.c int of_dma_configure_id(struct device *dev, struct device_node *np, · line 177
Quoted 8 lines
drivers/of/device.c +2
-0@@ -170,9 +170,11 @@ int of_dma_configure_id(struct device *dev, struct device_node *np,dev_dbg (dev,"device is%sdma coherent\n" , coherent ?" " :" not " ); + dev->dma_range_map = map; iommu =of_iommu_configure (dev, np, id);if (PTR_ERR (iommu) == -EPROBE_DEFER ) {kfree (map); + dev->dma_range_map =NULL ;Not really going to matter, but you should probably clear
dma_range_mapbefore what it points to is freed.Quoted 6 lines
Quoted 3 lines
With that,
Reviewed-by Rob Herring <[email protected]>Thanks for the review. I will move it before "kfree(map)" in next version.
Paul noticed that we already have a bug in assigning to this unconditionally[1] - I'd totally forgotten about this series when I theorised about IOMMU drivers wanting the information earlier, but sweeping my inbox now only goes to show I was right to think of it :)
Quoted 5 lines
Quoted 2 lines
We should really get something in as a fix independent of this series, taking both angles into account.
Thanks this info. Following your suggestion, Move this into the "if (! ret)". Then it is like this:
Thanks for preparing the change :)
drivers/of/device.c int of_dma_configure_id(struct device *dev, struct · line 166
Quoted 8 lines
drivers/of/device.c +0
-0@@ -163,8 +163,10 @@ int of_dma_configure_id(struct device *dev, struct device_node *np, dev->coherent_dma_mask &= mask; *dev->dma_mask &= mask;/* ...but only set bus limit if we found valid dma-ranges earlier */
Maybe the comment would need some update too, like:
/* ...but only set bus limit and map if we found valid dma-ranges earlier */
drivers/of/device.c int of_dma_configure_id(struct device *dev, struct · line 177
Quoted 13 lines
drivers/of/device.c +3
-1-if (!ret) +if (!ret) { dev->bus_dma_limit = end; + dev->dma_range_map = map; + } coherent =of_dma_is_coherent (np);drivers/of/device.c +0
-0dev_dbg(dev, "device is%sdma coherent\n",@@ -172,6 +174,8 @@ int of_dma_configure_id(struct device *dev, structdevice_node *np, iommu =of_iommu_configure (dev, np, id);if (PTR_ERR (iommu) == -EPROBE_DEFER ) {
And maybe one here, something like:
/* don't touch range map if it wasn't set from a valid dma-ranges */
Quoted 16 lines
drivers/of/device.c +2
-0+if (!ret) + dev->dma_range_map =NULL ;kfree (map);return -EPROBE_DEFER ;drivers/of/device.c +0
-1}@@ -181,7 +185,6 @@ int of_dma_configure_id(struct device *dev, structdevice_node *np,arch_setup_dma_ops (dev ,dma_start ,size ,iommu ,coherent ); - dev->dma_range_map = map;return 0 ; }
EXPORT_SYMBOL_GPL(of_dma_configure_id);
Quoted 1 line
If this is ok, I will send this as a independent patch.
With the suggested changes, this looks good to me!
Thanks,
Paul
Quoted 28 lines
Quoted 27 lines
Robin.
[1]
https://lore.kernel.org/linux-arm-kernel/[email protected]/Quoted 21 lines
Quoted 8 lines
Quoted 8 lines
drivers/of/device.c +0
-0return -EPROBE_DEFER ; }@@ -181,7 +183,6 @@ int of_dma_configure_id(struct device *dev, struct device_node *np,arch_setup_dma_ops (dev, dma_start, size, iommu, coherent);Quoted 7 lines
Quoted 7 lines
drivers/of/device.c +0
-1- dev->dma_range_map = map;return 0 ; }EXPORT_SYMBOL_GPL (of_dma_configure_id);Signature · 1 line
2.18.0_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Signature · 3 lines
Paul Kocialkowski, Bootlin Embedded Linux and kernel engineering https://bootlin.com
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v6 7/33 iommu: Avoid reallocate default domain for a group
In reply to Yong WuIf group->default_domain exists, avoid reallocate it.
In some iommu drivers, there may be several devices share a group. Avoid realloc the default domain for this case.
--- drivers/iommu/iommu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/iommu/iommu.c +2 -1
@@ -266,7 +266,8 @@ int iommu_probe_device(struct device *dev)* support default domains, so the return value is not yet * checked. */ -iommu_alloc_default_domain (group, dev); +if (!group->default_domain) +iommu_alloc_default_domain (group, dev);if (group->default_domain) { ret =__iommu_attach_device (group->default_domain, dev);
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Will Deacon
maintainerRe: [PATCH v6 07/33] iommu: Avoid reallocate default domain for a group
Quoted 15 lines · Yong Wu
If
group->default_domainexists, avoid reallocate it.In some iommu drivers, there may be several devices share a group. Avoid realloc the default domain for this case.
Signed-off-by Yong Wu <[email protected]>--- drivers/iommu/iommu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/iommu/iommu.c +0
-0
drivers/iommu/iommu.c int iommu_probe_device(struct device *dev) · line 270
Quoted 6 lines
drivers/iommu/iommu.c +2
-1@@ -266,7 +266,8 @@ int iommu_probe_device(struct device *dev)* support default domains, so the return value is not yet * checked. */ -iommu_alloc_default_domain (group, dev); +if (!group->default_domain) +iommu_alloc_default_domain (group, dev);
I don't really get what this achieves, since iommu_alloc_default_domain() looks like this:
static int iommu_alloc_default_domain(struct iommu_group *group,
struct device *dev)
{
unsigned int type;
if (group->default_domain)
return 0;
...in which case, it should be fine?
Will
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerRe: [PATCH v6 07/33] iommu: Avoid reallocate default domain for a group
Quoted 36 lines · Will Deacon
Quoted 15 lines · Yong Wu
If
group->default_domainexists, avoid reallocate it.In some iommu drivers, there may be several devices share a group. Avoid realloc the default domain for this case.
Signed-off-by Yong Wu <[email protected]>--- drivers/iommu/iommu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/iommu/iommu.c +0
-0drivers/iommu/iommu.c int iommu_probe_device(struct device *dev) · line 270
Quoted 6 lines
drivers/iommu/iommu.c +2
-1@@ -266,7 +266,8 @@ int iommu_probe_device(struct device *dev)* support default domains, so the return value is not yet * checked. */ -iommu_alloc_default_domain (group, dev); +if (!group->default_domain) +iommu_alloc_default_domain (group, dev);I don't really get what this achieves, since
iommu_alloc_default_domain()looks like this:static int iommu_alloc_default_domain(struct
iommu_group*group,
struct device *dev){ unsigned int type; if (group->default_domain) return 0; ...
Quoted 1 line
in which case, it should be fine?
oh. sorry, I overlooked this. the current code is enough. I will remove this patch. and send the next version in this week. Thanks very much.
Quoted 2 lines
Will
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Will Deacon
maintainerRe: [PATCH v6 07/33] iommu: Avoid reallocate default domain for a group
Quoted 35 lines · Yong Wu
Quoted 34 lines · Will Deacon
Quoted 15 lines · Yong Wu
If
group->default_domainexists, avoid reallocate it.In some iommu drivers, there may be several devices share a group. Avoid realloc the default domain for this case.
Signed-off-by Yong Wu <[email protected]>--- drivers/iommu/iommu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/iommu/iommu.c +0
-0drivers/iommu/iommu.c int iommu_probe_device(struct device *dev) · line 270
Quoted 6 lines
drivers/iommu/iommu.c +2
-1@@ -266,7 +266,8 @@ int iommu_probe_device(struct device *dev)* support default domains, so the return value is not yet * checked. */ -iommu_alloc_default_domain (group, dev); +if (!group->default_domain) +iommu_alloc_default_domain (group, dev);I don't really get what this achieves, since
iommu_alloc_default_domain()looks like this:static int iommu_alloc_default_domain(struct
iommu_group*group,
struct device *dev){ unsigned int type; if (group->default_domain) return 0;
Quoted 7 lines
Quoted 3 lines
...in which case, it should be fine?
oh. sorry, I overlooked this. the current code is enough. I will remove this patch. and send the next version in this week. Thanks very much.
Actually, looking at this again, if we're dropping this patch and patch 6 just needs the kfree() moving about, then there's no need to repost. The issue that Robin and Paul are discussing can be handled separately.
Will
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Will Deacon
maintainerRe: [PATCH v6 07/33] iommu: Avoid reallocate default domain for a group
Quoted 40 lines · Will Deacon
Quoted 39 lines · Yong Wu
Quoted 37 lines · Will Deacon
Quoted 15 lines · Yong Wu
If
group->default_domainexists, avoid reallocate it.In some iommu drivers, there may be several devices share a group. Avoid realloc the default domain for this case.
Signed-off-by Yong Wu <[email protected]>--- drivers/iommu/iommu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/iommu/iommu.c +0
-0drivers/iommu/iommu.c int iommu_probe_device(struct device *dev) · line 270
Quoted 6 lines
drivers/iommu/iommu.c +2
-1@@ -266,7 +266,8 @@ int iommu_probe_device(struct device *dev)* support default domains, so the return value is not yet * checked. */ -iommu_alloc_default_domain (group, dev); +if (!group->default_domain) +iommu_alloc_default_domain (group, dev);I don't really get what this achieves, since
iommu_alloc_default_domain()looks like this:static int iommu_alloc_default_domain(struct
iommu_group*group,
struct device *dev){ unsigned int type; if (group->default_domain) return 0; ...in which case, it should be fine?
Quoted 7 lines
Quoted 3 lines
oh. sorry, I overlooked this. the current code is enough. I will remove this patch. and send the next version in this week. Thanks very much.
Actually, looking at this again, if we're dropping this patch and patch 6 just needs the
kfree()moving about, then there's no need to repost. The issue that Robin and Paul are discussing can be handled separately.
Argh, except that this version of the patches doesn't apply :)
So after all that, please go ahead and post a v7 ASAP based on this branch:
https://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git/log/?h=for-joerg/mtk
Will
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Robin Murphy
reviewerRe: [PATCH v6 07/33] iommu: Avoid reallocate default domain for a group
Quoted 41 lines · Will Deacon
Quoted 40 lines · Will Deacon
Quoted 39 lines · Yong Wu
Quoted 37 lines · Will Deacon
Quoted 15 lines · Yong Wu
If
group->default_domainexists, avoid reallocate it.In some iommu drivers, there may be several devices share a group. Avoid realloc the default domain for this case.
Signed-off-by Yong Wu <[email protected]>--- drivers/iommu/iommu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/iommu/iommu.c +0
-0drivers/iommu/iommu.c int iommu_probe_device(struct device *dev) · line 270
Quoted 6 lines
drivers/iommu/iommu.c +2
-1@@ -266,7 +266,8 @@ int iommu_probe_device(struct device *dev)* support default domains, so the return value is not yet * checked. */ -iommu_alloc_default_domain (group, dev); +if (!group->default_domain) +iommu_alloc_default_domain (group, dev);I don't really get what this achieves, since
iommu_alloc_default_domain()looks like this:static int iommu_alloc_default_domain(struct
iommu_group*group,
struct device *dev){ unsigned int type; if (group->default_domain) return 0; ...in which case, it should be fine?
Quoted 7 lines
Quoted 7 lines
Quoted 3 lines
oh. sorry, I overlooked this. the current code is enough. I will remove this patch. and send the next version in this week. Thanks very much.
Actually, looking at this again, if we're dropping this patch and patch 6 just needs the
kfree()moving about, then there's no need to repost. The issue that Robin and Paul are discussing can be handled separately.
FWIW patch #6 gets dropped as well now, since Rob has applied the standalone fix (89c7cb1608ac).
Robin.
Quoted 8 lines
Argh, except that this version of the patches doesn't apply :)
So after all that, please go ahead and post a v7 ASAP based on this branch:
https://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git/log/?h=for-joerg/mtk
Will
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerRe: [PATCH v6 07/33] iommu: Avoid reallocate default domain for a group
In reply to Will DeaconQuoted 49 lines · Will Deacon
Quoted 40 lines · Will Deacon
Quoted 39 lines · Yong Wu
Quoted 37 lines · Will Deacon
Quoted 15 lines · Yong Wu
If
group->default_domainexists, avoid reallocate it.In some iommu drivers, there may be several devices share a group. Avoid realloc the default domain for this case.
Signed-off-by Yong Wu <[email protected]>--- drivers/iommu/iommu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/iommu/iommu.c +0
-0drivers/iommu/iommu.c int iommu_probe_device(struct device *dev) · line 270
Quoted 6 lines
drivers/iommu/iommu.c +2
-1@@ -266,7 +266,8 @@ int iommu_probe_device(struct device *dev)* support default domains, so the return value is not yet * checked. */ -iommu_alloc_default_domain (group, dev); +if (!group->default_domain) +iommu_alloc_default_domain (group, dev);I don't really get what this achieves, since
iommu_alloc_default_domain()looks like this:static int iommu_alloc_default_domain(struct
iommu_group*group,
struct device *dev){ unsigned int type; if (group->default_domain) return 0; ...in which case, it should be fine?
Quoted 7 lines
Quoted 3 lines
oh. sorry, I overlooked this. the current code is enough. I will remove this patch. and send the next version in this week. Thanks very much.
Actually, looking at this again, if we're dropping this patch and patch 6 just needs the
kfree()moving about, then there's no need to repost. The issue that Robin and Paul are discussing can be handled separately.
Quoted 5 lines
Argh, except that this version of the patches doesn't apply :)
So after all that, please go ahead and post a v7 ASAP based on this branch:
https://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git/log/?h=for-joerg/mtk
After confirm with Tomasz, He still need some time to take a look at v6.
thus I need wait some time to send v7 after his feedback.
Thanks for your comment. and Thanks Tomasz for the review.
Quoted 2 lines
Will
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Will Deacon
maintainerRe: [PATCH v6 07/33] iommu: Avoid reallocate default domain for a group
Quoted 54 lines · Yong Wu
Quoted 53 lines · Will Deacon
Quoted 40 lines · Will Deacon
Quoted 39 lines · Yong Wu
Quoted 37 lines · Will Deacon
Quoted 15 lines · Yong Wu
If
group->default_domainexists, avoid reallocate it.In some iommu drivers, there may be several devices share a group. Avoid realloc the default domain for this case.
Signed-off-by Yong Wu <[email protected]>--- drivers/iommu/iommu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/iommu/iommu.c +0
-0drivers/iommu/iommu.c int iommu_probe_device(struct device *dev) · line 270
Quoted 6 lines
drivers/iommu/iommu.c +2
-1@@ -266,7 +266,8 @@ int iommu_probe_device(struct device *dev)* support default domains, so the return value is not yet * checked. */ -iommu_alloc_default_domain (group, dev); +if (!group->default_domain) +iommu_alloc_default_domain (group, dev);I don't really get what this achieves, since
iommu_alloc_default_domain()looks like this:static int iommu_alloc_default_domain(struct
iommu_group*group,
struct device *dev){ unsigned int type; if (group->default_domain) return 0; ...in which case, it should be fine?
Quoted 7 lines
Quoted 3 lines
oh. sorry, I overlooked this. the current code is enough. I will remove this patch. and send the next version in this week. Thanks very much.
Actually, looking at this again, if we're dropping this patch and patch 6 just needs the
kfree()moving about, then there's no need to repost. The issue that Robin and Paul are discussing can be handled separately.Argh, except that this version of the patches doesn't apply :)
So after all that, please go ahead and post a v7 ASAP based on this branch:
Quoted 7 lines
After confirm with Tomasz, He still need some time to take a look at v6.
thus I need wait some time to send v7 after his feedback.
Thanks for your comment. and Thanks Tomasz for the review.
Ok, but please be aware that I'm planning to send my queue to Joerg on Monday, so if it doesn't show up today then it will miss 5.12.
Will
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v6 8/33 iommu/mediatek: Use the common mtk-memory-port.h
In reply to Yong WuUse the common memory header(larb-port) in the source code.
--- drivers/iommu/mtk_iommu.c | 7 ------- drivers/iommu/mtk_iommu.h | 1 + drivers/memory/mtk-smi.c | 1 + include/soc/mediatek/smi.h | 2 -- 4 files changed, 2 insertions(+), 9 deletions(-)
drivers/iommu/mtk_iommu.c +0 -7
@@ -103,13 +103,6 @@#define MTK_PROTECT_PA_ALIGN 256 -/* -* Get the local arbiter ID and the portid within the larb arbiter -* from mtk_m4u_id which is defined by MTK_M4U_ID. -*/ -#define MTK_M4U_TO_LARB (id) (((id) >> 5) & 0xf) -#define MTK_M4U_TO_PORT (id) ((id) & 0x1f) -#define HAS_4GB_MODE BIT(0)/* HW will use the EMI clock if there isn't the "bclk". */ #define HAS_BCLK BIT(1)
drivers/iommu/mtk_iommu.h +1 -0
@@ -17,6 +17,7 @@#include <linux/spinlock.h> #include <linux/dma-mapping.h> #include <soc/mediatek/smi.h> +#include <dt-bindings/memory/mtk-memory-port.h> #define MTK_LARB_COM_MAX 8#define MTK_LARB_SUBCOM_MAX 4
drivers/memory/mtk-smi.c +1 -0
@@ -15,6 +15,7 @@#include <linux/pm_runtime.h> #include <soc/mediatek/smi.h> #include <dt-bindings/memory/mt2701-larb-port.h> +#include <dt-bindings/memory/mtk-memory-port.h> /* mt8173 */ #define SMI_LARB_MMU_EN 0xf00
include/soc/mediatek/smi.h +0 -2
@@ -11,8 +11,6 @@#ifdef CONFIG_MTK_SMI -#define MTK_LARB_NR_MAX 16 -#define MTK_SMI_MMU_EN (port) BIT(port) struct mtk_smi_larb_iommu {
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v6 9/33 iommu/io-pgtable-arm-v7s: Use ias to check the valid iova in unmap
In reply to Yong WuUse the ias for the valid iova checking in arm_v7s_unmap. This is a preparing patch for supporting iova 34bit for MediaTek.
--- drivers/iommu/io-pgtable-arm-v7s.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/io-pgtable-arm-v7s.c +1 -1
@@ -717,7 +717,7 @@ static size_t arm_v7s_unmap(struct io_pgtable_ops *ops, unsigned long iova, {struct arm_v7s_io_pgtable *data =io_pgtable_ops_to_data (ops); -if (WARN_ON (upper_32_bits (iova))) +if (WARN_ON (iova >= (1ULL << data->iop.cfg.ias)))return 0 ;return __arm_v7s_unmap (data, gather, iova, size,1 , data->pgd);
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v6 10/33 iommu/io-pgtable-arm-v7s: Extend PA34 for MediaTek
In reply to Yong WuMediaTek extend the bit5 in lvl1 and lvl2 descriptor as PA34.
--- drivers/iommu/io-pgtable-arm-v7s.c | 9 +++++++-- drivers/iommu/mtk_iommu.c | 2 +- include/linux/io-pgtable.h | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-)
drivers/iommu/io-pgtable-arm-v7s.c +7 -2
@@ -112,9 +112,10 @@#define ARM_V7S_TEX_MASK 0x7#define ARM_V7S_ATTR_TEX (val) (((val) & ARM_V7S_TEX_MASK) << ARM_V7S_TEX_SHIFT) -/* MediaTek extend the two bits for PA 32bit/33bit */ +/* MediaTek extend the bits below for PA 32bit/33bit/34bit */ #define ARM_V7S_ATTR_MTK_PA_BIT32 BIT(9)#define ARM_V7S_ATTR_MTK_PA_BIT33 BIT(4) +#define ARM_V7S_ATTR_MTK_PA_BIT34 BIT(5)/* *well, except for TEX on level 2 large pages, of course :( */ #define ARM_V7S_CONT_PAGE_TEX_SHIFT 6
@@ -194,6 +195,8 @@ static arm_v7s_iopte paddr_to_iopte(phys_addr_t paddr, int lvl, pte |=ARM_V7S_ATTR_MTK_PA_BIT32 ;if (paddr &BIT_ULL (33 )) pte |=ARM_V7S_ATTR_MTK_PA_BIT33 ; +if (paddr &BIT_ULL (34 )) + pte |=ARM_V7S_ATTR_MTK_PA_BIT34 ;return pte; }
@@ -218,6 +221,8 @@ static phys_addr_t iopte_to_paddr(arm_v7s_iopte pte, int lvl, paddr |=BIT_ULL (32 );if (pte &ARM_V7S_ATTR_MTK_PA_BIT33 ) paddr |=BIT_ULL (33 ); +if (pte &ARM_V7S_ATTR_MTK_PA_BIT34 ) + paddr |=BIT_ULL (34 );return paddr; }
@@ -754,7 +759,7 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg,if (cfg->ias >ARM_V7S_ADDR_BITS )return NULL ; -if (cfg->oas > (arm_v7s_is_mtk_enabled (cfg) ?34 :ARM_V7S_ADDR_BITS )) +if (cfg->oas > (arm_v7s_is_mtk_enabled (cfg) ?35 :ARM_V7S_ADDR_BITS ))return NULL ; if (cfg->quirks & ~(IO_PGTABLE_QUIRK_ARM_NS |
drivers/iommu/mtk_iommu.c +1 -1
@@ -300,7 +300,7 @@ static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom) IO_PGTABLE_QUIRK_ARM_MTK_EXT, .pgsize_bitmap = mtk_iommu_ops.pgsize_bitmap, .ias = 32, - .oas = 34, + .oas = 35, .iommu_dev = data->dev, };
include/linux/io-pgtable.h +2 -2
@@ -73,8 +73,8 @@ struct io_pgtable_cfg {* TLB maintenance when mapping as well as when unmapping. * * IO_PGTABLE_QUIRK_ARM_MTK_EXT: (ARM v7s format) MediaTek IOMMUs extend -* to support up to 34 bits PA where the bit32 and bit33 are -* encoded in the bit9 and bit4 of the PTE respectively. +* to support up to 35 bits PA where the bit32, bit33 and bit34 are +* encoded in the bit9, bit4 and bit5 of the PTE respectively. * * IO_PGTABLE_QUIRK_NON_STRICT: Skip issuing synchronous leaf TLBIs * on unmap, for DMA domains using the flush queue mechanism for
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v6 11/33 iommu/io-pgtable-arm-v7s: Clarify LVL_SHIFT/BITS macro
In reply to Yong WuThe current _ARM_V7S_LVL_BITS/ARM_V7S_LVL_SHIFT use a formula to calculate the corresponding value for level1 and level2 to pretend the code sane. Actually their level1 and level2 values are different from each other. This patch only clarify the two macro. No functional change.
--- drivers/iommu/io-pgtable-arm-v7s.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/iommu/io-pgtable-arm-v7s.c +3 -5
@@ -44,13 +44,11 @@/* * We have 32 bits total; 12 bits resolved at level 1, 8 bits at level 2, -* and 12 bits in a page. With some carefully-chosen coefficients we can -* hide the ugly inconsistencies behind these macros and at least let the -* rest of the code pretend to be somewhat sane. +* and 12 bits in a page. */ #define ARM_V7S_ADDR_BITS 32 -#define _ARM_V7S_LVL_BITS (lvl) (16 - (lvl) * 4) -#define ARM_V7S_LVL_SHIFT (lvl) (ARM_V7S_ADDR_BITS - (4 + 8 * (lvl))) +#define _ARM_V7S_LVL_BITS (lvl) ((lvl) == 1 ? 12 : 8) +#define ARM_V7S_LVL_SHIFT (lvl) ((lvl) == 1 ? 20 : 12)#define ARM_V7S_TABLE_SHIFT 10#define ARM_V7S_PTES_PER_LVL (lvl) (1 << _ARM_V7S_LVL_BITS(lvl))
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v6 12/33 iommu/io-pgtable-arm-v7s: Add cfg as a param in some macros
In reply to Yong WuAdd "cfg" as a parameter for some macros. This is a preparing patch for mediatek extend the lvl1 pgtable. No functional change.
--- drivers/iommu/io-pgtable-arm-v7s.c | 36 +++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-)
drivers/iommu/io-pgtable-arm-v7s.c +18 -18
@@ -47,21 +47,21 @@* and 12 bits in a page. */ #define ARM_V7S_ADDR_BITS 32 -#define _ARM_V7S_LVL_BITS (lvl) ((lvl) == 1 ? 12 : 8) +#define _ARM_V7S_LVL_BITS (lvl, cfg) ((lvl) == 1 ? 12 : 8)#define ARM_V7S_LVL_SHIFT (lvl) ((lvl) == 1 ? 20 : 12)#define ARM_V7S_TABLE_SHIFT 10 -#define ARM_V7S_PTES_PER_LVL (lvl) (1 << _ARM_V7S_LVL_BITS(lvl)) -#define ARM_V7S_TABLE_SIZE (lvl) \ - (ARM_V7S_PTES_PER_LVL(lvl) * sizeof(arm_v7s_iopte)) +#define ARM_V7S_PTES_PER_LVL (lvl, cfg) (1 << _ARM_V7S_LVL_BITS(lvl, cfg)) +#define ARM_V7S_TABLE_SIZE (lvl, cfg) \ + (ARM_V7S_PTES_PER_LVL(lvl, cfg) * sizeof(arm_v7s_iopte))#define ARM_V7S_BLOCK_SIZE (lvl) (1UL << ARM_V7S_LVL_SHIFT(lvl))#define ARM_V7S_LVL_MASK (lvl) ((u32)(~0U << ARM_V7S_LVL_SHIFT(lvl)))#define ARM_V7S_TABLE_MASK ((u32)(~0U << ARM_V7S_TABLE_SHIFT)) -#define _ARM_V7S_IDX_MASK (lvl) (ARM_V7S_PTES_PER_LVL(lvl) - 1) -#define ARM_V7S_LVL_IDX (addr, lvl) ({ \ +#define _ARM_V7S_IDX_MASK (lvl, cfg) (ARM_V7S_PTES_PER_LVL(lvl, cfg) - 1) +#define ARM_V7S_LVL_IDX (addr, lvl, cfg) ({ \ int _l = lvl; \ - ((u32)(addr) >> ARM_V7S_LVL_SHIFT(_l)) & _ARM_V7S_IDX_MASK(_l); \ + ((u32)(addr) >> ARM_V7S_LVL_SHIFT(_l)) & _ARM_V7S_IDX_MASK(_l, cfg); \ })/*
@@ -237,7 +237,7 @@ static void *__arm_v7s_alloc_table(int lvl, gfp_t gfp,struct device *dev = cfg->iommu_dev;phys_addr_t phys;dma_addr_t dma; -size_t size =ARM_V7S_TABLE_SIZE (lvl); +size_t size =ARM_V7S_TABLE_SIZE (lvl, cfg);void *table =NULL ;if (lvl ==1 )
@@ -283,7 +283,7 @@ static void __arm_v7s_free_table(void *table, int lvl, {struct io_pgtable_cfg *cfg = &data->iop.cfg;struct device *dev = cfg->iommu_dev; -size_t size =ARM_V7S_TABLE_SIZE (lvl); +size_t size =ARM_V7S_TABLE_SIZE (lvl, cfg);if (!cfg->coherent_walk) dma_unmap_single(dev, __arm_v7s_dma_addr(table), size,
@@ -427,7 +427,7 @@ static int arm_v7s_init_pte(struct arm_v7s_io_pgtable *data,arm_v7s_iopte *tblp;size_t sz =ARM_V7S_BLOCK_SIZE (lvl); - tblp = ptep -ARM_V7S_LVL_IDX (iova, lvl); + tblp = ptep -ARM_V7S_LVL_IDX (iova, lvl, cfg);if (WARN_ON (__arm_v7s_unmap (data,NULL , iova + i * sz, sz, lvl, tblp) != sz))return -EINVAL ;
@@ -480,7 +480,7 @@ static int __arm_v7s_map(struct arm_v7s_io_pgtable *data, unsigned long iova,int num_entries = size >>ARM_V7S_LVL_SHIFT (lvl);/* Find our entry at the current level */ - ptep +=ARM_V7S_LVL_IDX (iova, lvl); + ptep +=ARM_V7S_LVL_IDX (iova, lvl, cfg);/* If we can install a leaf entry at this level, then do so */ if (num_entries)
@@ -553,7 +553,7 @@ static void arm_v7s_free_pgtable(struct io_pgtable *iop)struct arm_v7s_io_pgtable *data =io_pgtable_to_data (iop);int i; -for (i =0 ; i <ARM_V7S_PTES_PER_LVL (1 ); i++) { +for (i =0 ; i <ARM_V7S_PTES_PER_LVL (1 , &data->iop.cfg); i++) {arm_v7s_iopte pte = data->pgd[i];if (ARM_V7S_PTE_IS_TABLE (pte,1 ))
@@ -605,9 +605,9 @@ static size_t arm_v7s_split_blk_unmap(struct arm_v7s_io_pgtable *data,if (!tablep)return 0 ;/* Bytes unmapped */ - num_ptes =ARM_V7S_PTES_PER_LVL (2 ); + num_ptes =ARM_V7S_PTES_PER_LVL (2 , cfg); num_entries = size >>ARM_V7S_LVL_SHIFT (2 ); - unmap_idx =ARM_V7S_LVL_IDX (iova,2 ); + unmap_idx =ARM_V7S_LVL_IDX (iova,2 , cfg); pte =arm_v7s_prot_to_pte (arm_v7s_pte_to_prot (blk_pte,1 ),2 , cfg);if (num_entries >1 )
@@ -649,7 +649,7 @@ static size_t __arm_v7s_unmap(struct arm_v7s_io_pgtable *data,if (WARN_ON (lvl >2 ))return 0 ; - idx =ARM_V7S_LVL_IDX (iova, lvl); + idx =ARM_V7S_LVL_IDX (iova, lvl, &iop->cfg); ptep += idx; do { pte[i] = READ_ONCE(ptep[i]);
@@ -735,7 +735,7 @@ static phys_addr_t arm_v7s_iova_to_phys(struct io_pgtable_ops *ops,u32 mask;do { - ptep +=ARM_V7S_LVL_IDX (iova, ++lvl); + ptep +=ARM_V7S_LVL_IDX (iova, ++lvl, &data->iop.cfg); pte =READ_ONCE (*ptep); ptep =iopte_deref (pte, lvl, data); }while (ARM_V7S_PTE_IS_TABLE (pte, lvl));
@@ -778,8 +778,8 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg,spin_lock_init (&data->split_lock); data->l2_tables =kmem_cache_create ("io-pgtable_armv7s_l2" , -ARM_V7S_TABLE_SIZE (2 ), -ARM_V7S_TABLE_SIZE (2 ), +ARM_V7S_TABLE_SIZE (2 , cfg), +ARM_V7S_TABLE_SIZE (2 , cfg),ARM_V7S_TABLE_SLAB_FLAGS ,NULL );if (!data->l2_tables) goto out_free_data;
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v6 13/33 iommu/io-pgtable-arm-v7s: Quad lvl1 pgtable for MediaTek
In reply to Yong WuThe standard input iova bits is 32. MediaTek quad the lvl1 pagetable (4 * lvl1). No change for lvl2 pagetable. Then the iova bits can reach 34bit.
--- drivers/iommu/io-pgtable-arm-v7s.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/iommu/io-pgtable-arm-v7s.c +4 -3
@@ -45,9 +45,10 @@/* * We have 32 bits total; 12 bits resolved at level 1, 8 bits at level 2, * and 12 bits in a page. +* MediaTek extend 2 bits to reach 34bits, 14 bits at lvl1 and 8 bits at lvl2. */ #define ARM_V7S_ADDR_BITS 32 -#define _ARM_V7S_LVL_BITS (lvl, cfg) ((lvl) == 1 ? 12 : 8) +#define _ARM_V7S_LVL_BITS (lvl, cfg) ((lvl) == 1 ? ((cfg)->ias - 20) : 8)#define ARM_V7S_LVL_SHIFT (lvl) ((lvl) == 1 ? 20 : 12)#define ARM_V7S_TABLE_SHIFT 10
@@ -61,7 +62,7 @@#define _ARM_V7S_IDX_MASK (lvl, cfg) (ARM_V7S_PTES_PER_LVL(lvl, cfg) - 1)#define ARM_V7S_LVL_IDX (addr, lvl, cfg) ({ \ int _l = lvl; \ - ((u32)(addr) >> ARM_V7S_LVL_SHIFT(_l)) & _ARM_V7S_IDX_MASK(_l, cfg); \ + ((addr) >> ARM_V7S_LVL_SHIFT(_l)) & _ARM_V7S_IDX_MASK(_l, cfg); \ })/*
@@ -754,7 +755,7 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg, {struct arm_v7s_io_pgtable *data; -if (cfg->ias >ARM_V7S_ADDR_BITS ) +if (cfg->ias > (arm_v7s_is_mtk_enabled (cfg) ?34 :ARM_V7S_ADDR_BITS ))return NULL ;if (cfg->oas > (arm_v7s_is_mtk_enabled (cfg) ?35 :ARM_V7S_ADDR_BITS ))
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v6 14/33 iommu/mediatek: Add a flag for iova 34bits case
In reply to Yong WuAdd a HW flag for if the HW support 34bit IOVA. the previous SoC still use 32bit. normally the lvl1 pgtable size is 16KB when ias == 32. if ias == 34, lvl1 pgtable size is 16KB * 4. The purpose of this patch is to save 16KB*3 continuous memory for the previous SoC.
--- drivers/iommu/mtk_iommu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/iommu/mtk_iommu.c +2 -1
@@ -112,6 +112,7 @@#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 MTK_IOMMU_HAS_FLAG (pdata, _x) \ ((((pdata)->flags) & (_x)) == (_x))
@@ -299,7 +300,7 @@ static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom)IO_PGTABLE_QUIRK_NO_PERMS | IO_PGTABLE_QUIRK_ARM_MTK_EXT, .pgsize_bitmap = mtk_iommu_ops.pgsize_bitmap, - .ias = 32, + .ias = MTK_IOMMU_HAS_FLAG(data->plat_data, IOVA_34_EN) ? 34 : 32, .oas = 35, .iommu_dev = data->dev, };
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v6 15/33 iommu/mediatek: Update oas for v7s
In reply to Yong WuThis patch only updates oas in different SoCs.
If the SoC supports 4GB-mode and current dram size is 4GB, the oas is 33. otherwise, it's still 32. In the lastest SoC, the oas is 35bits.
--- drivers/iommu/mtk_iommu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/iommu/mtk_iommu.c +5 -1
@@ -301,10 +301,14 @@ static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom) IO_PGTABLE_QUIRK_ARM_MTK_EXT, .pgsize_bitmap = mtk_iommu_ops.pgsize_bitmap, .ias = MTK_IOMMU_HAS_FLAG(data->plat_data, IOVA_34_EN) ? 34 : 32, - .oas = 35, .iommu_dev = data->dev, }; +if (MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_4GB_MODE )) + dom->cfg.oas = data->enable_4GB ?33 :32 ; +else + dom->cfg.oas =35 ; + dom->iop =alloc_io_pgtable_ops (ARM_V7S , &dom->cfg, data);if (!dom->iop) {dev_err (data->dev,"Failed to alloc io pgtable\n" );
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v6 16/33 iommu/mediatek: Move hw_init into attach_device
In reply to Yong WuIn attach device, it will update the pagetable base address register. Move the hw_init function also here. Then it only need call pm_runtime_get/put one time here if m4u has power domain.
--- drivers/iommu/mtk_iommu.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/iommu/mtk_iommu.c +7 -6
@@ -126,6 +126,8 @@ struct mtk_iommu_domain {static const struct iommu_ops mtk_iommu_ops; +static int mtk_iommu_hw_init (const struct mtk_iommu_data *data); +/* * In M4U 4GB mode, the physical address is remapped as below: *
@@ -364,12 +366,15 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain, {struct mtk_iommu_data *data =dev_iommu_priv_get (dev);struct mtk_iommu_domain *dom =to_mtk_domain (domain); +int ret;if (!data)return -ENODEV ; -/* Update the pgtable base address register of the M4U HW */ -if (!data->m4u_dom) { +if (!data->m4u_dom) {/* Initialize the M4U HW */ + ret =mtk_iommu_hw_init (data); +if (ret) +return ret; data->m4u_dom = dom;writel (dom->cfg.arm_v7s_cfg.ttbr &MMU_PT_ADDR_MASK , data->base +REG_MMU_PT_BASE_ADDR );
@@ -724,10 +729,6 @@ static int mtk_iommu_probe(struct platform_device *pdev)platform_set_drvdata (pdev, data); - ret =mtk_iommu_hw_init (data); -if (ret) -return ret; - ret =iommu_device_sysfs_add (&data->iommu, dev,NULL ,"mtk-iommu.%pa" , &ioaddr);if (ret)
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v6 17/33 iommu/mediatek: Add error handle for mtk_iommu_probe
In reply to Yong WuIn the original code, we lack the error handle. This patch adds them.
--- drivers/iommu/mtk_iommu.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-)
drivers/iommu/mtk_iommu.c +19 -4
@@ -739,15 +739,30 @@ static int mtk_iommu_probe(struct platform_device *pdev) ret =iommu_device_register (&data->iommu);if (ret) -return ret; + goto out_sysfs_remove;spin_lock_init (&data->tlb_lock);list_add_tail (&data->list, &m4ulist); -if (!iommu_present (&platform_bus_type)) -bus_set_iommu (&platform_bus_type, &mtk_iommu_ops); +if (!iommu_present (&platform_bus_type)) { + ret =bus_set_iommu (&platform_bus_type, &mtk_iommu_ops); +if (ret) + goto out_list_del; + } -return component_master_add_with_match (dev, &mtk_iommu_com_ops, match); + 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: +bus_set_iommu (&platform_bus_type,NULL ); +out_list_del: +list_del (&data->list); +iommu_device_unregister (&data->iommu); +out_sysfs_remove: +iommu_device_sysfs_remove (&data->iommu); +return ret; }static int mtk_iommu_remove (struct platform_device *pdev)
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v6 18/33 iommu/mediatek: Add device link for smi-common and m4u
In reply to Yong WuIn the lastest SoC, M4U has its special power domain. thus, If the engine begin to work, it should help enable the power for M4U firstly. Currently if the engine work, it always enable the power/clocks for smi-larbs/smi-common. This patch adds device_link for smi-common and M4U. then, if smi-common power is enabled, the M4U power also is powered on automatically.
Normally M4U connect with several smi-larbs and their smi-common always are the same, In this patch it get smi-common dev from the last smi-larb device, then add the device_link.
--- drivers/iommu/mtk_iommu.c | 27 ++++++++++++++++++++++++--- drivers/iommu/mtk_iommu.h | 1 + 2 files changed, 25 insertions(+), 3 deletions(-)
drivers/iommu/mtk_iommu.c +24 -3
@@ -20,6 +20,7 @@#include <linux/of_irq.h> #include <linux/of_platform.h> #include <linux/platform_device.h> +#include <linux/pm_runtime.h> #include <linux/regmap.h> #include <linux/slab.h> #include <linux/spinlock.h>
@@ -633,6 +634,9 @@ 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 ;
@@ -699,8 +703,6 @@ static int mtk_iommu_probe(struct platform_device *pdev)return larb_nr;for (i =0 ; i < larb_nr; i++) { -struct device_node *larbnode; -struct platform_device *plarbdev;u32 id; larbnode =of_parse_phandle (dev->of_node,"mediatek,larbs" , i);
@@ -727,12 +729,28 @@ static int mtk_iommu_probe(struct platform_device *pdev) 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 -EINVAL ; + } +platform_set_drvdata (pdev, data); ret =iommu_device_sysfs_add (&data->iommu, dev,NULL ,"mtk-iommu.%pa" , &ioaddr);if (ret) -return ret; + goto out_link_remove;iommu_device_set_ops (&data->iommu, &mtk_iommu_ops);iommu_device_set_fwnode (&data->iommu, &pdev->dev.of_node->fwnode);
@@ -762,6 +780,8 @@ static int mtk_iommu_probe(struct platform_device *pdev)iommu_device_unregister (&data->iommu); out_sysfs_remove:iommu_device_sysfs_remove (&data->iommu); +out_link_remove: +device_link_remove (data->smicomm_dev, dev);return ret; }
@@ -776,6 +796,7 @@ static int mtk_iommu_remove(struct platform_device *pdev)bus_set_iommu (&platform_bus_type,NULL );clk_disable_unprepare (data->bclk); +device_link_remove (data->smicomm_dev, &pdev->dev);devm_free_irq (&pdev->dev, data->irq, data);component_master_del (&pdev->dev, &mtk_iommu_com_ops);return 0 ;
drivers/iommu/mtk_iommu.h +1 -0
@@ -68,6 +68,7 @@ struct mtk_iommu_data {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 */
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v6 19/33 iommu/mediatek: Add pm runtime callback
In reply to Yong WuIn pm runtime case, all the registers backup/restore and bclk are controlled in the pm_runtime callback, Rename the original suspend/resume to the runtime_suspend/resume.
Use pm_runtime_force_suspend/resume as the normal suspend/resume. iommu should suspend after iommu consumer devices, thus use _LATE_.
--- drivers/iommu/mtk_iommu.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/iommu/mtk_iommu.c +5 -3
@@ -802,7 +802,7 @@ static int mtk_iommu_remove(struct platform_device *pdev)return 0 ; } -static int __maybe_unused mtk_iommu_suspend (struct device *dev) +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;
@@ -820,7 +820,7 @@ 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_runtime_resume (struct device *dev) {struct mtk_iommu_data *data =dev_get_drvdata (dev);struct mtk_iommu_suspend_reg *reg = &data->reg;
@@ -848,7 +848,9 @@ static int __maybe_unused mtk_iommu_resume(struct device *dev) }static const struct dev_pm_ops mtk_iommu_pm_ops = { -SET_NOIRQ_SYSTEM_SLEEP_PM_OPS (mtk_iommu_suspend, mtk_iommu_resume) + SET_RUNTIME_PM_OPS(mtk_iommu_runtime_suspend, mtk_iommu_runtime_resume, NULL) +SET_LATE_SYSTEM_SLEEP_PM_OPS (pm_runtime_force_suspend, + pm_runtime_force_resume) };static const struct mtk_iommu_plat_data mt2712_data = {
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v6 20/33 iommu/mediatek: Add power-domain operation
In reply to Yong WuIn the previous SoC, the M4U HW is in the EMI power domain which is always on. the latest M4U is in the display power domain which may be turned on/off, thus we have to add pm_runtime interface for it.
When the engine work, the engine always enable the power and clocks for smi-larb/smi-common, then the M4U's power will always be powered on automatically via the device link with smi-common.
Note: we don't enable the M4U power in iommu_map/unmap for tlb flush. If its power already is on, of course it is ok. if the power is off, the main tlb will be reset while M4U power on, thus the tlb flush while m4u power off is unnecessary, just skip it.
Therefore, we increase the ref_count for pm when pm status is ACTIVE, otherwise, skip it. Meanwhile, the tlb_flush_range is called so often, thus, update pm ref_count while the SoC has power-domain to avoid touch the dev->power.lock. and the tlb_flush_all only is called when boot, so no need check if the SoC has power-domain to keep code clean.
There will be one case that pm runctime status is not expected when tlb flush. After boot, the display may call dma_alloc_attrs before it call pm_runtime_get(disp-dev), then the m4u's pm status is not active inside the dma_alloc_attrs. Since it only happens after boot, the tlb is clean at that time, I also think this is ok.
--- drivers/iommu/mtk_iommu.c | 39 ++++++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-)
drivers/iommu/mtk_iommu.c +34 -5
@@ -182,10 +182,15 @@ static struct mtk_iommu_domain *to_mtk_domain(struct iommu_domain *dom)static void mtk_iommu_tlb_flush_all (struct mtk_iommu_data *data) {for_each_m4u (data) { +if (pm_runtime_get_if_in_use (data->dev) <=0 ) +continue ; +writel_relaxed (F_INVLD_EN1 |F_INVLD_EN0 , data->base + data->plat_data->inv_sel_reg);writel_relaxed (F_ALL_INVLD , data->base +REG_MMU_INVALIDATE );wmb ();/* Make sure the tlb flush all done */ + +pm_runtime_put (data->dev); } }
@@ -193,11 +198,17 @@ static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size,size_t granule, struct mtk_iommu_data *data) { + bool has_pm = !!data->dev->pm_domain;unsigned long flags;int ret;u32 tmp;for_each_m4u (data) { +if (has_pm) { +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 , data->base + data->plat_data->inv_sel_reg);
@@ -219,6 +230,9 @@ static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size,/* Clear the CPE status */ writel_relaxed (0 , data->base +REG_MMU_CPE_DONE );spin_unlock_irqrestore (&data->tlb_lock, flags); + +if (has_pm) +pm_runtime_put (data->dev); } }
@@ -367,18 +381,27 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain, {struct mtk_iommu_data *data =dev_iommu_priv_get (dev);struct mtk_iommu_domain *dom =to_mtk_domain (domain); +struct device *m4udev = data->dev;int ret;if (!data)return -ENODEV ;if (!data->m4u_dom) {/* Initialize the M4U HW */ + ret =pm_runtime_resume_and_get (m4udev); +if (ret <0 ) +return ret; + ret =mtk_iommu_hw_init (data); -if (ret) +if (ret) { +pm_runtime_put (m4udev);return ret; + } data->m4u_dom = dom;writel (dom->cfg.arm_v7s_cfg.ttbr &MMU_PT_ADDR_MASK , data->base +REG_MMU_PT_BASE_ADDR ); + +pm_runtime_put (m4udev); }mtk_iommu_config (data, dev, true);
@@ -738,11 +761,13 @@ static int mtk_iommu_probe(struct platform_device *pdev)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 link %s.\n" ,dev_name (data->smicomm_dev)); -return -EINVAL ; + goto out_runtime_disable; }platform_set_drvdata (pdev, data);
@@ -782,6 +807,8 @@ static int mtk_iommu_probe(struct platform_device *pdev)iommu_device_sysfs_remove (&data->iommu); out_link_remove:device_link_remove (data->smicomm_dev, dev); +out_runtime_disable: +pm_runtime_disable (dev);return ret; }
@@ -797,6 +824,7 @@ static int mtk_iommu_remove(struct platform_device *pdev)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);component_master_del (&pdev->dev, &mtk_iommu_com_ops);return 0 ;
@@ -828,6 +856,9 @@ static int __maybe_unused mtk_iommu_runtime_resume(struct device *dev)void __iomem *base = data->base;int ret; +/* Avoid first resume to affect the default value of registers below. */ +if (!m4u_dom) +return 0 ; ret =clk_prepare_enable (data->bclk);if (ret) {dev_err (data->dev,"Failed to enable clk(%d) in resume\n" , ret);
@@ -841,9 +872,7 @@ static int __maybe_unused mtk_iommu_runtime_resume(struct device *dev)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 ); -if (m4u_dom) -writel (m4u_dom->cfg.arm_v7s_cfg.ttbr &MMU_PT_ADDR_MASK , - base +REG_MMU_PT_BASE_ADDR ); +writel (m4u_dom->cfg.arm_v7s_cfg.ttbr &MMU_PT_ADDR_MASK , base +REG_MMU_PT_BASE_ADDR );return 0 ; }
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v6 21/33 iommu/mediatek: Support up to 34bit iova in tlb flush
In reply to Yong WuIf the iova is 34bit, the iova[32][33] is the bit0/1 in the tlb flush register. Add a new macro for this.
In the macro, since (iova + size - 1) may be end with 0xfff, then the bit0/1 always is 1, thus add a mask.
--- drivers/iommu/mtk_iommu.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/iommu/mtk_iommu.c +8 -2
@@ -129,6 +129,11 @@ static const struct iommu_ops mtk_iommu_ops;static int mtk_iommu_hw_init (const struct mtk_iommu_data *data); +#define MTK_IOMMU_TLB_ADDR (iova) ({ \ + dma_addr_t _addr = iova; \ + ((lower_32_bits(_addr) & GENMASK(31, 12)) | upper_32_bits(_addr));\ +}) +/* * In M4U 4GB mode, the physical address is remapped as below: *
@@ -213,8 +218,9 @@ static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size,writel_relaxed (F_INVLD_EN1 |F_INVLD_EN0 , data->base + data->plat_data->inv_sel_reg); -writel_relaxed (iova, data->base +REG_MMU_INVLD_START_A ); -writel_relaxed (iova + size -1 , +writel_relaxed (MTK_IOMMU_TLB_ADDR (iova), + data->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 );
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v6 22/33 iommu/mediatek: Support report iova 34bit translation fault in ISR
In reply to Yong WuIf the iova is over 32bit, the fault status register bit is a little different.
--- drivers/iommu/mtk_iommu.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
drivers/iommu/mtk_iommu.c +15 -2
@@ -3,6 +3,7 @@* Copyright (c) 2015-2016 MediaTek Inc. * Author: Yong Wu <[email protected]> */ +#include <linux/bitfield.h> #include <linux/bug.h> #include <linux/clk.h> #include <linux/component.h>
@@ -89,6 +90,9 @@#define F_REG_MMU1_FAULT_MASK GENMASK(13, 7)#define REG_MMU0_FAULT_VA 0x13c +#define F_MMU_INVAL_VA_31_12_MASK GENMASK(31, 12) +#define F_MMU_INVAL_VA_34_32_MASK GENMASK(11, 9) +#define F_MMU_INVAL_PA_34_32_MASK GENMASK(8, 6)#define F_MMU_FAULT_VA_WRITE_BIT BIT(1)#define F_MMU_FAULT_VA_LAYER_BIT BIT(0)
@@ -246,8 +250,9 @@ static irqreturn_t mtk_iommu_isr(int irq, void *dev_id) {struct mtk_iommu_data *data = dev_id;struct mtk_iommu_domain *dom = data->m4u_dom; -u32 int_state, regval, fault_iova, fault_pa;unsigned int fault_larb, fault_port, sub_comm =0 ; +u32 int_state, regval, va34_32, pa34_32; +u64 fault_iova, fault_pa;bool layer, write;/* Read error info from registers */
@@ -263,6 +268,14 @@ static irqreturn_t mtk_iommu_isr(int irq, void *dev_id) } layer = fault_iova &F_MMU_FAULT_VA_LAYER_BIT ; write = fault_iova &F_MMU_FAULT_VA_WRITE_BIT ; +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 ; + } + fault_port =F_MMU_INT_ID_PORT_ID (regval);if (MTK_IOMMU_HAS_FLAG (data->plat_data,HAS_SUB_COMM )) { fault_larb =F_MMU_INT_ID_COMM_ID (regval);
@@ -276,7 +289,7 @@ 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%x pa=0x%x larb=%d port=%d layer=%d %s\n" , +"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, layer, write ?"write" :"read" ); }
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v6 23/33 iommu/mediatek: Adjust the structure
In reply to Yong WuAdd "struct mtk_iommu_data *" in the "struct mtk_iommu_domain", reduce the call mtk_iommu_get_m4u_data().
No functional change.
--- drivers/iommu/mtk_iommu.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
drivers/iommu/mtk_iommu.c +11 -9
@@ -126,6 +126,7 @@ struct mtk_iommu_domain {struct io_pgtable_cfg cfg;struct io_pgtable_ops *iop; +struct mtk_iommu_data *data;struct iommu_domain domain; };
@@ -351,6 +352,7 @@ static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom)return -EINVAL ; } + dom->data = data;/* Update our support page sizes bitmap */ dom->domain.pgsize_bitmap = dom->cfg.pgsize_bitmap;return 0 ;
@@ -442,10 +444,9 @@ static int mtk_iommu_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_data *data =mtk_iommu_get_m4u_data ();/* The "4GB mode" M4U physically can not use the lower remap of Dram. */ -if (data->enable_4GB) +if (dom->data->enable_4GB) paddr |=BIT_ULL (32 );/* Synchronize with the tlb_lock */
@@ -468,36 +469,37 @@ static size_t mtk_iommu_unmap(struct iommu_domain *domain,static void mtk_iommu_flush_iotlb_all (struct iommu_domain *domain) { -mtk_iommu_tlb_flush_all (mtk_iommu_get_m4u_data ()); +struct mtk_iommu_domain *dom =to_mtk_domain (domain); + +mtk_iommu_tlb_flush_all (dom->data); }static void mtk_iommu_iotlb_sync (struct iommu_domain *domain,struct iommu_iotlb_gather *gather) { -struct mtk_iommu_data *data =mtk_iommu_get_m4u_data (); +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, - data); + dom->data); }static void mtk_iommu_sync_map (struct iommu_domain *domain,unsigned long iova,size_t size) { -struct mtk_iommu_data *data =mtk_iommu_get_m4u_data (); +struct mtk_iommu_domain *dom =to_mtk_domain (domain); -mtk_iommu_tlb_flush_range_sync (iova, size, size, data); +mtk_iommu_tlb_flush_range_sync (iova, size, size, dom->data); }static phys_addr_t mtk_iommu_iova_to_phys (struct iommu_domain *domain,dma_addr_t iova) {struct mtk_iommu_domain *dom =to_mtk_domain (domain); -struct mtk_iommu_data *data =mtk_iommu_get_m4u_data ();phys_addr_t pa; pa = dom->iop->iova_to_phys (dom->iop, iova); -if (data->enable_4GB && pa >=MTK_IOMMU_4GB_MODE_REMAP_BASE ) +if (dom->data->enable_4GB && pa >=MTK_IOMMU_4GB_MODE_REMAP_BASE ) pa &= ~BIT_ULL (32 );return pa;
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v6 24/33 iommu/mediatek: Move domain_finalise into attach_device
In reply to Yong WuCurrently domain_alloc only has a parameter(type), We have no chance to input some special data. This patch moves the domain_finalise into attach_device which has the device information, then could update the domain's geometry.aperture ranges for each a device.
Strictly, I should use the data from mtk_iommu_get_m4u_data as the parameter of mtk_iommu_domain_finalise in this patch. but dom->data only is used in tlb ops in which the data is get from the m4u_list, thus it is ok here.
--- drivers/iommu/mtk_iommu.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-)
drivers/iommu/mtk_iommu.c +12 -19
@@ -328,10 +328,9 @@ static void mtk_iommu_config(struct mtk_iommu_data *data, } } -static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom) +static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom, + struct mtk_iommu_data *data) { - struct mtk_iommu_data *data = mtk_iommu_get_m4u_data(); - dom->cfg = (struct io_pgtable_cfg) { .quirks = IO_PGTABLE_QUIRK_ARM_NS | IO_PGTABLE_QUIRK_NO_PERMS |
@@ -352,7 +351,6 @@ static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom)return -EINVAL ; } - dom->data = data;/* Update our support page sizes bitmap */ dom->domain.pgsize_bitmap = dom->cfg.pgsize_bitmap;return 0 ;
@@ -369,30 +367,19 @@ static struct iommu_domain *mtk_iommu_domain_alloc(unsigned type)if (!dom)return NULL ; -if (iommu_get_dma_cookie (&dom->domain)) - goto free_dom; - -if (mtk_iommu_domain_finalise (dom)) - goto put_dma_cookie; +if (iommu_get_dma_cookie (&dom->domain)) { +kfree (dom); +return NULL ; + } dom->domain.geometry.aperture_start =0 ; dom->domain.geometry.aperture_end =DMA_BIT_MASK (32 ); dom->domain.geometry.force_aperture = true; -return &dom->domain; - -put_dma_cookie: -iommu_put_dma_cookie (&dom->domain); -free_dom: -kfree (dom); -return NULL ; }static void mtk_iommu_domain_free (struct iommu_domain *domain) { -struct mtk_iommu_domain *dom =to_mtk_domain (domain); - -free_io_pgtable_ops (dom->iop);iommu_put_dma_cookie (domain);kfree (to_mtk_domain (domain)); }
@@ -408,6 +395,12 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,if (!data)return -ENODEV ; +if (!dom->data) { +if (mtk_iommu_domain_finalise (dom, data)) +return -ENODEV ; + dom->data = data; + } +if (!data->m4u_dom) {/* Initialize the M4U HW */ ret =pm_runtime_resume_and_get (m4udev);if (ret <0 )
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v6 25/33 iommu/mediatek: Move geometry.aperture updating into domain_finalise
In reply to Yong WuMove the domain geometry.aperture updating into domain_finalise. This is a preparing patch for updating the domain region. We know the detailed iova region in the attach_device.
--- drivers/iommu/mtk_iommu.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/iommu/mtk_iommu.c +4 -3
@@ -353,6 +353,10 @@ static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom,/* Update our support page sizes bitmap */ dom->domain.pgsize_bitmap = dom->cfg.pgsize_bitmap; + + dom->domain.geometry.aperture_start =0 ; + dom->domain.geometry.aperture_end =DMA_BIT_MASK (32 ); + dom->domain.geometry.force_aperture = true;return 0 ; }
@@ -372,9 +376,6 @@ static struct iommu_domain *mtk_iommu_domain_alloc(unsigned type)return NULL ; } - dom->domain.geometry.aperture_start =0 ; - dom->domain.geometry.aperture_end =DMA_BIT_MASK (32 ); - dom->domain.geometry.force_aperture = true;return &dom->domain; }
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v6 26/33 iommu/mediatek: Add iova_region structure
In reply to Yong WuAdd a new structure for the iova_region. Each a region will be a independent iommu domain.
For the previous SoC, there is single iova region(0~4G). For the SoC that need support multi-domains, there will be several regions.
--- drivers/iommu/mtk_iommu.c | 19 +++++++++++++++++++ drivers/iommu/mtk_iommu.h | 5 +++++ 2 files changed, 24 insertions(+)
drivers/iommu/mtk_iommu.c +19 -0
@@ -167,6 +167,15 @@ static LIST_HEAD(m4ulist); /* List all the M4U HWs */#define for_each_m4u (data) list_for_each_entry(data, &m4ulist, 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 }, +}; +/* * There may be 1 or 2 M4U HWs, But we always expect they are in the same domain * for the performance.
@@ -901,6 +910,8 @@ static const struct mtk_iommu_plat_data mt2712_data = { .m4u_plat = M4U_MT2712, .flags = HAS_4GB_MODE | HAS_BCLK | HAS_VLD_PA_RNG, .inv_sel_reg = REG_MMU_INV_SEL_GEN1, + .iova_region = single_domain, + .iova_region_nr = ARRAY_SIZE(single_domain), .larbid_remap = {{0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}}, };
@@ -908,6 +919,8 @@ static const struct mtk_iommu_plat_data mt6779_data = { .m4u_plat = M4U_MT6779, .flags = HAS_SUB_COMM | OUT_ORDER_WR_EN | WR_THROT_EN, .inv_sel_reg = REG_MMU_INV_SEL_GEN2, + .iova_region = single_domain, + .iova_region_nr = ARRAY_SIZE(single_domain), .larbid_remap = {{0}, {1}, {2}, {3}, {5}, {7, 8}, {10}, {9}}, };
@@ -915,6 +928,8 @@ static const struct mtk_iommu_plat_data mt8167_data = { .m4u_plat = M4U_MT8167, .flags = RESET_AXI | HAS_LEGACY_IVRP_PADDR, .inv_sel_reg = REG_MMU_INV_SEL_GEN1, + .iova_region = single_domain, + .iova_region_nr = ARRAY_SIZE(single_domain), .larbid_remap = {{0}, {1}, {2}}, /* Linear mapping. */ };
@@ -923,6 +938,8 @@ static const struct mtk_iommu_plat_data mt8173_data = { .flags = HAS_4GB_MODE | HAS_BCLK | RESET_AXI | HAS_LEGACY_IVRP_PADDR, .inv_sel_reg = REG_MMU_INV_SEL_GEN1, + .iova_region = single_domain, + .iova_region_nr = ARRAY_SIZE(single_domain), .larbid_remap = {{0}, {1}, {2}, {3}, {4}, {5}}, /* Linear mapping. */ };
@@ -930,6 +947,8 @@ static const struct mtk_iommu_plat_data mt8183_data = { .m4u_plat = M4U_MT8183, .flags = RESET_AXI, .inv_sel_reg = REG_MMU_INV_SEL_GEN1, + .iova_region = single_domain, + .iova_region_nr = ARRAY_SIZE(single_domain), .larbid_remap = {{0}, {4}, {5}, {6}, {7}, {2}, {3}, {1}}, };
drivers/iommu/mtk_iommu.h +5 -0
@@ -45,10 +45,15 @@ enum mtk_iommu_plat { M4U_MT8183, }; +struct mtk_iommu_iova_region ; +struct mtk_iommu_plat_data {enum mtk_iommu_plat m4u_plat;u32 flags;u32 inv_sel_reg; + +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 ]; };
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v6 27/33 iommu/mediatek: Add get_domain_id from dev->dma_range_map
In reply to Yong WuAdd a new interface _get_domain_id from dev->dma_range_map, The iommu consumer device will use dma-ranges in dtsi node to indicate its dma address region requirement. In this iommu driver, we will get the requirement and decide which iova domain it should locate.
In the lastest SoC, there will be several iova-regions(domains), we will compare and calculate which domain is right. If the start/end of device requirement equal some region. it is best fit of course. If it is inside some region, it is also ok. the iova requirement of a device should not be inside two or more regions.
--- drivers/iommu/mtk_iommu.c | 42 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-)
drivers/iommu/mtk_iommu.c +41 -1
@@ -8,6 +8,7 @@#include <linux/clk.h> #include <linux/component.h> #include <linux/device.h> +#include <linux/dma-direct.h> #include <linux/dma-iommu.h> #include <linux/err.h> #include <linux/interrupt.h>
@@ -314,6 +315,36 @@ 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) +{ +const struct mtk_iommu_iova_region *rgn = plat_data->iova_region; +const struct bus_dma_region *dma_rgn = dev->dma_range_map; +int i, candidate =-1 ; +dma_addr_t dma_end; + +if (!dma_rgn || plat_data->iova_region_nr ==1 ) +return 0 ; + + dma_end = dma_rgn->dma_start + dma_rgn->size -1 ; +for (i =0 ; i < plat_data->iova_region_nr; i++, rgn++) { +/* Best fit. */ +if (dma_rgn->dma_start == rgn->iova_base && + dma_end == rgn->iova_base + rgn->size -1 ) +return i; +/* ok if it is inside this region. */ +if (dma_rgn->dma_start >= rgn->iova_base && + dma_end < rgn->iova_base + rgn->size) + candidate = i; + } + +if (candidate >=0 ) +return candidate; +dev_err (dev,"Can NOT find the iommu domain id(%pad 0x%llx).\n" , + &dma_rgn->dma_start, dma_rgn->size); +return -EINVAL ; +} +static void mtk_iommu_config (struct mtk_iommu_data *data,struct device *dev,bool enable) {
@@ -400,11 +431,15 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,struct mtk_iommu_data *data =dev_iommu_priv_get (dev);struct mtk_iommu_domain *dom =to_mtk_domain (domain);struct device *m4udev = data->dev; -int ret; +int ret, domid;if (!data)return -ENODEV ; + domid =mtk_iommu_get_domain_id (dev, data->plat_data); +if (domid <0 ) +return domid; +if (!dom->data) {if (mtk_iommu_domain_finalise (dom, data))return -ENODEV ;
@@ -534,10 +569,15 @@ 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 (); +int domid;if (!data)return ERR_PTR (-ENODEV ); + domid =mtk_iommu_get_domain_id (dev, data->plat_data); +if (domid <0 ) +return ERR_PTR (domid); +/* All the client devices are in the same m4u iommu-group */ if (!data->m4u_group) { data->m4u_group =iommu_group_alloc ();
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v6 28/33 iommu/mediatek: Support for multi domains
In reply to Yong WuSome HW IP(ex: CCU) require the special iova range. That means the iova got from dma_alloc_attrs for that devices must locate in his special range. In this patch, we prepare a iommu group(domain) for each a iova range requirement.
Meanwhile we still use one pagetable which support 16GB iova.
After this patch, If the iova range of a master is over 4G, the master should:
a) Declare its special dma-ranges in its dtsi node. For example, If we preassign the iova 4G-8G for vcodec, then the vcodec dtsi node should add this:
/*
* iova start at 0x1_0000_0000, pa still start at 0x4000_0000
* size is 0x1_0000_0000.
*/
dma-ranges = <0x1 0x0 0x0 0x40000000 0x1 0x0>; /* 4G ~ 8G */
Note: we don't have a actual bus concept here. the master doesn't have its special parent node, thus this dma-ranges can only be put in the master's node.
b) Update the dma_mask:
dma_set_mask_and_coherent(dev, DMA_BIT_MASK(33));
--- drivers/iommu/mtk_iommu.c | 37 ++++++++++++++++++++++++++----------- drivers/iommu/mtk_iommu.h | 4 +++- 2 files changed, 29 insertions(+), 12 deletions(-)
drivers/iommu/mtk_iommu.c +26 -11
@@ -369,8 +369,19 @@ static void mtk_iommu_config(struct mtk_iommu_data *data, } static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom, - struct mtk_iommu_data *data) + struct mtk_iommu_data *data, + 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; + goto update_iova_region; + } + dom->cfg = (struct io_pgtable_cfg) { .quirks = IO_PGTABLE_QUIRK_ARM_NS | IO_PGTABLE_QUIRK_NO_PERMS |
@@ -394,8 +405,11 @@ static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom,/* Update our support page sizes bitmap */ dom->domain.pgsize_bitmap = dom->cfg.pgsize_bitmap; - dom->domain.geometry.aperture_start =0 ; - dom->domain.geometry.aperture_end =DMA_BIT_MASK (32 ); +update_iova_region: +/* Update the iova region for this domain */ + region = data->plat_data->iova_region + domid; + 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;return 0 ; }
@@ -441,7 +455,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,return domid;if (!dom->data) { -if (mtk_iommu_domain_finalise (dom, data)) +if (mtk_iommu_domain_finalise (dom, data, domid))return -ENODEV ; dom->data = data; }
@@ -569,6 +583,7 @@ 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 iommu_group *group;int domid;if (!data)
@@ -578,15 +593,15 @@ static struct iommu_group *mtk_iommu_device_group(struct device *dev)if (domid <0 )return ERR_PTR (domid); -/* All the client devices are in the same m4u iommu-group */ -if (!data->m4u_group) { - data->m4u_group =iommu_group_alloc (); -if (IS_ERR (data->m4u_group)) -dev_err (dev,"Failed to allocate M4U IOMMU group\n" ); + group = data->m4u_group[domid]; +if (!group) { + group =iommu_group_alloc (); +if (!IS_ERR (group)) + data->m4u_group[domid] = group; }else { -iommu_group_ref_get (data->m4u_group); +iommu_group_ref_get (group); } -return data->m4u_group; +return group; }static int mtk_iommu_of_xlate (struct device *dev,struct of_phandle_args *args)
drivers/iommu/mtk_iommu.h +3 -1
@@ -22,6 +22,8 @@#define MTK_LARB_COM_MAX 8#define MTK_LARB_SUBCOM_MAX 4 +#define MTK_IOMMU_GROUP_MAX 8 +struct mtk_iommu_suspend_reg {union {u32 standard_axi_mode;/* v1 */
@@ -67,7 +69,7 @@ struct mtk_iommu_data {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; +struct iommu_group *m4u_group[MTK_IOMMU_GROUP_MAX ];bool enable_4GB;spinlock_t tlb_lock;/* lock for tlb range flush */
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v6 29/33 iommu/mediatek: Add iova reserved function
In reply to Yong WuFor multiple iommu_domains, we need to reserve some iova regions. Take a example, If the default iova region is 0 ~ 4G, but the 0x4000_0000 ~ 0x43ff_ffff is only for the special CCU0 domain. Thus we should exclude this region for the default iova region.
--- drivers/iommu/mtk_iommu.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
drivers/iommu/mtk_iommu.c +31 -0
@@ -626,6 +626,35 @@ static int mtk_iommu_of_xlate(struct device *dev, struct of_phandle_args *args)return iommu_fwspec_add_ids (dev, args->args,1 ); } +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; +const struct mtk_iommu_iova_region *resv, *curdom; +struct iommu_resv_region *region; +int prot =IOMMU_WRITE |IOMMU_READ ; + +if (domid <0 ) +return ; + curdom = data->plat_data->iova_region + domid; +for (i =0 ; i < data->plat_data->iova_region_nr; i++) { + resv = data->plat_data->iova_region + i; + +/* Only reserve when the region is inside the current domain */ +if (resv->iova_base <= curdom->iova_base || + resv->iova_base + resv->size >= curdom->iova_base + curdom->size) +continue ; + + region =iommu_alloc_resv_region (resv->iova_base, resv->size, + prot,IOMMU_RESV_RESERVED ); +if (!region) +return ; + +list_add_tail (®ion->list, head); + } +} +static const struct iommu_ops mtk_iommu_ops = { .domain_alloc = mtk_iommu_domain_alloc, .domain_free = mtk_iommu_domain_free,
@@ -641,6 +670,8 @@ static const struct iommu_ops mtk_iommu_ops = { .release_device = mtk_iommu_release_device, .device_group = mtk_iommu_device_group, .of_xlate = mtk_iommu_of_xlate, + .get_resv_regions = mtk_iommu_get_resv_regions, + .put_resv_regions = generic_iommu_put_resv_regions, .pgsize_bitmap = SZ_4K | SZ_64K | SZ_1M | SZ_16M, };
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v6 30/33 iommu/mediatek: Support master use iova over 32bit
In reply to Yong WuAfter extending v7s, our pagetable already support iova reach 16GB(34bit). the master got the iova via dma_alloc_attrs may reach 34bits, but its HW register still is 32bit. then how to set the bit32/bit33 iova? this depend on a SMI larb setting(bank_sel).
we separate whole 16GB iova to four banks:
bank: 0: 0~4G; 1: 4~8G; 2: 8-12G; 3: 12-16G;
The bank number is (iova >> 32).
We will preassign which bank the larbs belong to. currently we don't have a interface for master to adjust its bank number.
Each a bank is a iova_region which is a independent iommu-domain. the iova range for each iommu-domain can't cross 4G.
--- drivers/iommu/mtk_iommu.c | 18 ++++++++++++------ drivers/memory/mtk-smi.c | 7 +++++++ include/soc/mediatek/smi.h | 1 + 3 files changed, 20 insertions(+), 6 deletions(-)
drivers/iommu/mtk_iommu.c +12 -6
@@ -345,21 +345,27 @@ 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) +static void 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;for (i =0 ; i < fwspec->num_ids; ++i) { larbid =MTK_M4U_TO_LARB (fwspec->ids[i]); portid =MTK_M4U_TO_PORT (fwspec->ids[i]); + larb_mmu = &data->larb_imu[larbid]; -dev_dbg (dev,"%s iommu port: %d\n" , - enable ?"enable" :"disable" , portid); + 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]);if (enable) larb_mmu->mmu |=MTK_SMI_MMU_EN (portid);
@@ -477,7 +483,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,pm_runtime_put (m4udev); } -mtk_iommu_config (data, dev, true); +mtk_iommu_config (data, dev, true, domid);return 0 ; }
@@ -489,7 +495,7 @@ static void mtk_iommu_detach_device(struct iommu_domain *domain,if (!data)return ; -mtk_iommu_config (data, dev, false); +mtk_iommu_config (data, dev, false,0 ); } static int mtk_iommu_map(struct iommu_domain *domain, unsigned long iova,
drivers/memory/mtk-smi.c +7 -0
@@ -44,6 +44,10 @@/* mt2712 */ #define SMI_LARB_NONSEC_CON (id) (0x380 + ((id) * 4))#define F_MMU_EN BIT(0) +#define BANK_SEL (id) ({ \ + u32 _id = (id) & 0x3; \ + (_id << 8 | _id << 10 | _id << 12 | _id << 14); \ +})/* SMI COMMON */ #define SMI_BUS_SEL 0x220
@@ -88,6 +92,7 @@ struct mtk_smi_larb { /* larb: local arbiter */const struct mtk_smi_larb_gen *larb_gen;int larbid;u32 *mmu; +unsigned char *bank; };static int mtk_smi_clk_enable (const struct mtk_smi *smi)
@@ -154,6 +159,7 @@ mtk_smi_larb_bind(struct device *dev, struct device *master, void *data)if (dev == larb_mmu[i].dev) { larb->larbid = i; larb->mmu = &larb_mmu[i].mmu; + larb->bank = larb_mmu[i].bank;return 0 ; } }
@@ -172,6 +178,7 @@ static void mtk_smi_larb_config_port_gen2_general(struct device *dev)for_each_set_bit (i, (unsigned long *)larb->mmu,32 ) { reg =readl_relaxed (larb->base +SMI_LARB_NONSEC_CON (i)); reg |=F_MMU_EN ; + reg |=BANK_SEL (larb->bank[i]);writel (reg, larb->base +SMI_LARB_NONSEC_CON (i)); } }
include/soc/mediatek/smi.h +1 -0
@@ -16,6 +16,7 @@struct mtk_smi_larb_iommu {struct device *dev;unsigned int mmu; +unsigned char bank[32 ]; };/*
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v6 31/33 iommu/mediatek: Remove unnecessary check in attach_device
In reply to Yong WuThis priv_data is set in the of_xlate. if of_xlate failed, it should not enter attach_device. remove the unnecessary check.
--- drivers/iommu/mtk_iommu.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/iommu/mtk_iommu.c +0 -6
@@ -453,9 +453,6 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain,struct device *m4udev = data->dev;int ret, domid; -if (!data) -return -ENODEV ; - domid =mtk_iommu_get_domain_id (dev, data->plat_data);if (domid <0 )return domid;
@@ -492,9 +489,6 @@ static void mtk_iommu_detach_device(struct iommu_domain *domain, {struct mtk_iommu_data *data =dev_iommu_priv_get (dev); -if (!data) -return ; -mtk_iommu_config (data, dev, false,0 ); }
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerPATCH v6 32/33 iommu/mediatek: Add mt8192 support
In reply to Yong WuAdd mt8192 iommu support.
--- drivers/iommu/mtk_iommu.c | 22 ++++++++++++++++++++++ drivers/iommu/mtk_iommu.h | 1 + 2 files changed, 23 insertions(+)
drivers/iommu/mtk_iommu.c +22 -0
@@ -177,6 +177,16 @@ static const struct mtk_iommu_iova_region single_domain[] = { {.iova_base = 0, .size = SZ_4G}, }; +static const struct mtk_iommu_iova_region mt8192_multi_dom[] = { + { .iova_base =0x0 , .size =SZ_4G },/* disp: 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 =0x240000000ULL , .size =0x4000000 },/* CCU0 */ + { .iova_base =0x244000000ULL , .size =0x4000000 },/* CCU1 */ + #endif +}; +/* * There may be 1 or 2 M4U HWs, But we always expect they are in the same domain * for the performance.
@@ -1038,12 +1048,24 @@ static const struct mtk_iommu_plat_data mt8183_data = { .larbid_remap = {{0}, {4}, {5}, {6}, {7}, {2}, {3}, {1}}, }; +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 , + .inv_sel_reg =REG_MMU_INV_SEL_GEN2 , + .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 }, + {0 ,14 ,16 }, {0 ,13 ,18 ,17 }}, +}; +static const struct of_device_id mtk_iommu_of_ids[] = { { .compatible ="mediatek,mt2712-m4u" , .data = &mt2712_data}, { .compatible ="mediatek,mt6779-m4u" , .data = &mt6779_data}, { .compatible ="mediatek,mt8167-m4u" , .data = &mt8167_data}, { .compatible ="mediatek,mt8173-m4u" , .data = &mt8173_data}, { .compatible ="mediatek,mt8183-m4u" , .data = &mt8183_data}, + { .compatible ="mediatek,mt8192-m4u" , .data = &mt8192_data}, {} };
drivers/iommu/mtk_iommu.h +1 -0
@@ -45,6 +45,7 @@ enum mtk_iommu_plat {M4U_MT8167 ,M4U_MT8173 ,M4U_MT8183 , + M4U_MT8192, };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 v6 33/33 MAINTAINERS: Add entry for MediaTek IOMMU
In reply to Yong WuI am the author of MediaTek iommu driver, and will to maintain and develop it further.
Add myself to cover these items.
--- MAINTAINERS | 9 +++++++++ 1 file changed, 9 insertions(+)
MAINTAINERS +9 -0
@@ -11182,6 +11182,15 @@ S: Maintained F: Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt F: drivers/i2c/busses/i2c-mt65xx.c +MEDIATEK IOMMU DRIVER +M: Yong Wu <[email protected]> +L: [email protected] +L: [email protected] (moderated for non-subscribers) +S: Supported +F: Documentation/devicetree/bindings/iommu/mediatek* +F: drivers/iommu/mtk-iommu* +F: include/dt-bindings/memory/mt*-port.h + MEDIATEK JPEG DRIVER M: Rick Chang <[email protected]> M: Bin Liu <[email protected]>
Signature · 6 lines
2.18.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Will Deacon
maintainerQuoted 19 lines · Yong Wu
This patch mainly adds support for mt8192 Multimedia IOMMU and SMI.
mt8192 also is MTK IOMMU gen2 which uses ARM Short-Descriptor translation table format. The M4U-SMI HW diagram is as below:
EMI | M4U | ------------ SMI Common ------------ | +-------+------+------+----------------------+-------+ | | | | ...... | | | | | | | | larb0 larb1 larb2 larb4 ...... larb19 larb20 disp0 disp1 mdp vdec IPE IPE
Quoted 6 lines
All the connections are HW fixed, SW can NOT adjust it.
Comparing with the preview SoC, this patchset mainly adds two new functions:
a) add iova 34 bits support.
b) add multi domains support since several HW has the special iova region requirement.
This is looking good and I'd really like to see it merged, especially as it has changes to the io-pgtable code. Please could you post a new version ASAP to address the comments on patches 6 and 7?
Will
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Hi Yong,
Quoted 29 lines · Yong Wu
This patch mainly adds support for mt8192 Multimedia IOMMU and SMI.
mt8192 also is MTK IOMMU gen2 which uses ARM Short-Descriptor translation table format. The M4U-SMI HW diagram is as below:
EMI | M4U | ------------ SMI Common ------------ | +-------+------+------+----------------------+-------+ | | | | ...... | | | | | | | | larb0 larb1 larb2 larb4 ...... larb19 larb20 disp0 disp1 mdp vdec IPE IPEAll the connections are HW fixed, SW can NOT adjust it.
Comparing with the preview SoC, this patchset mainly adds two new functions:
a) add iova 34 bits support.
b) add multi domains support since several HW has the special iova region requirement.change note:
v6:a) base on v5.11-rc1. and tlb v4:https://lore.kernel.org/linux-mediatek/[email protected]/T/#t
Quoted 13 lines
b) Remove the "domain id" definition in the binding header file. Get the domain from
dev->dma_range_map.
After this, Change many codes flow.
c) the patchset adds a new commonfile(mtk_smi-larb-port.h). This version changes that name intomtk-memory-port.hwhich reflect its file path. This only changes the file name. no other change. thus I keep all the Reviewed-by Tags.
(another reason is that we will add some iommu ports unrelated with
smi-larb)
d) Refactor the power-domain flow suggestted by Tomasz.
e) Some other small fix. use different oas for different soc; Change the macro for 34bit iova tlb flush.
Thanks for the fixes.
I still think the concept of dma-ranges is not quire right for the problem we need to solve here, but it certainly works for the time being and it's possible to remove it in a follow up patch, so I'm fine with merging this as is.
I'll comment on my suggestion for a replacement for the dma-ranges that doesn't need hardcoding arbitrary address ranges in DT in a separate reply.
Best regards,
Tomasz
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Will Deacon
maintainerQuoted 21 lines · Yong Wu
This patch mainly adds support for mt8192 Multimedia IOMMU and SMI.
mt8192 also is MTK IOMMU gen2 which uses ARM Short-Descriptor translation table format. The M4U-SMI HW diagram is as below:
EMI | M4U | ------------ SMI Common ------------ | +-------+------+------+----------------------+-------+ | | | | ...... | | | | | | | | larb0 larb1 larb2 larb4 ...... larb19 larb20 disp0 disp1 mdp vdec IPE IPEAll the connections are HW fixed, SW can NOT adjust it.
Quoted 8 lines
Comparing with the preview SoC, this patchset mainly adds two new functions:
a) add iova 34 bits support.
b) add multi domains support since several HW has the special iova region requirement.change note:
v6:a) base on v5.11-rc1. and tlb v4:https://lore.kernel.org/linux-mediatek/[email protected]/T/#t
I've queued this up apart from patches 6 and 7.
Thanks,
Will
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Yong Wu
maintainerQuoted 27 lines · Will Deacon
Quoted 26 lines · Yong Wu
This patch mainly adds support for mt8192 Multimedia IOMMU and SMI.
mt8192 also is MTK IOMMU gen2 which uses ARM Short-Descriptor translation table format. The M4U-SMI HW diagram is as below:
EMI | M4U | ------------ SMI Common ------------ | +-------+------+------+----------------------+-------+ | | | | ...... | | | | | | | | larb0 larb1 larb2 larb4 ...... larb19 larb20 disp0 disp1 mdp vdec IPE IPEAll the connections are HW fixed, SW can NOT adjust it.
Comparing with the preview SoC, this patchset mainly adds two new functions:
a) add iova 34 bits support.
b) add multi domains support since several HW has the special iova region requirement.
Quoted 5 lines
Quoted 3 lines
change note:
v6:a) base on v5.11-rc1. and tlb v4:https://lore.kernel.org/linux-mediatek/[email protected]/T/#tI've queued this up apart from patches 6 and 7.
Thanks very much for the applying. I'd like to show there is a little conflict with a smi change[1] in /include/soc/mediatek/smi.h.
This is the detailed conflict:
include/soc/mediatek/smi.h +1 -1
@@ -9,7 +9,7 @@#include <linux/bitops.h> #include <linux/device.h> -#ifdef CONFIG_MTK_SMI +#if IS_ENABLED(CONFIG_MTK_SMI) <---The smi patch change here.#define MTK_LARB_NR_MAX 16 <---This iommu patchset delete this line.
This code is simple. Please feel free to tell me how to do this if this is not convenient to merge.
Quoted 4 lines
Thanks,
Will
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Will Deacon
maintainerQuoted 51 lines · Yong Wu
Quoted 27 lines · Will Deacon
Quoted 26 lines · Yong Wu
This patch mainly adds support for mt8192 Multimedia IOMMU and SMI.
mt8192 also is MTK IOMMU gen2 which uses ARM Short-Descriptor translation table format. The M4U-SMI HW diagram is as below:
EMI | M4U | ------------ SMI Common ------------ | +-------+------+------+----------------------+-------+ | | | | ...... | | | | | | | | larb0 larb1 larb2 larb4 ...... larb19 larb20 disp0 disp1 mdp vdec IPE IPEAll the connections are HW fixed, SW can NOT adjust it.
Comparing with the preview SoC, this patchset mainly adds two new functions:
a) add iova 34 bits support.
b) add multi domains support since several HW has the special iova region requirement.Quoted 5 lines
Quoted 3 lines
change note:
v6:a) base on v5.11-rc1. and tlb v4:https://lore.kernel.org/linux-mediatek/[email protected]/T/#tI've queued this up apart from patches 6 and 7.
Thanks very much for the applying. I'd like to show there is a little conflict with a smi change[1] in /include/soc/mediatek/smi.h.
This is the detailed conflict:
include/soc/mediatek/smi.h +1
-1@@ -9,7 +9,7 @@#include <linux/bitops.h> #include <linux/device.h> -#ifdef CONFIG_MTK_SMI +#if IS_ENABLED(CONFIG_MTK_SMI) <---The smi patch change here.#define MTK_LARB_NR_MAX 16 <---This iommu patchset delete this line.
Quoted 2 lines
This code is simple. Please feel free to tell me how to do this if this is not convenient to merge.
Thanks, but this should be trivial to resolve, so I don't think we need to worry about it.
Will
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu