x86: unify pci-nommu

merge pci-base_32.c and pci-nommu_64.c into pci-nommu.c
Their code were made the same, so now they can be merged.

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

5 files changed, 11 insertions, 72 deletions

diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 1799f76a6a9..307aee5e8c5 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -24,9 +24,8 @@ obj-$(CONFIG_X86_64)	+= sys_x86_64.o x8664_ksyms_64.o
 obj-$(CONFIG_X86_64)    += syscall_64.o vsyscall_64.o setup64.o
 obj-y                   += pci-dma_$(BITS).o  bootflag.o e820_$(BITS).o
 obj-y                   += pci-dma.o quirks.o i8237.o topology.o kdebugfs.o
-obj-y                   += alternative.o i8253.o
-obj-$(CONFIG_X86_64)    += pci-nommu_64.o bugs_64.o
-obj-$(CONFIG_X86_32)    += pci-base_32.o
+obj-y                   += alternative.o i8253.o pci-nommu.o
+obj-$(CONFIG_X86_64)    += bugs_64.o
 obj-y                   += tsc_$(BITS).o io_delay.o rtc.o
 
 obj-$(CONFIG_X86_TRAMPOLINE)    += trampoline.o
diff --git a/arch/x86/kernel/pci-base_32.c b/arch/x86/kernel/pci-base_32.c
deleted file mode 100644
index b44ea517fcf..00000000000
--- a/arch/x86/kernel/pci-base_32.c
+++ /dev/null
@@ -1,60 +0,0 @@
-#include <linux/mm.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/dma-mapping.h>
-#include <asm/dma-mapping.h>
-
-static dma_addr_t pci32_map_single(struct device *dev, phys_addr_t ptr,
-                                   size_t size, int direction)
-{
-        WARN_ON(size == 0);
-        flush_write_buffers();
-        return ptr;
-}
-
-static int pci32_dma_map_sg(struct device *dev, struct scatterlist *sglist,
-                            int nents, int direction)
-{
-        struct scatterlist *sg;
-        int i;
-
-        WARN_ON(nents == 0 || sglist[0].length == 0);
-
-        for_each_sg(sglist, sg, nents, i) {
-                BUG_ON(!sg_page(sg));
-
-                sg->dma_address = sg_phys(sg);
-                sg->dma_length = sg->length;
-        }
-
-        flush_write_buffers();
-        return nents;
-}
-
-/* Make sure we keep the same behaviour */
-static int pci32_map_error(dma_addr_t dma_addr)
-{
-        return 0;
-}
-
-const struct dma_mapping_ops pci32_dma_ops = {
-        .map_single = pci32_map_single,
-        .unmap_single = NULL,
-        .map_sg = pci32_dma_map_sg,
-        .unmap_sg = NULL,
-        .sync_single_for_cpu = NULL,
-        .sync_single_for_device = NULL,
-        .sync_single_range_for_cpu = NULL,
-        .sync_single_range_for_device = NULL,
-        .sync_sg_for_cpu = NULL,
-        .sync_sg_for_device = NULL,
-        .mapping_error = pci32_map_error,
-};
-
-/* this is temporary */
-int __init no_iommu_init(void)
-{
-        dma_ops = &pci32_dma_ops;
-        return 0;
-}
-fs_initcall(no_iommu_init);
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index 1323cd80387..37a558a9615 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -3,6 +3,14 @@
 const struct dma_mapping_ops *dma_ops;
 EXPORT_SYMBOL(dma_ops);
 
+#ifdef CONFIG_IOMMU_DEBUG
+int panic_on_overflow __read_mostly = 1;
+int force_iommu __read_mostly = 1;
+#else
+int panic_on_overflow __read_mostly = 0;
+int force_iommu __read_mostly = 0;
+#endif
+
 int dma_set_mask(struct device *dev, u64 mask)
 {
         if (!dev->dma_mask || !dma_supported(dev, mask))
diff --git a/arch/x86/kernel/pci-dma_64.c b/arch/x86/kernel/pci-dma_64.c
index e697b865c1a..9ef18bfad2a 100644
--- a/arch/x86/kernel/pci-dma_64.c
+++ b/arch/x86/kernel/pci-dma_64.c
@@ -27,14 +27,6 @@ EXPORT_SYMBOL(iommu_bio_merge);
 static int iommu_sac_force __read_mostly = 0;
 
 int no_iommu __read_mostly;
-#ifdef CONFIG_IOMMU_DEBUG
-int panic_on_overflow __read_mostly = 1;
-int force_iommu __read_mostly = 1;
-#else
-int panic_on_overflow __read_mostly = 0;
-int force_iommu __read_mostly= 0;
-#endif
-
 /* Set this to 1 if there is a HW IOMMU in the system */
 int iommu_detected __read_mostly = 0;
 
diff --git a/arch/x86/kernel/pci-nommu_64.c b/arch/x86/kernel/pci-nommu.c
index 8d036aee2a8..aec43d56f49 100644
--- a/arch/x86/kernel/pci-nommu_64.c
+++ b/arch/x86/kernel/pci-nommu.c
@@ -14,7 +14,7 @@
 static int
 check_addr(char *name, struct device *hwdev, dma_addr_t bus, size_t size)
 {
-        if (hwdev && bus + size > *hwdev->dma_mask) {
+        if (hwdev && bus + size > *hwdev->dma_mask) {
                 if (*hwdev->dma_mask >= DMA_32BIT_MASK)
                         printk(KERN_ERR
                             "nommu_%s: overflow %Lx+%zu of device mask %Lx\n",