[PATCH] Calgary IOMMU: consolidate per bus data structures

Move the tce_table_kva array, disabled bitmap and bus_to_phb array
into a new per bus 'struct calgary_bus_info'. Also slightly reorganize
build_tce_table and tce_table_setparms to avoid exporting bus_info to
tce.c.

Signed-off-by: Muli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: Jon Mason <jdmason@us.ibm.com>
Signed-off-by: Andi Kleen <ak@suse.de>

1 files changed, 0 insertions, 10 deletions

diff --git a/arch/x86_64/kernel/tce.c b/arch/x86_64/kernel/tce.c
index 0905ce6b9b32..cbabfdf78e06 100644
--- a/arch/x86_64/kernel/tce.c
+++ b/arch/x86_64/kernel/tce.c
@@ -106,14 +106,6 @@ static int tce_table_setparms(struct pci_dev *dev, struct iommu_table *tbl)
         /* set the tce table size - measured in entries */
         tbl->it_size = table_size_to_number_of_entries(specified_table_size);
 
-        tbl->it_base = (unsigned long)tce_table_kva[dev->bus->number];
-        if (!tbl->it_base) {
-                printk(KERN_ERR "Calgary: iommu_table_setparms: "
-                       "no table allocated?!\n");
-                ret = -ENOMEM;
-                goto done;
-        }
-
         /*
          * number of bytes needed for the bitmap size in number of
          * entries; we need one bit per entry
@@ -162,8 +154,6 @@ int build_tce_table(struct pci_dev *dev, void __iomem *bbar)
         if (ret)
                 goto free_tbl;
 
-        tce_free(tbl, 0, tbl->it_size);
-
         tbl->bbar = bbar;
 
         /*