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

Merge tag 'iommu-fixes-v3.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu 

Pull IOMMU fixes from Joerg Roedel:
 "Some fixes and a MAINTAINERS update to remove my lost AMD email
  address from the file.  The fixes take care of a resource leak and a
  problem on VT-d with the new IOMMU group code."

* tag 'iommu-fixes-v3.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  intel-iommu: Fix lookup in add device
  iommu/tegra-smmu.c: fix dentry reference leak in smmu_debugfs_stats_show().
  iommu/amd: Update MAINTAINERS entry
parents ca6215df 3da4af0a

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -526,10 +526,10 @@ F: drivers/video/geode/ 
F:	arch/x86/include/asm/geode.h



AMD IOMMU (AMD-VI)

M:	Joerg Roedel <joerg.roedel@amd.com>

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

L:	iommu@lists.linux-foundation.org

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

S:	Supported

S:	Maintained

F:	drivers/iommu/amd_iommu*.[ch]

F:	include/linux/amd-iommu.h

drivers/iommu/intel-iommu.c

+2 −2
Original line number Diff line number Diff line
@@ -4108,7 +4108,7 @@ static void swap_pci_ref(struct pci_dev **from, struct pci_dev *to) 
static int intel_iommu_add_device(struct device *dev)

{

	struct pci_dev *pdev = to_pci_dev(dev);

	struct pci_dev *bridge, *dma_pdev;

	struct pci_dev *bridge, *dma_pdev = NULL;

	struct iommu_group *group;

	int ret;
@@ -4122,7 +4122,7 @@ static int intel_iommu_add_device(struct device *dev) 
			dma_pdev = pci_get_domain_bus_and_slot(

						pci_domain_nr(pdev->bus),

						bridge->subordinate->number, 0);

		else

		if (!dma_pdev)

			dma_pdev = pci_dev_get(bridge);

	} else

		dma_pdev = pci_dev_get(pdev);

drivers/iommu/tegra-smmu.c

+1 −0
Original line number Diff line number Diff line
@@ -1054,6 +1054,7 @@ static int smmu_debugfs_stats_show(struct seq_file *s, void *v) 
			stats[i], val, offs);

	}

	seq_printf(s, "\n");

	dput(dent);



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE