--- v6
+++ v5
@@ -9,10 +9,10 @@
  1 file changed, 56 insertions(+), 29 deletions(-)
 
 diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
-index af9208c..8bb5d6d 100644
+index fae8cf6..126d803 100644
 --- a/arch/powerpc/platforms/powernv/pci-ioda.c
 +++ b/arch/powerpc/platforms/powernv/pci-ioda.c
-@@ -1386,6 +1386,57 @@ static void pnv_pci_free_table(struct iommu_table *tbl)
+@@ -1389,6 +1389,57 @@ static void pnv_pci_free_table(struct iommu_table *tbl)
  	memset(tbl, 0, sizeof(struct iommu_table));
  }
  
@@ -70,7 +70,7 @@
  static void pnv_pci_ioda2_set_bypass(struct pnv_ioda_pe *pe, bool enable)
  {
  	uint16_t window_id = (pe->pe_number << 1 ) + 1;
-@@ -1456,7 +1507,6 @@ static struct iommu_table_group_ops pnv_pci_ioda2_ops = {
+@@ -1459,7 +1510,6 @@ static struct iommu_table_group_ops pnv_pci_ioda2_ops = {
  static void pnv_pci_ioda2_setup_dma_pe(struct pnv_phb *phb,
  				       struct pnv_ioda_pe *pe)
  {
@@ -78,8 +78,8 @@
  	unsigned int end;
  	struct iommu_table *tbl = &pe->table_group.tables[0];
  	int64_t rc;
-@@ -1484,31 +1534,14 @@ static void pnv_pci_ioda2_setup_dma_pe(struct pnv_phb *phb,
- 	iommu_init_table(tbl, phb->hose->node);
+@@ -1486,31 +1536,14 @@ static void pnv_pci_ioda2_setup_dma_pe(struct pnv_phb *phb,
+ 	pe->table_group.tables[0].it_group = &pe->table_group;
  	pe->table_group.ops = &pnv_pci_ioda2_ops;
  
 -	/*
@@ -115,7 +115,7 @@
  	}
  	iommu_register_group(&pe->table_group, phb->hose->global_number,
  			pe->pe_number);
-@@ -1522,12 +1555,6 @@ static void pnv_pci_ioda2_setup_dma_pe(struct pnv_phb *phb,
+@@ -1524,12 +1557,6 @@ static void pnv_pci_ioda2_setup_dma_pe(struct pnv_phb *phb,
  	/* Also create a bypass window */
  	if (!pnv_iommu_bypass_disabled)
  		pnv_pci_ioda2_setup_bypass_pe(phb, pe);