OSDN Git Service

powerpc/powernv/ioda1: Remove dead code for a single device PE
authorAlexey Kardashevskiy <aik@ozlabs.ru>
Tue, 16 Oct 2018 02:30:03 +0000 (13:30 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 20 Dec 2018 11:59:03 +0000 (22:59 +1100)
At the moment PNV_IODA_PE_DEV is only used for NPU PEs which are not
present on IODA1 machines (i.e. POWER7) so let's remove a piece of
dead code.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: Sam Bobroff <sbobroff@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/platforms/powernv/pci-ioda.c

index dd80744..f5ffffb 100644 (file)
@@ -2366,15 +2366,7 @@ found:
        pe->table_group.tce32_size = tbl->it_size << tbl->it_page_shift;
        iommu_init_table(tbl, phb->hose->node);
 
-       if (pe->flags & PNV_IODA_PE_DEV) {
-               /*
-                * Setting table base here only for carrying iommu_group
-                * further down to let iommu_add_device() do the job.
-                * pnv_pci_ioda_dma_dev_setup will override it later anyway.
-                */
-               set_iommu_table_base(&pe->pdev->dev, tbl);
-               iommu_add_device(&pe->pdev->dev);
-       } else if (pe->flags & (PNV_IODA_PE_BUS | PNV_IODA_PE_BUS_ALL))
+       if (pe->flags & (PNV_IODA_PE_BUS | PNV_IODA_PE_BUS_ALL))
                pnv_ioda_setup_bus_dma(pe, pe->pbus, true);
 
        return;