Commit 7372cfb8 authored Oct 26, 2010 by Nishanth Aravamudan Committed by Benjamin Herrenschmidt Dec 09, 2010

powerpc/pseries: Do not search for dma-window property on dlpar remove



The iommu_table pointer in the pci auxiliary struct of device_node has
not been used by the iommu ops since the dma refactor of
12d04eef, however this code still uses
it to find tables for dlpar. By only setting the PCI_DN iommu_table
pointer on nodes with dma window properties, we will be able to quickly
find the node for later checks, and can remove the table without looking
for the the dma window property on dlpar remove.

Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

parent b3c73856

arch/powerpc/platforms/pseries/iommu.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -455,9 +455,6 @@ static void pci_dma_bus_setup_pSeriesLP(struct pci_bus *bus)
		ppci->iommu_table = iommu_init_table(tbl, ppci->phb->node);
		pr_debug(" created table: %p\n", ppci->iommu_table);
		}

		if (pdn != dn)
		PCI_DN(dn)->iommu_table = ppci->iommu_table;
		}


		@@ -571,8 +568,7 @@ static int iommu_reconfig_notifier(struct notifier_block *nb, unsigned long acti

		switch (action) {
		case PSERIES_RECONFIG_REMOVE:
		if (pci && pci->iommu_table &&
		of_get_property(np, "ibm,dma-window", NULL))
		if (pci && pci->iommu_table)
		iommu_free_table(pci->iommu_table, np->full_name);
		break;
		default:

Admin message