[POWERPC] node local IOMMU tables

Allocate IOMMU tables local to the relevant node.

Signed-off-by: Anton Blanchard <anton@samba.org>
Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>

2 files changed, 14 insertions, 11 deletions

diff --git a/arch/powerpc/platforms/iseries/iommu.c b/arch/powerpc/platforms/iseries/iommu.c
index a992f6af249f..e3bd2015f2c9 100644
--- a/arch/powerpc/platforms/iseries/iommu.c
+++ b/arch/powerpc/platforms/iseries/iommu.c
@@ -173,7 +173,7 @@ void iommu_devnode_init_iSeries(struct device_node *dn)
         /* Look for existing tce table */
         pdn->iommu_table = iommu_table_find(tbl);
         if (pdn->iommu_table == NULL)
-                pdn->iommu_table = iommu_init_table(tbl);
+                pdn->iommu_table = iommu_init_table(tbl, -1);
         else
                 kfree(tbl);
 }
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index 44a507e6fb34..2f66dc6503ff 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -368,10 +368,11 @@ static void iommu_bus_setup_pSeries(struct pci_bus *bus)
         pci->phb->dma_window_size = 0x8000000ul;
         pci->phb->dma_window_base_cur = 0x8000000ul;
 
-        tbl = kmalloc(sizeof(struct iommu_table), GFP_KERNEL);
+        tbl = kmalloc_node(sizeof(struct iommu_table), GFP_KERNEL,
+                           pci->phb->node);
 
         iommu_table_setparms(pci->phb, dn, tbl);
-        pci->iommu_table = iommu_init_table(tbl);
+        pci->iommu_table = iommu_init_table(tbl, pci->phb->node);
 
         /* Divide the rest (1.75GB) among the children */
         pci->phb->dma_window_size = 0x80000000ul;
@@ -414,12 +415,12 @@ static void iommu_bus_setup_pSeriesLP(struct pci_bus *bus)
 
                 ppci->bussubno = bus->number;
 
-                tbl = (struct iommu_table *)kmalloc(sizeof(struct iommu_table),
-                                                    GFP_KERNEL);
+                tbl = kmalloc_node(sizeof(struct iommu_table), GFP_KERNEL,
+                                   ppci->phb->node);
 
                 iommu_table_setparms_lpar(ppci->phb, pdn, tbl, dma_window);
 
-                ppci->iommu_table = iommu_init_table(tbl);
+                ppci->iommu_table = iommu_init_table(tbl, ppci->phb->node);
         }
 
         if (pdn != dn)
@@ -442,9 +443,11 @@ static void iommu_dev_setup_pSeries(struct pci_dev *dev)
          */
         if (!dev->bus->self) {
                 DBG(" --> first child, no bridge. Allocating iommu table.\n");
-                tbl = kmalloc(sizeof(struct iommu_table), GFP_KERNEL);
+                tbl = kmalloc_node(sizeof(struct iommu_table), GFP_KERNEL,
+                                   PCI_DN(dn)->phb->node);
                 iommu_table_setparms(PCI_DN(dn)->phb, dn, tbl);
-                PCI_DN(mydn)->iommu_table = iommu_init_table(tbl);
+                PCI_DN(dn)->iommu_table = iommu_init_table(tbl,
+                                                PCI_DN(dn)->phb->node);
 
                 return;
         }
@@ -526,12 +529,12 @@ static void iommu_dev_setup_pSeriesLP(struct pci_dev *dev)
                 /* iommu_table_setparms_lpar needs bussubno. */
                 pci->bussubno = pci->phb->bus->number;
 
-                tbl = (struct iommu_table *)kmalloc(sizeof(struct iommu_table),
-                                                    GFP_KERNEL);
+                tbl = kmalloc_node(sizeof(struct iommu_table), GFP_KERNEL,
+                                   pci->phb->node);
 
                 iommu_table_setparms_lpar(pci->phb, pdn, tbl, dma_window);
 
-                pci->iommu_table = iommu_init_table(tbl);
+                pci->iommu_table = iommu_init_table(tbl, pci->phb->node);
         }
 
         if (pdn != dn)