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

Commit c409c631 authored by Alexey Kardashevskiy's avatar Alexey Kardashevskiy Committed by Michael Ellerman
Browse files

powerpc/pseries: Remove IOMMU API support for non-LPAR systems 



The pci_dma_bus_setup_pSeries and pci_dma_dev_setup_pSeries hooks are
registered for the pseries platform which does not have FW_FEATURE_LPAR;
these would be pre-powernv platforms which we never supported PCI pass
through for anyway so remove it.

Signed-off-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 3be2df00

arch/powerpc/platforms/pseries/iommu.c

+2 −7
Original line number Diff line number Diff line
@@ -645,7 +645,6 @@ static void pci_dma_bus_setup_pSeries(struct pci_bus *bus) 
	iommu_table_setparms(pci->phb, dn, tbl);

	tbl->it_ops = &iommu_table_pseries_ops;

	iommu_init_table(tbl, pci->phb->node);

	iommu_register_group(pci->table_group, pci_domain_nr(bus), 0);



	/* Divide the rest (1.75GB) among the children */

	pci->phb->dma_window_size = 0x80000000ul;
@@ -756,10 +755,7 @@ static void pci_dma_dev_setup_pSeries(struct pci_dev *dev) 
		iommu_table_setparms(phb, dn, tbl);

		tbl->it_ops = &iommu_table_pseries_ops;

		iommu_init_table(tbl, phb->node);

		iommu_register_group(PCI_DN(dn)->table_group,

				pci_domain_nr(phb->bus), 0);

		set_iommu_table_base(&dev->dev, tbl);

		iommu_add_device(&dev->dev);

		return;

	}
@@ -770,11 +766,10 @@ static void pci_dma_dev_setup_pSeries(struct pci_dev *dev) 
	while (dn && PCI_DN(dn) && PCI_DN(dn)->table_group == NULL)

		dn = dn->parent;



	if (dn && PCI_DN(dn)) {

	if (dn && PCI_DN(dn))

		set_iommu_table_base(&dev->dev,

				PCI_DN(dn)->table_group->tables[0]);

		iommu_add_device(&dev->dev);

	} else

	else

		printk(KERN_WARNING "iommu: Device %s has no iommu table\n",

		       pci_name(dev));

}