x86: remove duplicate includes

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / pci-calgary_64.c

diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
index a50b787b3bfab3a8d9f7ba0079217f1b3a2deae1..21f34db2c03c1efe90fd7ef4dcedc2407dc17e6f 100644 (file)
--- a/arch/x86/kernel/pci-calgary_64.c
+++ b/arch/x86/kernel/pci-calgary_64.c
@@ -30,13 +30,12 @@
 #include <linux/spinlock.h>
 #include <linux/string.h>
 #include <linux/dma-mapping.h>
-#include <linux/init.h>
 #include <linux/bitops.h>
 #include <linux/pci_ids.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/scatterlist.h>
-#include <asm/iommu.h>
+#include <asm/gart.h>
 #include <asm/calgary.h>
 #include <asm/tce.h>
 #include <asm/pci-direct.h>
@@ -183,7 +182,7 @@ static struct calgary_bus_info bus_info[MAX_PHB_BUS_NUM] = { { NULL, 0, 0 }, };
 
 /* enable this to stress test the chip's TCE cache */
 #ifdef CONFIG_IOMMU_DEBUG
-int debugging __read_mostly = 1;
+static int debugging = 1;
 
 static inline unsigned long verify_bit_range(unsigned long* bitmap,
        int expected, unsigned long start, unsigned long end)
@@ -202,7 +201,7 @@ static inline unsigned long verify_bit_range(unsigned long* bitmap,
        return ~0UL;
 }
 #else /* debugging is disabled */
-int debugging __read_mostly = 0;
+static int debugging;
 
 static inline unsigned long verify_bit_range(unsigned long* bitmap,
        int expected, unsigned long start, unsigned long end)
@@ -222,10 +221,10 @@ static inline unsigned int num_dma_pages(unsigned long dma, unsigned int dmalen)
        return npages;
 }
 
-static inline int translate_phb(struct pci_dev* dev)
+static inline int translation_enabled(struct iommu_table *tbl)
 {
-       int disabled = bus_info[dev->bus->number].translation_disabled;
-       return !disabled;
+       /* only PHBs with translation enabled have an IOMMU table */
+       return (tbl != NULL);
 }
 
 static void iommu_range_reserve(struct iommu_table *tbl,
@@ -388,7 +387,7 @@ static void calgary_unmap_sg(struct device *dev,
        struct scatterlist *s;
        int i;
 
-       if (!translate_phb(to_pci_dev(dev)))
+       if (!translation_enabled(tbl))
                return;
 
        for_each_sg(sglist, s, nelems, i) {
@@ -411,8 +410,10 @@ static int calgary_nontranslate_map_sg(struct device* dev,
        int i;
 
        for_each_sg(sg, s, nelems, i) {
-               BUG_ON(!s->page);
-               s->dma_address = virt_to_bus(page_address(s->page) +s->offset);
+               struct page *p = sg_page(s);
+
+               BUG_ON(!p);
+               s->dma_address = virt_to_bus(sg_virt(s));
                s->dma_length = s->length;
        }
        return nelems;
@@ -428,13 +429,13 @@ static int calgary_map_sg(struct device *dev, struct scatterlist *sg,
        unsigned long entry;
        int i;
 
-       if (!translate_phb(to_pci_dev(dev)))
+       if (!translation_enabled(tbl))
                return calgary_nontranslate_map_sg(dev, sg, nelems, direction);
 
        for_each_sg(sg, s, nelems, i) {
-               BUG_ON(!s->page);
+               BUG_ON(!sg_page(s));
 
-               vaddr = (unsigned long)page_address(s->page) + s->offset;
+               vaddr = (unsigned long) sg_virt(s);
                npages = num_dma_pages(vaddr, s->length);
 
                entry = iommu_range_alloc(tbl, npages);
@@ -474,7 +475,7 @@ static dma_addr_t calgary_map_single(struct device *dev, void *vaddr,
        uaddr = (unsigned long)vaddr;
        npages = num_dma_pages(uaddr, size);
 
-       if (translate_phb(to_pci_dev(dev)))
+       if (translation_enabled(tbl))
                dma_handle = iommu_alloc(tbl, vaddr, npages, direction);
        else
                dma_handle = virt_to_bus(vaddr);
@@ -488,7 +489,7 @@ static void calgary_unmap_single(struct device *dev, dma_addr_t dma_handle,
        struct iommu_table *tbl = find_iommu_table(dev);
        unsigned int npages;
 
-       if (!translate_phb(to_pci_dev(dev)))
+       if (!translation_enabled(tbl))
                return;
 
        npages = num_dma_pages(dma_handle, size);
@@ -513,7 +514,7 @@ static void* calgary_alloc_coherent(struct device *dev, size_t size,
                goto error;
        memset(ret, 0, size);
 
-       if (translate_phb(to_pci_dev(dev))) {
+       if (translation_enabled(tbl)) {
                /* set up tces to cover the allocated range */
                mapping = iommu_alloc(tbl, ret, npages, DMA_BIDIRECTIONAL);
                if (mapping == bad_dma_address)
@@ -1194,7 +1195,7 @@ static int __init calgary_init(void)
 {
        int ret;
        struct pci_dev *dev = NULL;
-       void *tce_space;
+       struct calgary_bus_info *info;
 
        ret = calgary_locate_bbars();
        if (ret)
@@ -1206,12 +1207,14 @@ static int __init calgary_init(void)
                        break;
                if (!is_cal_pci_dev(dev->device))
                        continue;
-               if (!translate_phb(dev)) {
+
+               info = &bus_info[dev->bus->number];
+               if (info->translation_disabled) {
                        calgary_init_one_nontraslated(dev);
                        continue;
                }
-               tce_space = bus_info[dev->bus->number].tce_space;
-               if (!tce_space && !translate_empty_slots)
+
+               if (!info->tce_space && !translate_empty_slots)
                        continue;
 
                ret = calgary_init_one(dev);
@@ -1229,11 +1232,13 @@ error:
                        break;
                if (!is_cal_pci_dev(dev->device))
                        continue;
-               if (!translate_phb(dev)) {
+
+               info = &bus_info[dev->bus->number];
+               if (info->translation_disabled) {
                        pci_dev_put(dev);
                        continue;
                }
-               if (!bus_info[dev->bus->number].tce_space && !translate_empty_slots)
+               if (!info->tce_space && !translate_empty_slots)
                        continue;
 
                calgary_disable_translation(dev);
@@ -1546,7 +1551,7 @@ static void __init calgary_fixup_one_tce_space(struct pci_dev *dev)
 static int __init calgary_fixup_tce_spaces(void)
 {
        struct pci_dev *dev = NULL;
-       void *tce_space;
+       struct calgary_bus_info *info;
 
        if (no_iommu || swiotlb || !calgary_detected)
                return -ENODEV;
@@ -1559,11 +1564,12 @@ static int __init calgary_fixup_tce_spaces(void)
                        break;
                if (!is_cal_pci_dev(dev->device))
                        continue;
-               if (!translate_phb(dev))
+
+               info = &bus_info[dev->bus->number];
+               if (info->translation_disabled)
                        continue;
 
-               tce_space = bus_info[dev->bus->number].tce_space;
-               if (!tce_space)
+               if (!info->tce_space)
                        continue;
 
                calgary_fixup_one_tce_space(dev);