powerpc/powernv/ioda2: Rework iommu_table creation

This moves iommu_table creation to the beginning to make following changes
easier to review. This starts using table parameters from the iommu_table
struct.

This should cause no behavioural change.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index ecbc071a143eb50cf39f6bf9eb0de880f7702727..feaba5ecfa975adda2775ea0f614d7d4c047e2f4 100644 (file)
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -2071,13 +2071,23 @@ static void pnv_pci_ioda2_setup_dma_pe(struct pnv_phb *phb,
        addr = page_address(tce_mem);
        memset(addr, 0, tce_table_size);
 
+       /* Setup linux iommu table */
+       pnv_pci_setup_iommu_table(tbl, addr, tce_table_size, 0,
+                       IOMMU_PAGE_SHIFT_4K);
+
+       tbl->it_ops = &pnv_ioda2_iommu_ops;
+       iommu_init_table(tbl, phb->hose->node);
+#ifdef CONFIG_IOMMU_API
+       pe->table_group.ops = &pnv_pci_ioda2_ops;
+#endif
+
        /*
         * Map TCE table through TVT. The TVE index is the PE number
         * shifted by 1 bit for 32-bits DMA space.
         */
        rc = opal_pci_map_pe_dma_window(phb->opal_id, pe->pe_number,
-                                       pe->pe_number << 1, 1, __pa(addr),
-                                       tce_table_size, 0x1000);
+                       pe->pe_number << 1, 1, __pa(tbl->it_base),
+                       tbl->it_size << 3, 1ULL << tbl->it_page_shift);
        if (rc) {
                pe_err(pe, "Failed to configure 32-bit TCE table,"
                       " err %ld\n", rc);
@@ -2086,20 +2096,10 @@ static void pnv_pci_ioda2_setup_dma_pe(struct pnv_phb *phb,
 
        pnv_pci_ioda2_tce_invalidate_entire(pe);
 
-       /* Setup linux iommu table */
-       pnv_pci_setup_iommu_table(tbl, addr, tce_table_size, 0,
-                       IOMMU_PAGE_SHIFT_4K);
-
        /* OPAL variant of PHB3 invalidated TCEs */
        if (phb->ioda.tce_inval_reg)
                tbl->it_type |= (TCE_PCI_SWINV_CREATE | TCE_PCI_SWINV_FREE);
 
-       tbl->it_ops = &pnv_ioda2_iommu_ops;
-       iommu_init_table(tbl, phb->hose->node);
-#ifdef CONFIG_IOMMU_API
-       pe->table_group.ops = &pnv_pci_ioda2_ops;
-#endif
-
        if (pe->flags & PNV_IODA_PE_DEV) {
                /*
                 * Setting table base here only for carrying iommu_group