Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3032ca9 authored by Gavin Shan's avatar Gavin Shan Committed by Benjamin Herrenschmidt
Browse files

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: default avatarGavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent dff4a39e

arch/powerpc/kernel/eeh.c

+22 −11
Original line number Diff line number Diff line
@@ -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 @@ void eeh_dev_release(struct pci_dev *pdev) 
}

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 ? */