Commit bc3b8977 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'iommu-fixes-v5.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu 

Pull iommu fixes from Joerg Roedel:

 - Add a new IOMMU mailing list to the MAINTAINERS file to prepare for
   the a list migration happening on July 5th. The old list needs to
   stay in place until the switch happens to guarantee seemless
   archiving of list email.

 - Fix compatible device-tree string for rcar-gen4 in Renesas IOMMU
   driver.

* tag 'iommu-fixes-v5.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  MAINTAINERS: Add new IOMMU development mailing list
  iommu/ipmmu-vmsa: Fix compatible for rcar-gen4
parents 70d605cb c242507c

MAINTAINERS

+11 −0
Original line number Diff line number Diff line
@@ -427,6 +427,7 @@ ACPI VIOT DRIVER 
M:	Jean-Philippe Brucker <jean-philippe@linaro.org>

L:	linux-acpi@vger.kernel.org

L:	iommu@lists.linux-foundation.org

L:	iommu@lists.linux.dev

S:	Maintained

F:	drivers/acpi/viot.c

F:	include/linux/acpi_viot.h
@@ -960,6 +961,7 @@ AMD IOMMU (AMD-VI) 
M:	Joerg Roedel <joro@8bytes.org>

R:	Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>

L:	iommu@lists.linux-foundation.org

L:	iommu@lists.linux.dev

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git

F:	drivers/iommu/amd/
@@ -5976,6 +5978,7 @@ M: Christoph Hellwig <hch@lst.de> 
M:	Marek Szyprowski <m.szyprowski@samsung.com>

R:	Robin Murphy <robin.murphy@arm.com>

L:	iommu@lists.linux-foundation.org

L:	iommu@lists.linux.dev

S:	Supported

W:	http://git.infradead.org/users/hch/dma-mapping.git

T:	git git://git.infradead.org/users/hch/dma-mapping.git
@@ -5988,6 +5991,7 @@ F: kernel/dma/ 
DMA MAPPING BENCHMARK

M:	Xiang Chen <chenxiang66@hisilicon.com>

L:	iommu@lists.linux-foundation.org

L:	iommu@lists.linux.dev

F:	kernel/dma/map_benchmark.c

F:	tools/testing/selftests/dma/








@@ -7572,6 +7576,7 @@ F:	drivers/gpu/drm/exynos/exynos_dp*







EXYNOS SYSMMU (IOMMU) driver









M:	Marek Szyprowski <m.szyprowski@samsung.com>









L:	iommu@lists.linux-foundation.org









L:	iommu@lists.linux.dev









S:	Maintained









F:	drivers/iommu/exynos-iommu.c
















@@ -9991,6 +9996,7 @@ INTEL IOMMU (VT-d)







M:	David Woodhouse <dwmw2@infradead.org>









M:	Lu Baolu <baolu.lu@linux.intel.com>









L:	iommu@lists.linux-foundation.org









L:	iommu@lists.linux.dev









S:	Supported









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git









F:	drivers/iommu/intel/








@@ -10370,6 +10376,7 @@ IOMMU DRIVERS







M:	Joerg Roedel <joro@8bytes.org>









M:	Will Deacon <will@kernel.org>









L:	iommu@lists.linux-foundation.org









L:	iommu@lists.linux.dev









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git









F:	Documentation/devicetree/bindings/iommu/








@@ -12528,6 +12535,7 @@ F:	drivers/i2c/busses/i2c-mt65xx.c







MEDIATEK IOMMU DRIVER









M:	Yong Wu <yong.wu@mediatek.com>









L:	iommu@lists.linux-foundation.org









L:	iommu@lists.linux.dev









L:	linux-mediatek@lists.infradead.org (moderated for non-subscribers)









S:	Supported









F:	Documentation/devicetree/bindings/iommu/mediatek*








@@ -16569,6 +16577,7 @@ F:	drivers/i2c/busses/i2c-qcom-cci.c







QUALCOMM IOMMU









M:	Rob Clark <robdclark@gmail.com>









L:	iommu@lists.linux-foundation.org









L:	iommu@lists.linux.dev









L:	linux-arm-msm@vger.kernel.org









S:	Maintained









F:	drivers/iommu/arm/arm-smmu/qcom_iommu.c








@@ -19194,6 +19203,7 @@ F:	arch/x86/boot/video*







SWIOTLB SUBSYSTEM









M:	Christoph Hellwig <hch@infradead.org>









L:	iommu@lists.linux-foundation.org









L:	iommu@lists.linux.dev









S:	Supported









W:	http://git.infradead.org/users/hch/dma-mapping.git









T:	git git://git.infradead.org/users/hch/dma-mapping.git








@@ -21868,6 +21878,7 @@ M:	Juergen Gross <jgross@suse.com>







M:	Stefano Stabellini <sstabellini@kernel.org>









L:	xen-devel@lists.xenproject.org (moderated for non-subscribers)









L:	iommu@lists.linux-foundation.org









L:	iommu@lists.linux.dev









S:	Supported









F:	arch/x86/xen/*swiotlb*









F:	drivers/xen/*swiotlb*

























drivers/iommu/ipmmu-vmsa.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -987,7 +987,7 @@ static const struct of_device_id ipmmu_of_ids[] = {







		.compatible = "renesas,ipmmu-r8a779a0",









		.data = &ipmmu_features_rcar_gen4,









	}, {









		.compatible = "renesas,rcar-gen4-ipmmu",









		.compatible = "renesas,rcar-gen4-ipmmu-vmsa",









		.data = &ipmmu_features_rcar_gen4,









	}, {









		/* Terminator */