diff options
| author | Gavin Shan | 2014-07-15 09:00:56 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt | 2014-08-05 07:41:16 +0200 |
| commit | a3032ca9f82a588f72130e94b68517b41af31f11 (patch) | |
| tree | e2a77208baa48efd329b0e2b5a5b1f23607534fd /arch/powerpc/kernel/eeh.c | |
| parent | powerpc/powernv: Fix IOMMU table for VFIO dev (diff) | |
| download | kernel-qcow2-linux-a3032ca9f82a588f72130e94b68517b41af31f11.tar.gz kernel-qcow2-linux-a3032ca9f82a588f72130e94b68517b41af31f11.tar.xz kernel-qcow2-linux-a3032ca9f82a588f72130e94b68517b41af31f11.zip | |
powerpc/eeh: Fetch IOMMU table in reliable way
Function eeh_iommu_group_to_pe() iterates each PCI device to check
the binding IOMMU group with get_iommu_table_base(), which possibly
fetches pdev->dev.archdata.dma_data.dma_offset. It's (0x1 << 59)
for "bypass" cases.
The patch fixes the issue by iterating devices hooked to the IOMMU
group and fetch IOMMU table there.
Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel/eeh.c')
| -rw-r--r-- | arch/powerpc/kernel/eeh.c | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c index 18c40fd1e62a..4de2103a30c7 100644 --- a/arch/powerpc/kernel/eeh.c +++ b/arch/powerpc/kernel/eeh.c @@ -27,6 +27,7 @@ #include <linux/init.h> #include <linux/list.h> #include <linux/pci.h> +#include <linux/iommu.h> #include <linux/proc_fs.h> #include <linux/rbtree.h> #include <linux/reboot.h> @@ -1178,6 +1179,24 @@ out: } EXPORT_SYMBOL(eeh_dev_release); +static int dev_has_iommu_table(struct device *dev, void *data) +{ + struct pci_dev *pdev = to_pci_dev(dev); + struct pci_dev **ppdev = data; + struct iommu_table *tbl; + + if (!dev) + return 0; + + tbl = get_iommu_table_base(dev); + if (tbl && tbl->it_group) { + *ppdev = pdev; + return 1; + } + + return 0; +} + /** * eeh_iommu_group_to_pe - Convert IOMMU group to EEH PE * @group: IOMMU group @@ -1186,24 +1205,16 @@ EXPORT_SYMBOL(eeh_dev_release); */ struct eeh_pe *eeh_iommu_group_to_pe(struct iommu_group *group) { - struct iommu_table *tbl; struct pci_dev *pdev = NULL; struct eeh_dev *edev; - bool found = false; + int ret; /* No IOMMU group ? */ if (!group) return NULL; - /* No PCI device ? */ - for_each_pci_dev(pdev) { - tbl = get_iommu_table_base(&pdev->dev); - if (tbl && tbl->it_group == group) { - found = true; - break; - } - } - if (!found) + ret = iommu_group_for_each_dev(group, &pdev, dev_has_iommu_table); + if (!ret || !pdev) return NULL; /* No EEH device or PE ? */ |