diff options
Diffstat (limited to 'arch/i386/kernel/setup.c')
-rw-r--r-- | arch/i386/kernel/setup.c | 852 |
1 files changed, 12 insertions, 840 deletions
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c index 97bb869307bc..79df6e612dbd 100644 --- a/arch/i386/kernel/setup.c +++ b/arch/i386/kernel/setup.c | |||
@@ -63,9 +63,6 @@ | |||
63 | #include <setup_arch.h> | 63 | #include <setup_arch.h> |
64 | #include <bios_ebda.h> | 64 | #include <bios_ebda.h> |
65 | 65 | ||
66 | /* Forward Declaration. */ | ||
67 | void __init find_max_pfn(void); | ||
68 | |||
69 | /* This value is set up by the early boot code to point to the value | 66 | /* This value is set up by the early boot code to point to the value |
70 | immediately after the boot time page tables. It contains a *physical* | 67 | immediately after the boot time page tables. It contains a *physical* |
71 | address, and must not be in the .bss segment! */ | 68 | address, and must not be in the .bss segment! */ |
@@ -76,11 +73,8 @@ int disable_pse __devinitdata = 0; | |||
76 | /* | 73 | /* |
77 | * Machine setup.. | 74 | * Machine setup.. |
78 | */ | 75 | */ |
79 | 76 | extern struct resource code_resource; | |
80 | #ifdef CONFIG_EFI | 77 | extern struct resource data_resource; |
81 | int efi_enabled = 0; | ||
82 | EXPORT_SYMBOL(efi_enabled); | ||
83 | #endif | ||
84 | 78 | ||
85 | /* cpu data as detected by the assembly code in head.S */ | 79 | /* cpu data as detected by the assembly code in head.S */ |
86 | struct cpuinfo_x86 new_cpu_data __initdata = { 0, 0, 0, 0, -1, 1, 0, 0, -1 }; | 80 | struct cpuinfo_x86 new_cpu_data __initdata = { 0, 0, 0, 0, -1, 1, 0, 0, -1 }; |
@@ -99,12 +93,6 @@ unsigned int machine_submodel_id; | |||
99 | unsigned int BIOS_revision; | 93 | unsigned int BIOS_revision; |
100 | unsigned int mca_pentium_flag; | 94 | unsigned int mca_pentium_flag; |
101 | 95 | ||
102 | /* For PCI or other memory-mapped resources */ | ||
103 | unsigned long pci_mem_start = 0x10000000; | ||
104 | #ifdef CONFIG_PCI | ||
105 | EXPORT_SYMBOL(pci_mem_start); | ||
106 | #endif | ||
107 | |||
108 | /* Boot loader ID as an integer, for the benefit of proc_dointvec */ | 96 | /* Boot loader ID as an integer, for the benefit of proc_dointvec */ |
109 | int bootloader_type; | 97 | int bootloader_type; |
110 | 98 | ||
@@ -134,7 +122,6 @@ struct ist_info ist_info; | |||
134 | defined(CONFIG_X86_SPEEDSTEP_SMI_MODULE) | 122 | defined(CONFIG_X86_SPEEDSTEP_SMI_MODULE) |
135 | EXPORT_SYMBOL(ist_info); | 123 | EXPORT_SYMBOL(ist_info); |
136 | #endif | 124 | #endif |
137 | struct e820map e820; | ||
138 | 125 | ||
139 | extern void early_cpu_init(void); | 126 | extern void early_cpu_init(void); |
140 | extern int root_mountflags; | 127 | extern int root_mountflags; |
@@ -149,516 +136,6 @@ static char command_line[COMMAND_LINE_SIZE]; | |||
149 | 136 | ||
150 | unsigned char __initdata boot_params[PARAM_SIZE]; | 137 | unsigned char __initdata boot_params[PARAM_SIZE]; |
151 | 138 | ||
152 | static struct resource data_resource = { | ||
153 | .name = "Kernel data", | ||
154 | .start = 0, | ||
155 | .end = 0, | ||
156 | .flags = IORESOURCE_BUSY | IORESOURCE_MEM | ||
157 | }; | ||
158 | |||
159 | static struct resource code_resource = { | ||
160 | .name = "Kernel code", | ||
161 | .start = 0, | ||
162 | .end = 0, | ||
163 | .flags = IORESOURCE_BUSY | IORESOURCE_MEM | ||
164 | }; | ||
165 | |||
166 | static struct resource system_rom_resource = { | ||
167 | .name = "System ROM", | ||
168 | .start = 0xf0000, | ||
169 | .end = 0xfffff, | ||
170 | .flags = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM | ||
171 | }; | ||
172 | |||
173 | static struct resource extension_rom_resource = { | ||
174 | .name = "Extension ROM", | ||
175 | .start = 0xe0000, | ||
176 | .end = 0xeffff, | ||
177 | .flags = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM | ||
178 | }; | ||
179 | |||
180 | static struct resource adapter_rom_resources[] = { { | ||
181 | .name = "Adapter ROM", | ||
182 | .start = 0xc8000, | ||
183 | .end = 0, | ||
184 | .flags = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM | ||
185 | }, { | ||
186 | .name = "Adapter ROM", | ||
187 | .start = 0, | ||
188 | .end = 0, | ||
189 | .flags = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM | ||
190 | }, { | ||
191 | .name = "Adapter ROM", | ||
192 | .start = 0, | ||
193 | .end = 0, | ||
194 | .flags = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM | ||
195 | }, { | ||
196 | .name = "Adapter ROM", | ||
197 | .start = 0, | ||
198 | .end = 0, | ||
199 | .flags = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM | ||
200 | }, { | ||
201 | .name = "Adapter ROM", | ||
202 | .start = 0, | ||
203 | .end = 0, | ||
204 | .flags = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM | ||
205 | }, { | ||
206 | .name = "Adapter ROM", | ||
207 | .start = 0, | ||
208 | .end = 0, | ||
209 | .flags = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM | ||
210 | } }; | ||
211 | |||
212 | static struct resource video_rom_resource = { | ||
213 | .name = "Video ROM", | ||
214 | .start = 0xc0000, | ||
215 | .end = 0xc7fff, | ||
216 | .flags = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM | ||
217 | }; | ||
218 | |||
219 | static struct resource video_ram_resource = { | ||
220 | .name = "Video RAM area", | ||
221 | .start = 0xa0000, | ||
222 | .end = 0xbffff, | ||
223 | .flags = IORESOURCE_BUSY | IORESOURCE_MEM | ||
224 | }; | ||
225 | |||
226 | static struct resource standard_io_resources[] = { { | ||
227 | .name = "dma1", | ||
228 | .start = 0x0000, | ||
229 | .end = 0x001f, | ||
230 | .flags = IORESOURCE_BUSY | IORESOURCE_IO | ||
231 | }, { | ||
232 | .name = "pic1", | ||
233 | .start = 0x0020, | ||
234 | .end = 0x0021, | ||
235 | .flags = IORESOURCE_BUSY | IORESOURCE_IO | ||
236 | }, { | ||
237 | .name = "timer0", | ||
238 | .start = 0x0040, | ||
239 | .end = 0x0043, | ||
240 | .flags = IORESOURCE_BUSY | IORESOURCE_IO | ||
241 | }, { | ||
242 | .name = "timer1", | ||
243 | .start = 0x0050, | ||
244 | .end = 0x0053, | ||
245 | .flags = IORESOURCE_BUSY | IORESOURCE_IO | ||
246 | }, { | ||
247 | .name = "keyboard", | ||
248 | .start = 0x0060, | ||
249 | .end = 0x006f, | ||
250 | .flags = IORESOURCE_BUSY | IORESOURCE_IO | ||
251 | }, { | ||
252 | .name = "dma page reg", | ||
253 | .start = 0x0080, | ||
254 | .end = 0x008f, | ||
255 | .flags = IORESOURCE_BUSY | IORESOURCE_IO | ||
256 | }, { | ||
257 | .name = "pic2", | ||
258 | .start = 0x00a0, | ||
259 | .end = 0x00a1, | ||
260 | .flags = IORESOURCE_BUSY | IORESOURCE_IO | ||
261 | }, { | ||
262 | .name = "dma2", | ||
263 | .start = 0x00c0, | ||
264 | .end = 0x00df, | ||
265 | .flags = IORESOURCE_BUSY | IORESOURCE_IO | ||
266 | }, { | ||
267 | .name = "fpu", | ||
268 | .start = 0x00f0, | ||
269 | .end = 0x00ff, | ||
270 | .flags = IORESOURCE_BUSY | IORESOURCE_IO | ||
271 | } }; | ||
272 | |||
273 | #define romsignature(x) (*(unsigned short *)(x) == 0xaa55) | ||
274 | |||
275 | static int __init romchecksum(unsigned char *rom, unsigned long length) | ||
276 | { | ||
277 | unsigned char *p, sum = 0; | ||
278 | |||
279 | for (p = rom; p < rom + length; p++) | ||
280 | sum += *p; | ||
281 | return sum == 0; | ||
282 | } | ||
283 | |||
284 | static void __init probe_roms(void) | ||
285 | { | ||
286 | unsigned long start, length, upper; | ||
287 | unsigned char *rom; | ||
288 | int i; | ||
289 | |||
290 | /* video rom */ | ||
291 | upper = adapter_rom_resources[0].start; | ||
292 | for (start = video_rom_resource.start; start < upper; start += 2048) { | ||
293 | rom = isa_bus_to_virt(start); | ||
294 | if (!romsignature(rom)) | ||
295 | continue; | ||
296 | |||
297 | video_rom_resource.start = start; | ||
298 | |||
299 | /* 0 < length <= 0x7f * 512, historically */ | ||
300 | length = rom[2] * 512; | ||
301 | |||
302 | /* if checksum okay, trust length byte */ | ||
303 | if (length && romchecksum(rom, length)) | ||
304 | video_rom_resource.end = start + length - 1; | ||
305 | |||
306 | request_resource(&iomem_resource, &video_rom_resource); | ||
307 | break; | ||
308 | } | ||
309 | |||
310 | start = (video_rom_resource.end + 1 + 2047) & ~2047UL; | ||
311 | if (start < upper) | ||
312 | start = upper; | ||
313 | |||
314 | /* system rom */ | ||
315 | request_resource(&iomem_resource, &system_rom_resource); | ||
316 | upper = system_rom_resource.start; | ||
317 | |||
318 | /* check for extension rom (ignore length byte!) */ | ||
319 | rom = isa_bus_to_virt(extension_rom_resource.start); | ||
320 | if (romsignature(rom)) { | ||
321 | length = extension_rom_resource.end - extension_rom_resource.start + 1; | ||
322 | if (romchecksum(rom, length)) { | ||
323 | request_resource(&iomem_resource, &extension_rom_resource); | ||
324 | upper = extension_rom_resource.start; | ||
325 | } | ||
326 | } | ||
327 | |||
328 | /* check for adapter roms on 2k boundaries */ | ||
329 | for (i = 0; i < ARRAY_SIZE(adapter_rom_resources) && start < upper; start += 2048) { | ||
330 | rom = isa_bus_to_virt(start); | ||
331 | if (!romsignature(rom)) | ||
332 | continue; | ||
333 | |||
334 | /* 0 < length <= 0x7f * 512, historically */ | ||
335 | length = rom[2] * 512; | ||
336 | |||
337 | /* but accept any length that fits if checksum okay */ | ||
338 | if (!length || start + length > upper || !romchecksum(rom, length)) | ||
339 | continue; | ||
340 | |||
341 | adapter_rom_resources[i].start = start; | ||
342 | adapter_rom_resources[i].end = start + length - 1; | ||
343 | request_resource(&iomem_resource, &adapter_rom_resources[i]); | ||
344 | |||
345 | start = adapter_rom_resources[i++].end & ~2047UL; | ||
346 | } | ||
347 | } | ||
348 | |||
349 | static void __init limit_regions(unsigned long long size) | ||
350 | { | ||
351 | unsigned long long current_addr = 0; | ||
352 | int i; | ||
353 | |||
354 | if (efi_enabled) { | ||
355 | efi_memory_desc_t *md; | ||
356 | void *p; | ||
357 | |||
358 | for (p = memmap.map, i = 0; p < memmap.map_end; | ||
359 | p += memmap.desc_size, i++) { | ||
360 | md = p; | ||
361 | current_addr = md->phys_addr + (md->num_pages << 12); | ||
362 | if (md->type == EFI_CONVENTIONAL_MEMORY) { | ||
363 | if (current_addr >= size) { | ||
364 | md->num_pages -= | ||
365 | (((current_addr-size) + PAGE_SIZE-1) >> PAGE_SHIFT); | ||
366 | memmap.nr_map = i + 1; | ||
367 | return; | ||
368 | } | ||
369 | } | ||
370 | } | ||
371 | } | ||
372 | for (i = 0; i < e820.nr_map; i++) { | ||
373 | current_addr = e820.map[i].addr + e820.map[i].size; | ||
374 | if (current_addr < size) | ||
375 | continue; | ||
376 | |||
377 | if (e820.map[i].type != E820_RAM) | ||
378 | continue; | ||
379 | |||
380 | if (e820.map[i].addr >= size) { | ||
381 | /* | ||
382 | * This region starts past the end of the | ||
383 | * requested size, skip it completely. | ||
384 | */ | ||
385 | e820.nr_map = i; | ||
386 | } else { | ||
387 | e820.nr_map = i + 1; | ||
388 | e820.map[i].size -= current_addr - size; | ||
389 | } | ||
390 | return; | ||
391 | } | ||
392 | } | ||
393 | |||
394 | void __init add_memory_region(unsigned long long start, | ||
395 | unsigned long long size, int type) | ||
396 | { | ||
397 | int x; | ||
398 | |||
399 | if (!efi_enabled) { | ||
400 | x = e820.nr_map; | ||
401 | |||
402 | if (x == E820MAX) { | ||
403 | printk(KERN_ERR "Ooops! Too many entries in the memory map!\n"); | ||
404 | return; | ||
405 | } | ||
406 | |||
407 | e820.map[x].addr = start; | ||
408 | e820.map[x].size = size; | ||
409 | e820.map[x].type = type; | ||
410 | e820.nr_map++; | ||
411 | } | ||
412 | } /* add_memory_region */ | ||
413 | |||
414 | #define E820_DEBUG 1 | ||
415 | |||
416 | static void __init print_memory_map(char *who) | ||
417 | { | ||
418 | int i; | ||
419 | |||
420 | for (i = 0; i < e820.nr_map; i++) { | ||
421 | printk(" %s: %016Lx - %016Lx ", who, | ||
422 | e820.map[i].addr, | ||
423 | e820.map[i].addr + e820.map[i].size); | ||
424 | switch (e820.map[i].type) { | ||
425 | case E820_RAM: printk("(usable)\n"); | ||
426 | break; | ||
427 | case E820_RESERVED: | ||
428 | printk("(reserved)\n"); | ||
429 | break; | ||
430 | case E820_ACPI: | ||
431 | printk("(ACPI data)\n"); | ||
432 | break; | ||
433 | case E820_NVS: | ||
434 | printk("(ACPI NVS)\n"); | ||
435 | break; | ||
436 | default: printk("type %lu\n", e820.map[i].type); | ||
437 | break; | ||
438 | } | ||
439 | } | ||
440 | } | ||
441 | |||
442 | /* | ||
443 | * Sanitize the BIOS e820 map. | ||
444 | * | ||
445 | * Some e820 responses include overlapping entries. The following | ||
446 | * replaces the original e820 map with a new one, removing overlaps. | ||
447 | * | ||
448 | */ | ||
449 | struct change_member { | ||
450 | struct e820entry *pbios; /* pointer to original bios entry */ | ||
451 | unsigned long long addr; /* address for this change point */ | ||
452 | }; | ||
453 | static struct change_member change_point_list[2*E820MAX] __initdata; | ||
454 | static struct change_member *change_point[2*E820MAX] __initdata; | ||
455 | static struct e820entry *overlap_list[E820MAX] __initdata; | ||
456 | static struct e820entry new_bios[E820MAX] __initdata; | ||
457 | |||
458 | int __init sanitize_e820_map(struct e820entry * biosmap, char * pnr_map) | ||
459 | { | ||
460 | struct change_member *change_tmp; | ||
461 | unsigned long current_type, last_type; | ||
462 | unsigned long long last_addr; | ||
463 | int chgidx, still_changing; | ||
464 | int overlap_entries; | ||
465 | int new_bios_entry; | ||
466 | int old_nr, new_nr, chg_nr; | ||
467 | int i; | ||
468 | |||
469 | /* | ||
470 | Visually we're performing the following (1,2,3,4 = memory types)... | ||
471 | |||
472 | Sample memory map (w/overlaps): | ||
473 | ____22__________________ | ||
474 | ______________________4_ | ||
475 | ____1111________________ | ||
476 | _44_____________________ | ||
477 | 11111111________________ | ||
478 | ____________________33__ | ||
479 | ___________44___________ | ||
480 | __________33333_________ | ||
481 | ______________22________ | ||
482 | ___________________2222_ | ||
483 | _________111111111______ | ||
484 | _____________________11_ | ||
485 | _________________4______ | ||
486 | |||
487 | Sanitized equivalent (no overlap): | ||
488 | 1_______________________ | ||
489 | _44_____________________ | ||
490 | ___1____________________ | ||
491 | ____22__________________ | ||
492 | ______11________________ | ||
493 | _________1______________ | ||
494 | __________3_____________ | ||
495 | ___________44___________ | ||
496 | _____________33_________ | ||
497 | _______________2________ | ||
498 | ________________1_______ | ||
499 | _________________4______ | ||
500 | ___________________2____ | ||
501 | ____________________33__ | ||
502 | ______________________4_ | ||
503 | */ | ||
504 | |||
505 | /* if there's only one memory region, don't bother */ | ||
506 | if (*pnr_map < 2) | ||
507 | return -1; | ||
508 | |||
509 | old_nr = *pnr_map; | ||
510 | |||
511 | /* bail out if we find any unreasonable addresses in bios map */ | ||
512 | for (i=0; i<old_nr; i++) | ||
513 | if (biosmap[i].addr + biosmap[i].size < biosmap[i].addr) | ||
514 | return -1; | ||
515 | |||
516 | /* create pointers for initial change-point information (for sorting) */ | ||
517 | for (i=0; i < 2*old_nr; i++) | ||
518 | change_point[i] = &change_point_list[i]; | ||
519 | |||
520 | /* record all known change-points (starting and ending addresses), | ||
521 | omitting those that are for empty memory regions */ | ||
522 | chgidx = 0; | ||
523 | for (i=0; i < old_nr; i++) { | ||
524 | if (biosmap[i].size != 0) { | ||
525 | change_point[chgidx]->addr = biosmap[i].addr; | ||
526 | change_point[chgidx++]->pbios = &biosmap[i]; | ||
527 | change_point[chgidx]->addr = biosmap[i].addr + biosmap[i].size; | ||
528 | change_point[chgidx++]->pbios = &biosmap[i]; | ||
529 | } | ||
530 | } | ||
531 | chg_nr = chgidx; /* true number of change-points */ | ||
532 | |||
533 | /* sort change-point list by memory addresses (low -> high) */ | ||
534 | still_changing = 1; | ||
535 | while (still_changing) { | ||
536 | still_changing = 0; | ||
537 | for (i=1; i < chg_nr; i++) { | ||
538 | /* if <current_addr> > <last_addr>, swap */ | ||
539 | /* or, if current=<start_addr> & last=<end_addr>, swap */ | ||
540 | if ((change_point[i]->addr < change_point[i-1]->addr) || | ||
541 | ((change_point[i]->addr == change_point[i-1]->addr) && | ||
542 | (change_point[i]->addr == change_point[i]->pbios->addr) && | ||
543 | (change_point[i-1]->addr != change_point[i-1]->pbios->addr)) | ||
544 | ) | ||
545 | { | ||
546 | change_tmp = change_point[i]; | ||
547 | change_point[i] = change_point[i-1]; | ||
548 | change_point[i-1] = change_tmp; | ||
549 | still_changing=1; | ||
550 | } | ||
551 | } | ||
552 | } | ||
553 | |||
554 | /* create a new bios memory map, removing overlaps */ | ||
555 | overlap_entries=0; /* number of entries in the overlap table */ | ||
556 | new_bios_entry=0; /* index for creating new bios map entries */ | ||
557 | last_type = 0; /* start with undefined memory type */ | ||
558 | last_addr = 0; /* start with 0 as last starting address */ | ||
559 | /* loop through change-points, determining affect on the new bios map */ | ||
560 | for (chgidx=0; chgidx < chg_nr; chgidx++) | ||
561 | { | ||
562 | /* keep track of all overlapping bios entries */ | ||
563 | if (change_point[chgidx]->addr == change_point[chgidx]->pbios->addr) | ||
564 | { | ||
565 | /* add map entry to overlap list (> 1 entry implies an overlap) */ | ||
566 | overlap_list[overlap_entries++]=change_point[chgidx]->pbios; | ||
567 | } | ||
568 | else | ||
569 | { | ||
570 | /* remove entry from list (order independent, so swap with last) */ | ||
571 | for (i=0; i<overlap_entries; i++) | ||
572 | { | ||
573 | if (overlap_list[i] == change_point[chgidx]->pbios) | ||
574 | overlap_list[i] = overlap_list[overlap_entries-1]; | ||
575 | } | ||
576 | overlap_entries--; | ||
577 | } | ||
578 | /* if there are overlapping entries, decide which "type" to use */ | ||
579 | /* (larger value takes precedence -- 1=usable, 2,3,4,4+=unusable) */ | ||
580 | current_type = 0; | ||
581 | for (i=0; i<overlap_entries; i++) | ||
582 | if (overlap_list[i]->type > current_type) | ||
583 | current_type = overlap_list[i]->type; | ||
584 | /* continue building up new bios map based on this information */ | ||
585 | if (current_type != last_type) { | ||
586 | if (last_type != 0) { | ||
587 | new_bios[new_bios_entry].size = | ||
588 | change_point[chgidx]->addr - last_addr; | ||
589 | /* move forward only if the new size was non-zero */ | ||
590 | if (new_bios[new_bios_entry].size != 0) | ||
591 | if (++new_bios_entry >= E820MAX) | ||
592 | break; /* no more space left for new bios entries */ | ||
593 | } | ||
594 | if (current_type != 0) { | ||
595 | new_bios[new_bios_entry].addr = change_point[chgidx]->addr; | ||
596 | new_bios[new_bios_entry].type = current_type; | ||
597 | last_addr=change_point[chgidx]->addr; | ||
598 | } | ||
599 | last_type = current_type; | ||
600 | } | ||
601 | } | ||
602 | new_nr = new_bios_entry; /* retain count for new bios entries */ | ||
603 | |||
604 | /* copy new bios mapping into original location */ | ||
605 | memcpy(biosmap, new_bios, new_nr*sizeof(struct e820entry)); | ||
606 | *pnr_map = new_nr; | ||
607 | |||
608 | return 0; | ||
609 | } | ||
610 | |||
611 | /* | ||
612 | * Copy the BIOS e820 map into a safe place. | ||
613 | * | ||
614 | * Sanity-check it while we're at it.. | ||
615 | * | ||
616 | * If we're lucky and live on a modern system, the setup code | ||
617 | * will have given us a memory map that we can use to properly | ||
618 | * set up memory. If we aren't, we'll fake a memory map. | ||
619 | * | ||
620 | * We check to see that the memory map contains at least 2 elements | ||
621 | * before we'll use it, because the detection code in setup.S may | ||
622 | * not be perfect and most every PC known to man has two memory | ||
623 | * regions: one from 0 to 640k, and one from 1mb up. (The IBM | ||
624 | * thinkpad 560x, for example, does not cooperate with the memory | ||
625 | * detection code.) | ||
626 | */ | ||
627 | int __init copy_e820_map(struct e820entry * biosmap, int nr_map) | ||
628 | { | ||
629 | /* Only one memory region (or negative)? Ignore it */ | ||
630 | if (nr_map < 2) | ||
631 | return -1; | ||
632 | |||
633 | do { | ||
634 | unsigned long long start = biosmap->addr; | ||
635 | unsigned long long size = biosmap->size; | ||
636 | unsigned long long end = start + size; | ||
637 | unsigned long type = biosmap->type; | ||
638 | |||
639 | /* Overflow in 64 bits? Ignore the memory map. */ | ||
640 | if (start > end) | ||
641 | return -1; | ||
642 | |||
643 | /* | ||
644 | * Some BIOSes claim RAM in the 640k - 1M region. | ||
645 | * Not right. Fix it up. | ||
646 | */ | ||
647 | if (type == E820_RAM) { | ||
648 | if (start < 0x100000ULL && end > 0xA0000ULL) { | ||
649 | if (start < 0xA0000ULL) | ||
650 | add_memory_region(start, 0xA0000ULL-start, type); | ||
651 | if (end <= 0x100000ULL) | ||
652 | continue; | ||
653 | start = 0x100000ULL; | ||
654 | size = end - start; | ||
655 | } | ||
656 | } | ||
657 | add_memory_region(start, size, type); | ||
658 | } while (biosmap++,--nr_map); | ||
659 | return 0; | ||
660 | } | ||
661 | |||
662 | #if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE) | 139 | #if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE) |
663 | struct edd edd; | 140 | struct edd edd; |
664 | #ifdef CONFIG_EDD_MODULE | 141 | #ifdef CONFIG_EDD_MODULE |
@@ -682,7 +159,7 @@ static inline void copy_edd(void) | |||
682 | } | 159 | } |
683 | #endif | 160 | #endif |
684 | 161 | ||
685 | static int __initdata user_defined_memmap = 0; | 162 | int __initdata user_defined_memmap = 0; |
686 | 163 | ||
687 | /* | 164 | /* |
688 | * "mem=nopentium" disables the 4MB page tables. | 165 | * "mem=nopentium" disables the 4MB page tables. |
@@ -719,51 +196,6 @@ static int __init parse_mem(char *arg) | |||
719 | } | 196 | } |
720 | early_param("mem", parse_mem); | 197 | early_param("mem", parse_mem); |
721 | 198 | ||
722 | static int __init parse_memmap(char *arg) | ||
723 | { | ||
724 | if (!arg) | ||
725 | return -EINVAL; | ||
726 | |||
727 | if (strcmp(arg, "exactmap") == 0) { | ||
728 | #ifdef CONFIG_CRASH_DUMP | ||
729 | /* If we are doing a crash dump, we | ||
730 | * still need to know the real mem | ||
731 | * size before original memory map is | ||
732 | * reset. | ||
733 | */ | ||
734 | find_max_pfn(); | ||
735 | saved_max_pfn = max_pfn; | ||
736 | #endif | ||
737 | e820.nr_map = 0; | ||
738 | user_defined_memmap = 1; | ||
739 | } else { | ||
740 | /* If the user specifies memory size, we | ||
741 | * limit the BIOS-provided memory map to | ||
742 | * that size. exactmap can be used to specify | ||
743 | * the exact map. mem=number can be used to | ||
744 | * trim the existing memory map. | ||
745 | */ | ||
746 | unsigned long long start_at, mem_size; | ||
747 | |||
748 | mem_size = memparse(arg, &arg); | ||
749 | if (*arg == '@') { | ||
750 | start_at = memparse(arg+1, &arg); | ||
751 | add_memory_region(start_at, mem_size, E820_RAM); | ||
752 | } else if (*arg == '#') { | ||
753 | start_at = memparse(arg+1, &arg); | ||
754 | add_memory_region(start_at, mem_size, E820_ACPI); | ||
755 | } else if (*arg == '$') { | ||
756 | start_at = memparse(arg+1, &arg); | ||
757 | add_memory_region(start_at, mem_size, E820_RESERVED); | ||
758 | } else { | ||
759 | limit_regions(mem_size); | ||
760 | user_defined_memmap = 1; | ||
761 | } | ||
762 | } | ||
763 | return 0; | ||
764 | } | ||
765 | early_param("memmap", parse_memmap); | ||
766 | |||
767 | #ifdef CONFIG_PROC_VMCORE | 199 | #ifdef CONFIG_PROC_VMCORE |
768 | /* elfcorehdr= specifies the location of elf core header | 200 | /* elfcorehdr= specifies the location of elf core header |
769 | * stored by the crashed kernel. | 201 | * stored by the crashed kernel. |
@@ -828,90 +260,6 @@ static int __init parse_reservetop(char *arg) | |||
828 | early_param("reservetop", parse_reservetop); | 260 | early_param("reservetop", parse_reservetop); |
829 | 261 | ||
830 | /* | 262 | /* |
831 | * Callback for efi_memory_walk. | ||
832 | */ | ||
833 | static int __init | ||
834 | efi_find_max_pfn(unsigned long start, unsigned long end, void *arg) | ||
835 | { | ||
836 | unsigned long *max_pfn = arg, pfn; | ||
837 | |||
838 | if (start < end) { | ||
839 | pfn = PFN_UP(end -1); | ||
840 | if (pfn > *max_pfn) | ||
841 | *max_pfn = pfn; | ||
842 | } | ||
843 | return 0; | ||
844 | } | ||
845 | |||
846 | static int __init | ||
847 | efi_memory_present_wrapper(unsigned long start, unsigned long end, void *arg) | ||
848 | { | ||
849 | memory_present(0, PFN_UP(start), PFN_DOWN(end)); | ||
850 | return 0; | ||
851 | } | ||
852 | |||
853 | /* | ||
854 | * This function checks if the entire range <start,end> is mapped with type. | ||
855 | * | ||
856 | * Note: this function only works correct if the e820 table is sorted and | ||
857 | * not-overlapping, which is the case | ||
858 | */ | ||
859 | int __init | ||
860 | e820_all_mapped(unsigned long s, unsigned long e, unsigned type) | ||
861 | { | ||
862 | u64 start = s; | ||
863 | u64 end = e; | ||
864 | int i; | ||
865 | for (i = 0; i < e820.nr_map; i++) { | ||
866 | struct e820entry *ei = &e820.map[i]; | ||
867 | if (type && ei->type != type) | ||
868 | continue; | ||
869 | /* is the region (part) in overlap with the current region ?*/ | ||
870 | if (ei->addr >= end || ei->addr + ei->size <= start) | ||
871 | continue; | ||
872 | /* if the region is at the beginning of <start,end> we move | ||
873 | * start to the end of the region since it's ok until there | ||
874 | */ | ||
875 | if (ei->addr <= start) | ||
876 | start = ei->addr + ei->size; | ||
877 | /* if start is now at or beyond end, we're done, full | ||
878 | * coverage */ | ||
879 | if (start >= end) | ||
880 | return 1; /* we're done */ | ||
881 | } | ||
882 | return 0; | ||
883 | } | ||
884 | |||
885 | /* | ||
886 | * Find the highest page frame number we have available | ||
887 | */ | ||
888 | void __init find_max_pfn(void) | ||
889 | { | ||
890 | int i; | ||
891 | |||
892 | max_pfn = 0; | ||
893 | if (efi_enabled) { | ||
894 | efi_memmap_walk(efi_find_max_pfn, &max_pfn); | ||
895 | efi_memmap_walk(efi_memory_present_wrapper, NULL); | ||
896 | return; | ||
897 | } | ||
898 | |||
899 | for (i = 0; i < e820.nr_map; i++) { | ||
900 | unsigned long start, end; | ||
901 | /* RAM? */ | ||
902 | if (e820.map[i].type != E820_RAM) | ||
903 | continue; | ||
904 | start = PFN_UP(e820.map[i].addr); | ||
905 | end = PFN_DOWN(e820.map[i].addr + e820.map[i].size); | ||
906 | if (start >= end) | ||
907 | continue; | ||
908 | if (end > max_pfn) | ||
909 | max_pfn = end; | ||
910 | memory_present(0, start, end); | ||
911 | } | ||
912 | } | ||
913 | |||
914 | /* | ||
915 | * Determine low and high memory ranges: | 263 | * Determine low and high memory ranges: |
916 | */ | 264 | */ |
917 | unsigned long __init find_max_low_pfn(void) | 265 | unsigned long __init find_max_low_pfn(void) |
@@ -971,68 +319,6 @@ unsigned long __init find_max_low_pfn(void) | |||
971 | } | 319 | } |
972 | 320 | ||
973 | /* | 321 | /* |
974 | * Free all available memory for boot time allocation. Used | ||
975 | * as a callback function by efi_memory_walk() | ||
976 | */ | ||
977 | |||
978 | static int __init | ||
979 | free_available_memory(unsigned long start, unsigned long end, void *arg) | ||
980 | { | ||
981 | /* check max_low_pfn */ | ||
982 | if (start >= (max_low_pfn << PAGE_SHIFT)) | ||
983 | return 0; | ||
984 | if (end >= (max_low_pfn << PAGE_SHIFT)) | ||
985 | end = max_low_pfn << PAGE_SHIFT; | ||
986 | if (start < end) | ||
987 | free_bootmem(start, end - start); | ||
988 | |||
989 | return 0; | ||
990 | } | ||
991 | /* | ||
992 | * Register fully available low RAM pages with the bootmem allocator. | ||
993 | */ | ||
994 | static void __init register_bootmem_low_pages(unsigned long max_low_pfn) | ||
995 | { | ||
996 | int i; | ||
997 | |||
998 | if (efi_enabled) { | ||
999 | efi_memmap_walk(free_available_memory, NULL); | ||
1000 | return; | ||
1001 | } | ||
1002 | for (i = 0; i < e820.nr_map; i++) { | ||
1003 | unsigned long curr_pfn, last_pfn, size; | ||
1004 | /* | ||
1005 | * Reserve usable low memory | ||
1006 | */ | ||
1007 | if (e820.map[i].type != E820_RAM) | ||
1008 | continue; | ||
1009 | /* | ||
1010 | * We are rounding up the start address of usable memory: | ||
1011 | */ | ||
1012 | curr_pfn = PFN_UP(e820.map[i].addr); | ||
1013 | if (curr_pfn >= max_low_pfn) | ||
1014 | continue; | ||
1015 | /* | ||
1016 | * ... and at the end of the usable range downwards: | ||
1017 | */ | ||
1018 | last_pfn = PFN_DOWN(e820.map[i].addr + e820.map[i].size); | ||
1019 | |||
1020 | if (last_pfn > max_low_pfn) | ||
1021 | last_pfn = max_low_pfn; | ||
1022 | |||
1023 | /* | ||
1024 | * .. finally, did all the rounding and playing | ||
1025 | * around just make the area go away? | ||
1026 | */ | ||
1027 | if (last_pfn <= curr_pfn) | ||
1028 | continue; | ||
1029 | |||
1030 | size = last_pfn - curr_pfn; | ||
1031 | free_bootmem(PFN_PHYS(curr_pfn), PFN_PHYS(size)); | ||
1032 | } | ||
1033 | } | ||
1034 | |||
1035 | /* | ||
1036 | * workaround for Dell systems that neglect to reserve EBDA | 322 | * workaround for Dell systems that neglect to reserve EBDA |
1037 | */ | 323 | */ |
1038 | static void __init reserve_ebda_region(void) | 324 | static void __init reserve_ebda_region(void) |
@@ -1118,8 +404,8 @@ void __init setup_bootmem_allocator(void) | |||
1118 | * the (very unlikely) case of us accidentally initializing the | 404 | * the (very unlikely) case of us accidentally initializing the |
1119 | * bootmem allocator with an invalid RAM area. | 405 | * bootmem allocator with an invalid RAM area. |
1120 | */ | 406 | */ |
1121 | reserve_bootmem(__PHYSICAL_START, (PFN_PHYS(min_low_pfn) + | 407 | reserve_bootmem(__pa_symbol(_text), (PFN_PHYS(min_low_pfn) + |
1122 | bootmap_size + PAGE_SIZE-1) - (__PHYSICAL_START)); | 408 | bootmap_size + PAGE_SIZE-1) - __pa_symbol(_text)); |
1123 | 409 | ||
1124 | /* | 410 | /* |
1125 | * reserve physical page 0 - it's a special BIOS page on many boxes, | 411 | * reserve physical page 0 - it's a special BIOS page on many boxes, |
@@ -1199,126 +485,6 @@ void __init remapped_pgdat_init(void) | |||
1199 | } | 485 | } |
1200 | } | 486 | } |
1201 | 487 | ||
1202 | /* | ||
1203 | * Request address space for all standard RAM and ROM resources | ||
1204 | * and also for regions reported as reserved by the e820. | ||
1205 | */ | ||
1206 | static void __init | ||
1207 | legacy_init_iomem_resources(struct resource *code_resource, struct resource *data_resource) | ||
1208 | { | ||
1209 | int i; | ||
1210 | |||
1211 | probe_roms(); | ||
1212 | for (i = 0; i < e820.nr_map; i++) { | ||
1213 | struct resource *res; | ||
1214 | #ifndef CONFIG_RESOURCES_64BIT | ||
1215 | if (e820.map[i].addr + e820.map[i].size > 0x100000000ULL) | ||
1216 | continue; | ||
1217 | #endif | ||
1218 | res = kzalloc(sizeof(struct resource), GFP_ATOMIC); | ||
1219 | switch (e820.map[i].type) { | ||
1220 | case E820_RAM: res->name = "System RAM"; break; | ||
1221 | case E820_ACPI: res->name = "ACPI Tables"; break; | ||
1222 | case E820_NVS: res->name = "ACPI Non-volatile Storage"; break; | ||
1223 | default: res->name = "reserved"; | ||
1224 | } | ||
1225 | res->start = e820.map[i].addr; | ||
1226 | res->end = res->start + e820.map[i].size - 1; | ||
1227 | res->flags = IORESOURCE_MEM | IORESOURCE_BUSY; | ||
1228 | if (request_resource(&iomem_resource, res)) { | ||
1229 | kfree(res); | ||
1230 | continue; | ||
1231 | } | ||
1232 | if (e820.map[i].type == E820_RAM) { | ||
1233 | /* | ||
1234 | * We don't know which RAM region contains kernel data, | ||
1235 | * so we try it repeatedly and let the resource manager | ||
1236 | * test it. | ||
1237 | */ | ||
1238 | request_resource(res, code_resource); | ||
1239 | request_resource(res, data_resource); | ||
1240 | #ifdef CONFIG_KEXEC | ||
1241 | request_resource(res, &crashk_res); | ||
1242 | #endif | ||
1243 | } | ||
1244 | } | ||
1245 | } | ||
1246 | |||
1247 | /* | ||
1248 | * Request address space for all standard resources | ||
1249 | * | ||
1250 | * This is called just before pcibios_init(), which is also a | ||
1251 | * subsys_initcall, but is linked in later (in arch/i386/pci/common.c). | ||
1252 | */ | ||
1253 | static int __init request_standard_resources(void) | ||
1254 | { | ||
1255 | int i; | ||
1256 | |||
1257 | printk("Setting up standard PCI resources\n"); | ||
1258 | if (efi_enabled) | ||
1259 | efi_initialize_iomem_resources(&code_resource, &data_resource); | ||
1260 | else | ||
1261 | legacy_init_iomem_resources(&code_resource, &data_resource); | ||
1262 | |||
1263 | /* EFI systems may still have VGA */ | ||
1264 | request_resource(&iomem_resource, &video_ram_resource); | ||
1265 | |||
1266 | /* request I/O space for devices used on all i[345]86 PCs */ | ||
1267 | for (i = 0; i < ARRAY_SIZE(standard_io_resources); i++) | ||
1268 | request_resource(&ioport_resource, &standard_io_resources[i]); | ||
1269 | return 0; | ||
1270 | } | ||
1271 | |||
1272 | subsys_initcall(request_standard_resources); | ||
1273 | |||
1274 | static void __init register_memory(void) | ||
1275 | { | ||
1276 | unsigned long gapstart, gapsize, round; | ||
1277 | unsigned long long last; | ||
1278 | int i; | ||
1279 | |||
1280 | /* | ||
1281 | * Search for the bigest gap in the low 32 bits of the e820 | ||
1282 | * memory space. | ||
1283 | */ | ||
1284 | last = 0x100000000ull; | ||
1285 | gapstart = 0x10000000; | ||
1286 | gapsize = 0x400000; | ||
1287 | i = e820.nr_map; | ||
1288 | while (--i >= 0) { | ||
1289 | unsigned long long start = e820.map[i].addr; | ||
1290 | unsigned long long end = start + e820.map[i].size; | ||
1291 | |||
1292 | /* | ||
1293 | * Since "last" is at most 4GB, we know we'll | ||
1294 | * fit in 32 bits if this condition is true | ||
1295 | */ | ||
1296 | if (last > end) { | ||
1297 | unsigned long gap = last - end; | ||
1298 | |||
1299 | if (gap > gapsize) { | ||
1300 | gapsize = gap; | ||
1301 | gapstart = end; | ||
1302 | } | ||
1303 | } | ||
1304 | if (start < last) | ||
1305 | last = start; | ||
1306 | } | ||
1307 | |||
1308 | /* | ||
1309 | * See how much we want to round up: start off with | ||
1310 | * rounding to the next 1MB area. | ||
1311 | */ | ||
1312 | round = 0x100000; | ||
1313 | while ((gapsize >> 4) > round) | ||
1314 | round += round; | ||
1315 | /* Fun with two's complement */ | ||
1316 | pci_mem_start = (gapstart + round) & -round; | ||
1317 | |||
1318 | printk("Allocating PCI resources starting at %08lx (gap: %08lx:%08lx)\n", | ||
1319 | pci_mem_start, gapstart, gapsize); | ||
1320 | } | ||
1321 | |||
1322 | #ifdef CONFIG_MCA | 488 | #ifdef CONFIG_MCA |
1323 | static void set_mca_bus(int x) | 489 | static void set_mca_bus(int x) |
1324 | { | 490 | { |
@@ -1328,6 +494,12 @@ static void set_mca_bus(int x) | |||
1328 | static void set_mca_bus(int x) { } | 494 | static void set_mca_bus(int x) { } |
1329 | #endif | 495 | #endif |
1330 | 496 | ||
497 | /* Overridden in paravirt.c if CONFIG_PARAVIRT */ | ||
498 | char * __attribute__((weak)) memory_setup(void) | ||
499 | { | ||
500 | return machine_specific_memory_setup(); | ||
501 | } | ||
502 | |||
1331 | /* | 503 | /* |
1332 | * Determine if we were loaded by an EFI loader. If so, then we have also been | 504 | * Determine if we were loaded by an EFI loader. If so, then we have also been |
1333 | * passed the efi memmap, systab, etc., so we should use these data structures | 505 | * passed the efi memmap, systab, etc., so we should use these data structures |
@@ -1380,7 +552,7 @@ void __init setup_arch(char **cmdline_p) | |||
1380 | efi_init(); | 552 | efi_init(); |
1381 | else { | 553 | else { |
1382 | printk(KERN_INFO "BIOS-provided physical RAM map:\n"); | 554 | printk(KERN_INFO "BIOS-provided physical RAM map:\n"); |
1383 | print_memory_map(machine_specific_memory_setup()); | 555 | print_memory_map(memory_setup()); |
1384 | } | 556 | } |
1385 | 557 | ||
1386 | copy_edd(); | 558 | copy_edd(); |