diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2008-03-22 09:13:06 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2008-03-22 14:25:41 -0400 |
commit | 9e9630481ee8ef33f1cce71ce3636169fa37cd49 (patch) | |
tree | 8606ad801c849b96863ad65a94b536bfe09fb7d6 /arch/x86 | |
parent | 028011e1391eab27e7bc113c2ac08d4f55584a75 (diff) |
x86: revert: reserve dma32 early for gart
Revert
commit f62f1fc9ef94f74fda2b456d935ba2da69fa0a40
Author: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Fri Mar 7 15:02:50 2008 -0800
x86: reserve dma32 early for gart
The patch has a dependency on bootmem modifications which are not .25
material that late in the -rc cycle. The problem which is addressed by
the patch is limited to machines with 256G and more memory booted with
NUMA disabled. This is not a .25 regression and the audience which is
affected by this problem is very limited, so it's safer to do the
revert than pulling in intrusive bootmem changes right now.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/pci-dma_64.c | 49 | ||||
-rw-r--r-- | arch/x86/kernel/setup_64.c | 2 |
2 files changed, 0 insertions, 51 deletions
diff --git a/arch/x86/kernel/pci-dma_64.c b/arch/x86/kernel/pci-dma_64.c index 8bc1e185e557..375cb2bc45be 100644 --- a/arch/x86/kernel/pci-dma_64.c +++ b/arch/x86/kernel/pci-dma_64.c | |||
@@ -8,8 +8,6 @@ | |||
8 | #include <linux/pci.h> | 8 | #include <linux/pci.h> |
9 | #include <linux/module.h> | 9 | #include <linux/module.h> |
10 | #include <linux/dmar.h> | 10 | #include <linux/dmar.h> |
11 | #include <linux/bootmem.h> | ||
12 | #include <asm/proto.h> | ||
13 | #include <asm/io.h> | 11 | #include <asm/io.h> |
14 | #include <asm/gart.h> | 12 | #include <asm/gart.h> |
15 | #include <asm/calgary.h> | 13 | #include <asm/calgary.h> |
@@ -288,55 +286,8 @@ static __init int iommu_setup(char *p) | |||
288 | } | 286 | } |
289 | early_param("iommu", iommu_setup); | 287 | early_param("iommu", iommu_setup); |
290 | 288 | ||
291 | static __initdata void *dma32_bootmem_ptr; | ||
292 | static unsigned long dma32_bootmem_size __initdata = (128ULL<<20); | ||
293 | |||
294 | static int __init parse_dma32_size_opt(char *p) | ||
295 | { | ||
296 | if (!p) | ||
297 | return -EINVAL; | ||
298 | dma32_bootmem_size = memparse(p, &p); | ||
299 | return 0; | ||
300 | } | ||
301 | early_param("dma32_size", parse_dma32_size_opt); | ||
302 | |||
303 | void __init dma32_reserve_bootmem(void) | ||
304 | { | ||
305 | unsigned long size, align; | ||
306 | if (end_pfn <= MAX_DMA32_PFN) | ||
307 | return; | ||
308 | |||
309 | align = 64ULL<<20; | ||
310 | size = round_up(dma32_bootmem_size, align); | ||
311 | dma32_bootmem_ptr = __alloc_bootmem_nopanic(size, align, | ||
312 | __pa(MAX_DMA_ADDRESS)); | ||
313 | if (dma32_bootmem_ptr) | ||
314 | dma32_bootmem_size = size; | ||
315 | else | ||
316 | dma32_bootmem_size = 0; | ||
317 | } | ||
318 | static void __init dma32_free_bootmem(void) | ||
319 | { | ||
320 | int node; | ||
321 | |||
322 | if (end_pfn <= MAX_DMA32_PFN) | ||
323 | return; | ||
324 | |||
325 | if (!dma32_bootmem_ptr) | ||
326 | return; | ||
327 | |||
328 | for_each_online_node(node) | ||
329 | free_bootmem_node(NODE_DATA(node), __pa(dma32_bootmem_ptr), | ||
330 | dma32_bootmem_size); | ||
331 | |||
332 | dma32_bootmem_ptr = NULL; | ||
333 | dma32_bootmem_size = 0; | ||
334 | } | ||
335 | |||
336 | void __init pci_iommu_alloc(void) | 289 | void __init pci_iommu_alloc(void) |
337 | { | 290 | { |
338 | /* free the range so iommu could get some range less than 4G */ | ||
339 | dma32_free_bootmem(); | ||
340 | /* | 291 | /* |
341 | * The order of these functions is important for | 292 | * The order of these functions is important for |
342 | * fall-back/fail-over reasons | 293 | * fall-back/fail-over reasons |
diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c index a775fe3de955..7637dc91c79b 100644 --- a/arch/x86/kernel/setup_64.c +++ b/arch/x86/kernel/setup_64.c | |||
@@ -389,8 +389,6 @@ void __init setup_arch(char **cmdline_p) | |||
389 | 389 | ||
390 | early_res_to_bootmem(); | 390 | early_res_to_bootmem(); |
391 | 391 | ||
392 | dma32_reserve_bootmem(); | ||
393 | |||
394 | #ifdef CONFIG_ACPI_SLEEP | 392 | #ifdef CONFIG_ACPI_SLEEP |
395 | /* | 393 | /* |
396 | * Reserve low memory region for sleep support. | 394 | * Reserve low memory region for sleep support. |