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

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

Pull iommu fixes from Joerg Roedel:

 - fix device setup failures in the Intel VT-d driver when the PASID
   table is shared

 - fix Intel VT-d device hot-add failure due to wrong device notifier
   order

 - remove the old IOMMU mailing list from the MAINTAINERS file now that
   it has been retired

* tag 'iommu-fixes-v5.19-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  MAINTAINERS: Remove iommu@lists.linux-foundation.org
  iommu/vt-d: Fix RID2PASID setup/teardown failure
  iommu/vt-d: Fix PCI bus rescan device hot add
parents 2b93fe64 c51b8f85

MAINTAINERS

+0 −11
Original line number Diff line number Diff line
@@ -426,7 +426,6 @@ F: drivers/acpi/*thermal* 
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
@@ -960,7 +959,6 @@ F: drivers/video/fbdev/geode/ 
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
@@ -6055,7 +6053,6 @@ DMA MAPPING HELPERS 
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
@@ -6068,7 +6065,6 @@ 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/








@@ -7653,7 +7649,6 @@ 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








@@ -10078,7 +10073,6 @@ F:	drivers/hid/intel-ish-hid/







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








@@ -10458,7 +10452,6 @@ F:	include/linux/iomap.h







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








@@ -12618,7 +12611,6 @@ 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








@@ -16670,7 +16662,6 @@ 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








@@ -19299,7 +19290,6 @@ 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








@@ -21975,7 +21965,6 @@ XEN SWIOTLB SUBSYSTEM







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*

























drivers/iommu/intel/dmar.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -382,7 +382,7 @@ static int dmar_pci_bus_notifier(struct notifier_block *nb,

















static struct notifier_block dmar_pci_bus_nb = {









	.notifier_call = dmar_pci_bus_notifier,









	.priority = INT_MIN,









	.priority = 1,









};



















static struct dmar_drhd_unit *
































drivers/iommu/intel/iommu.c



+0
−24






























Original line number
Diff line number
Diff line







@@ -320,30 +320,6 @@ EXPORT_SYMBOL_GPL(intel_iommu_gfx_mapped);







DEFINE_SPINLOCK(device_domain_lock);









static LIST_HEAD(device_domain_list);



















/*









 * Iterate over elements in device_domain_list and call the specified









 * callback @fn against each element.









 */









int for_each_device_domain(int (*fn)(struct device_domain_info *info,









				     void *data), void *data)









{









	int ret = 0;









	unsigned long flags;









	struct device_domain_info *info;



















	spin_lock_irqsave(&device_domain_lock, flags);









	list_for_each_entry(info, &device_domain_list, global) {









		ret = fn(info, data);









		if (ret) {









			spin_unlock_irqrestore(&device_domain_lock, flags);









			return ret;









		}









	}









	spin_unlock_irqrestore(&device_domain_lock, flags);



















	return 0;









}



















const struct iommu_ops intel_iommu_ops;



















static bool translation_pre_enabled(struct intel_iommu *iommu)
































drivers/iommu/intel/pasid.c



+3
−66






























Original line number
Diff line number
Diff line







@@ -86,54 +86,6 @@ void vcmd_free_pasid(struct intel_iommu *iommu, u32 pasid)







/*









 * Per device pasid table management:









 */









static inline void









device_attach_pasid_table(struct device_domain_info *info,









			  struct pasid_table *pasid_table)









{









	info->pasid_table = pasid_table;









	list_add(&info->table, &pasid_table->dev);









}



















static inline void









device_detach_pasid_table(struct device_domain_info *info,









			  struct pasid_table *pasid_table)









{









	info->pasid_table = NULL;









	list_del(&info->table);









}



















struct pasid_table_opaque {









	struct pasid_table	**pasid_table;









	int			segment;









	int			bus;









	int			devfn;









};



















static int search_pasid_table(struct device_domain_info *info, void *opaque)









{









	struct pasid_table_opaque *data = opaque;



















	if (info->iommu->segment == data->segment &&









	    info->bus == data->bus &&









	    info->devfn == data->devfn &&









	    info->pasid_table) {









		*data->pasid_table = info->pasid_table;









		return 1;









	}



















	return 0;









}



















static int get_alias_pasid_table(struct pci_dev *pdev, u16 alias, void *opaque)









{









	struct pasid_table_opaque *data = opaque;



















	data->segment = pci_domain_nr(pdev->bus);









	data->bus = PCI_BUS_NUM(alias);









	data->devfn = alias & 0xff;



















	return for_each_device_domain(&search_pasid_table, data);









}



















/*









 * Allocate a pasid table for @dev. It should be called in a








@@ -143,28 +95,18 @@ int intel_pasid_alloc_table(struct device *dev)







{









	struct device_domain_info *info;









	struct pasid_table *pasid_table;









	struct pasid_table_opaque data;









	struct page *pages;









	u32 max_pasid = 0;









	int ret, order;









	int size;









	int order, size;



















	might_sleep();









	info = dev_iommu_priv_get(dev);









	if (WARN_ON(!info || !dev_is_pci(dev) || info->pasid_table))









		return -EINVAL;



















	/* DMA alias device already has a pasid table, use it: */









	data.pasid_table = &pasid_table;









	ret = pci_for_each_dma_alias(to_pci_dev(dev),









				     &get_alias_pasid_table, &data);









	if (ret)









		goto attach_out;



















	pasid_table = kzalloc(sizeof(*pasid_table), GFP_KERNEL);









	if (!pasid_table)









		return -ENOMEM;









	INIT_LIST_HEAD(&pasid_table->dev);



















	if (info->pasid_supported)









		max_pasid = min_t(u32, pci_max_pasids(to_pci_dev(dev)),








@@ -182,9 +124,7 @@ int intel_pasid_alloc_table(struct device *dev)







	pasid_table->table = page_address(pages);









	pasid_table->order = order;









	pasid_table->max_pasid = 1 << (order + PAGE_SHIFT + 3);



















attach_out:









	device_attach_pasid_table(info, pasid_table);









	info->pasid_table = pasid_table;



















	return 0;









}








@@ -202,10 +142,7 @@ void intel_pasid_free_table(struct device *dev)







		return;



















	pasid_table = info->pasid_table;









	device_detach_pasid_table(info, pasid_table);



















	if (!list_empty(&pasid_table->dev))









		return;









	info->pasid_table = NULL;



















	/* Free scalable mode PASID directory tables: */









	dir = pasid_table->table;
































drivers/iommu/intel/pasid.h



+0
−1






























Original line number
Diff line number
Diff line







@@ -74,7 +74,6 @@ struct pasid_table {







	void			*table;		/* pasid table pointer */









	int			order;		/* page order of pasid table */









	u32			max_pasid;	/* max pasid */









	struct list_head	dev;		/* device list */









};



















/* Get PRESENT bit of a PASID directory entry. */