x86/PCI: Remove dma32_reserve_bootmem

This workaround holds a dma32 buffer at early boot to prevent later
bootmem allocations from stealing it in the case of large RAM configs.

Now that x86 is using memblock, and the nobootmem wrapper does top-down
allocation, it's no longer necessary, so remove it.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index 6761292..d498943 100644 (file)
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -135,8 +135,6 @@ void default_teardown_msi_irqs(struct pci_dev *dev);
 #include "pci_64.h"
 #endif
 
-void dma32_reserve_bootmem(void);
-
 /* implement the pci_ DMA API in terms of the generic device dma_ one */
 #include <asm-generic/pci-dma-compat.h>
 

diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index 9ea999a..b49d00d 100644 (file)
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -68,74 +68,10 @@ int dma_set_mask(struct device *dev, u64 mask)
 }
 EXPORT_SYMBOL(dma_set_mask);
 
-#if defined(CONFIG_X86_64) && !defined(CONFIG_NUMA)
-static __initdata void *dma32_bootmem_ptr;
-static unsigned long dma32_bootmem_size __initdata = (128ULL<<20);
-
-static int __init parse_dma32_size_opt(char *p)
-{
-       if (!p)
-               return -EINVAL;
-       dma32_bootmem_size = memparse(p, &p);
-       return 0;
-}
-early_param("dma32_size", parse_dma32_size_opt);
-
-void __init dma32_reserve_bootmem(void)
-{
-       unsigned long size, align;
-       if (max_pfn <= MAX_DMA32_PFN)
-               return;
-
-       /*
-        * check aperture_64.c allocate_aperture() for reason about
-        * using 512M as goal
-        */
-       align = 64ULL<<20;
-       size = roundup(dma32_bootmem_size, align);
-       dma32_bootmem_ptr = __alloc_bootmem_nopanic(size, align,
-                                512ULL<<20);
-       /*
-        * Kmemleak should not scan this block as it may not be mapped via the
-        * kernel direct mapping.
-        */
-       kmemleak_ignore(dma32_bootmem_ptr);
-       if (dma32_bootmem_ptr)
-               dma32_bootmem_size = size;
-       else
-               dma32_bootmem_size = 0;
-}
-static void __init dma32_free_bootmem(void)
-{
-
-       if (max_pfn <= MAX_DMA32_PFN)
-               return;
-
-       if (!dma32_bootmem_ptr)
-               return;
-
-       free_bootmem(__pa(dma32_bootmem_ptr), dma32_bootmem_size);
-
-       dma32_bootmem_ptr = NULL;
-       dma32_bootmem_size = 0;
-}
-#else
-void __init dma32_reserve_bootmem(void)
-{
-}
-static void __init dma32_free_bootmem(void)
-{
-}
-
-#endif
-
 void __init pci_iommu_alloc(void)
 {
        struct iommu_table_entry *p;
 
-       /* free the range so iommu could get some range less than 4G */
-       dma32_free_bootmem();
-
        sort_iommu_table(__iommu_table, __iommu_table_end);
        check_iommu_entries(__iommu_table, __iommu_table_end);
 

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 4be9b39..cab4f24 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -966,7 +966,6 @@ void __init setup_arch(char **cmdline_p)
 
        initmem_init();
        memblock_find_dma_reserve();
-       dma32_reserve_bootmem();
 
 #ifdef CONFIG_KVM_CLOCK
        kvmclock_init();