On Thu, Oct 18, 2018 at 06:52:42PM +1100, Alexey Kardashevskiy wrote:
> 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: Alexey Kardashevskiy <aik@xxxxxxxxx>
Reviewed-by: David Gibson <david@xxxxxxxxxxxxxxxxxxxxx>
> ---
>
> Propably should remove all pseries-but-not-lpar code.
> ---
> arch/powerpc/platforms/pseries/iommu.c | 9 ++-------
> 1 file changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
> index cf90582..eae2578 100644
> --- a/arch/powerpc/platforms/pseries/iommu.c
> +++ b/arch/powerpc/platforms/pseries/iommu.c
> @@ -648,7 +648,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;
> @@ -759,10 +758,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;
> }
>
> @@ -773,11 +769,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));
> }
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
Attachment:
signature.asc
Description: PGP signature
