| Message ID | cover.b27dedd61e008ffcf55a028ccddda3bb4d21dfc8.1589378833.git-series.maxime@cerno.tech (mailing list archive) |
|---|---|
| Headers | show |
| Series | iommu: Add Allwinner H6 IOMMU driver | expand |
On Wed, May 13, 2020 at 04:07:19PM +0200, Maxime Ripard wrote: > Maxime Ripard (5): > dt-bindings: iommu: Add Allwinner H6 IOMMU bindings > dt-bindings: display: sun8i-mixer: Allow for an iommu property > iommu: Add Allwinner H6 IOMMU driver > arm64: dts: allwinner: h6: Add IOMMU > drm/sun4i: mixer: Call of_dma_configure if there's an IOMMU Applied all to the IOMMU tree, thanks. The code lives in the arm/allwinner branch. Please use 'iommu/sun50i: <Capital Letter>...' as the pattern for your future subject lines when changing the driver. I also have two fixes on-top which I will send out shortly and add to that branch. Regards, Joerg
On Thu, May 14, 2020 at 02:38:55PM +0200, Joerg Roedel wrote: > On Wed, May 13, 2020 at 04:07:19PM +0200, Maxime Ripard wrote: > > Maxime Ripard (5): > > dt-bindings: iommu: Add Allwinner H6 IOMMU bindings > > dt-bindings: display: sun8i-mixer: Allow for an iommu property > > iommu: Add Allwinner H6 IOMMU driver > > arm64: dts: allwinner: h6: Add IOMMU > > drm/sun4i: mixer: Call of_dma_configure if there's an IOMMU > > Applied all to the IOMMU tree, thanks. The code lives in the > arm/allwinner branch. Did you also merge the DTS and DRM patches? Ideally, they should be merged through other trees to avoid the conflicts as much as possible (arm-soc and drm-misc respectively). If it's an option, could you drop all of them but "dt-bindings: iommu: Add Allwinner H6 IOMMU bindings" and "iommu: Add Allwinner H6 IOMMU driver"? > Please use 'iommu/sun50i: <Capital Letter>...' as the pattern for your future > subject lines when changing the driver. I'll try to remember that, thanks! :) > I also have two fixes on-top which I will send out shortly and add to > that branch. Ugh. I'm not sure how the first one slipped through.. Sorry for that, I'm fine with both. Thanks! Maxime
On Thu, May 14, 2020 at 03:09:00PM +0200, Maxime Ripard wrote: > On Thu, May 14, 2020 at 02:38:55PM +0200, Joerg Roedel wrote: > > On Wed, May 13, 2020 at 04:07:19PM +0200, Maxime Ripard wrote: > > > Maxime Ripard (5): > > > dt-bindings: iommu: Add Allwinner H6 IOMMU bindings > > > dt-bindings: display: sun8i-mixer: Allow for an iommu property > > > iommu: Add Allwinner H6 IOMMU driver > > > arm64: dts: allwinner: h6: Add IOMMU > > > drm/sun4i: mixer: Call of_dma_configure if there's an IOMMU > > > > Applied all to the IOMMU tree, thanks. The code lives in the > > arm/allwinner branch. > > Did you also merge the DTS and DRM patches? > > Ideally, they should be merged through other trees to avoid the conflicts as > much as possible (arm-soc and drm-misc respectively). > > If it's an option, could you drop all of them but "dt-bindings: iommu: Add > Allwinner H6 IOMMU bindings" and "iommu: Add Allwinner H6 IOMMU driver"? Okay, just to be on the safe side, I am going to drop: dt-bindings: display: sun8i-mixer: Allow for an iommu property arm64: dts: allwinner: h6: Add IOMMU drm/sun4i: mixer: Call of_dma_configure if there's an IOMMU from the iommu-tree? I took them because you are also maintaining the DRM driver, which counted as an implicit ACK for me :) Joerg
Hi, On Thu, May 14, 2020 at 03:16:47PM +0200, Joerg Roedel wrote: > On Thu, May 14, 2020 at 03:09:00PM +0200, Maxime Ripard wrote: > > On Thu, May 14, 2020 at 02:38:55PM +0200, Joerg Roedel wrote: > > > On Wed, May 13, 2020 at 04:07:19PM +0200, Maxime Ripard wrote: > > > > Maxime Ripard (5): > > > > dt-bindings: iommu: Add Allwinner H6 IOMMU bindings > > > > dt-bindings: display: sun8i-mixer: Allow for an iommu property > > > > iommu: Add Allwinner H6 IOMMU driver > > > > arm64: dts: allwinner: h6: Add IOMMU > > > > drm/sun4i: mixer: Call of_dma_configure if there's an IOMMU > > > > > > Applied all to the IOMMU tree, thanks. The code lives in the > > > arm/allwinner branch. > > > > Did you also merge the DTS and DRM patches? > > > > Ideally, they should be merged through other trees to avoid the conflicts as > > much as possible (arm-soc and drm-misc respectively). > > > > If it's an option, could you drop all of them but "dt-bindings: iommu: Add > > Allwinner H6 IOMMU bindings" and "iommu: Add Allwinner H6 IOMMU driver"? > > Okay, just to be on the safe side, I am going to drop: > > dt-bindings: display: sun8i-mixer: Allow for an iommu property > arm64: dts: allwinner: h6: Add IOMMU > drm/sun4i: mixer: Call of_dma_configure if there's an IOMMU > > from the iommu-tree? Yep, please :) > I took them because you are also maintaining the DRM driver, which > counted as an implicit ACK for me :) I also maintain the DTS patches for that matter, but we have a good number of patches queued up for those files in those trees usually, so it's easier for everyone to avoid the conflicts and just merge them into separate trees when we can. Thanks! Maxime
Hi, Here's a series adding support for the IOMMU introduced in the Allwinner H6. The driver from Allwinner hints at more SoCs using it in the future (with more masters), so we can bet on that IOMMU becoming pretty much standard in new SoCs from Allwinner. One thing I wasn't really sure about was how to expose the statistics reported by the IOMMU PMU (TLB hit rates, latencies, and so on). The Allwinner driver exposes them through custom sysfs files, while they would be best represented through perf I guess? Anyway, I'm planning to support them later on. Patches 1 and 3 should go through the IOMMU tree, 2 and 5 through drm-misc and 4 through arm-soc. Let me know what you think, Maxime Changes from v3: - Rebased on next - Removed PTW flush on map / unmap - Added Rob's reviewed-by Changes from v2: - Rebased on 5.7 - Add dt bindings patch - Allow the identity domain to be allocated - Add an unlikely to the check on whether a PTE already exists in map - Remove locking and adjust the PT installation to use an atomic operation instead - Switch to iotlb_sync / flush_iotlb_all callback instead of flushing by ourselves. Changes from v1: - Add a patch to configure the IOMMU on the virtual DRM device - Rework the domain allocation / freeing - Remove the runtime_pm handling to power up the device and rely on refcounting - use map gfp argument for kmem cache allocation - Removed unused macros - Switched from BIT(0) to 1 for the page table entry valid flag to make it more obvious that it's over multiple bits. - Switch to module_initcall - Make accesses to the fwspec more consistant - Removed dev_info logs - Reworked invalidation / flushing - Allow for compilation with COMPILE_TEST Maxime Ripard (5): dt-bindings: iommu: Add Allwinner H6 IOMMU bindings dt-bindings: display: sun8i-mixer: Allow for an iommu property iommu: Add Allwinner H6 IOMMU driver arm64: dts: allwinner: h6: Add IOMMU drm/sun4i: mixer: Call of_dma_configure if there's an IOMMU Documentation/devicetree/bindings/display/allwinner,sun8i-a83t-de2-mixer.yaml | 3 +- Documentation/devicetree/bindings/iommu/allwinner,sun50i-h6-iommu.yaml | 61 ++++- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 10 +- drivers/gpu/drm/sun4i/sun8i_mixer.c | 13 +- drivers/iommu/Kconfig | 9 +- drivers/iommu/Makefile | 1 +- drivers/iommu/sun50i-iommu.c | 1027 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 7 files changed, 1124 insertions(+) create mode 100644 Documentation/devicetree/bindings/iommu/allwinner,sun50i-h6-iommu.yaml create mode 100644 drivers/iommu/sun50i-iommu.c base-commit: e098d7762d602be640c53565ceca342f81e55ad2