Skip to content

L
linux
Commit 91eb0f67 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Linus Torvalds
Browse files
Options

x86: print e820 physical addresses consistently with other parts of kernel 

Print physical address info in a style consistent with the %pR style used
elsewhere in the kernel.  For example:

    -BIOS-provided physical RAM map:
    +e820: BIOS-provided physical RAM map:
    - BIOS-e820: 0000000000000100 - 000000000009e000 (usable)
    +BIOS-e820: [mem 0x0000000000000100-0x000000000009dfff] usable
    -Allocating PCI resources starting at 90000000 (gap: 90000000:6ed1c000)
    +e820: [mem 0x90000000-0xfed1bfff] available for PCI devices
    -reserve RAM buffer: 000000000009e000 - 000000000009ffff
    +e820: reserve RAM buffer [mem 0x0009e000-0x0009ffff]
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 02602a18
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 26 deletions
arch/x86/kernel/e820.c
View file @ 91eb0f67
...@@ -113,7 +113,9 @@ static void __init __e820_add_region(struct e820map *e820x, u64 start, u64 size, ...@@ -113,7 +113,9 @@ static void __init __e820_add_region(struct e820map *e820x, u64 start, u64 size,
int x = e820x->nr_map; int x = e820x->nr_map;
if (x >= ARRAY_SIZE(e820x->map)) { if (x >= ARRAY_SIZE(e820x->map)) {
printk(KERN_ERR "Ooops! Too many entries in the memory map!\n"); printk(KERN_ERR "e820: too many entries; ignoring [mem %#010llx-%#010llx]\n",
(unsigned long long) start,
(unsigned long long) (start + size - 1));
return; return;
} }
...@@ -133,19 +135,19 @@ static void __init e820_print_type(u32 type) ...@@ -133,19 +135,19 @@ static void __init e820_print_type(u32 type)
switch (type) { switch (type) {
case E820_RAM: case E820_RAM:
case E820_RESERVED_KERN: case E820_RESERVED_KERN:
printk(KERN_CONT "(usable)"); printk(KERN_CONT "usable");
break; break;
case E820_RESERVED: case E820_RESERVED:
printk(KERN_CONT "(reserved)"); printk(KERN_CONT "reserved");
break; break;
case E820_ACPI: case E820_ACPI:
printk(KERN_CONT "(ACPI data)"); printk(KERN_CONT "ACPI data");
break; break;
case E820_NVS: case E820_NVS:
printk(KERN_CONT "(ACPI NVS)"); printk(KERN_CONT "ACPI NVS");
break; break;
case E820_UNUSABLE: case E820_UNUSABLE:
printk(KERN_CONT "(unusable)"); printk(KERN_CONT "unusable");
break; break;
default: default:
printk(KERN_CONT "type %u", type); printk(KERN_CONT "type %u", type);
...@@ -158,10 +160,10 @@ void __init e820_print_map(char *who) ...@@ -158,10 +160,10 @@ void __init e820_print_map(char *who)
int i; int i;
for (i = 0; i < e820.nr_map; i++) { for (i = 0; i < e820.nr_map; i++) {
printk(KERN_INFO " %s: %016Lx - %016Lx ", who, printk(KERN_INFO "%s: [mem %#018Lx-%#018Lx] ", who,
(unsigned long long) e820.map[i].addr, (unsigned long long) e820.map[i].addr,
(unsigned long long) (unsigned long long)
(e820.map[i].addr + e820.map[i].size)); (e820.map[i].addr + e820.map[i].size - 1));
e820_print_type(e820.map[i].type); e820_print_type(e820.map[i].type);
printk(KERN_CONT "\n"); printk(KERN_CONT "\n");
} }
...@@ -428,9 +430,8 @@ static u64 __init __e820_update_range(struct e820map *e820x, u64 start, ...@@ -428,9 +430,8 @@ static u64 __init __e820_update_range(struct e820map *e820x, u64 start,
size = ULLONG_MAX - start; size = ULLONG_MAX - start;
end = start + size; end = start + size;
printk(KERN_DEBUG "e820 update range: %016Lx - %016Lx ", printk(KERN_DEBUG "e820: update [mem %#010Lx-%#010Lx] ",
(unsigned long long) start, (unsigned long long) start, (unsigned long long) (end - 1));
(unsigned long long) end);
e820_print_type(old_type); e820_print_type(old_type);
printk(KERN_CONT " ==> "); printk(KERN_CONT " ==> ");
e820_print_type(new_type); e820_print_type(new_type);
...@@ -509,9 +510,8 @@ u64 __init e820_remove_range(u64 start, u64 size, unsigned old_type, ...@@ -509,9 +510,8 @@ u64 __init e820_remove_range(u64 start, u64 size, unsigned old_type,
size = ULLONG_MAX - start; size = ULLONG_MAX - start;
end = start + size; end = start + size;
printk(KERN_DEBUG "e820 remove range: %016Lx - %016Lx ", printk(KERN_DEBUG "e820: remove [mem %#010Lx-%#010Lx] ",
(unsigned long long) start, (unsigned long long) start, (unsigned long long) (end - 1));
(unsigned long long) end);
if (checktype) if (checktype)
e820_print_type(old_type); e820_print_type(old_type);
printk(KERN_CONT "\n"); printk(KERN_CONT "\n");
...@@ -567,7 +567,7 @@ void __init update_e820(void) ...@@ -567,7 +567,7 @@ void __init update_e820(void)
if (sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &nr_map)) if (sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &nr_map))
return; return;
e820.nr_map = nr_map; e820.nr_map = nr_map;
printk(KERN_INFO "modified physical RAM map:\n"); printk(KERN_INFO "e820: modified physical RAM map:\n");
e820_print_map("modified"); e820_print_map("modified");
} }
static void __init update_e820_saved(void) static void __init update_e820_saved(void)
...@@ -637,8 +637,8 @@ __init void e820_setup_gap(void) ...@@ -637,8 +637,8 @@ __init void e820_setup_gap(void)
if (!found) { if (!found) {
gapstart = (max_pfn << PAGE_SHIFT) + 1024*1024; gapstart = (max_pfn << PAGE_SHIFT) + 1024*1024;
printk(KERN_ERR printk(KERN_ERR
"PCI: Warning: Cannot find a gap in the 32bit address range\n" "e820: cannot find a gap in the 32bit address range\n"
"PCI: Unassigned devices with 32bit resource registers may break!\n"); "e820: PCI devices with unassigned 32bit BARs may break!\n");
} }
#endif #endif
...@@ -648,8 +648,8 @@ __init void e820_setup_gap(void) ...@@ -648,8 +648,8 @@ __init void e820_setup_gap(void)
pci_mem_start = gapstart; pci_mem_start = gapstart;
printk(KERN_INFO printk(KERN_INFO
"Allocating PCI resources starting at %lx (gap: %lx:%lx)\n", "e820: [mem %#010lx-%#010lx] available for PCI devices\n",
pci_mem_start, gapstart, gapsize); gapstart, gapstart + gapsize - 1);
} }
/** /**
...@@ -667,7 +667,7 @@ void __init parse_e820_ext(struct setup_data *sdata) ...@@ -667,7 +667,7 @@ void __init parse_e820_ext(struct setup_data *sdata)
extmap = (struct e820entry *)(sdata->data); extmap = (struct e820entry *)(sdata->data);
__append_e820_map(extmap, entries); __append_e820_map(extmap, entries);
sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map); sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
printk(KERN_INFO "extended physical RAM map:\n"); printk(KERN_INFO "e820: extended physical RAM map:\n");
e820_print_map("extended"); e820_print_map("extended");
} }
...@@ -734,7 +734,7 @@ u64 __init early_reserve_e820(u64 size, u64 align) ...@@ -734,7 +734,7 @@ u64 __init early_reserve_e820(u64 size, u64 align)
addr = __memblock_alloc_base(size, align, MEMBLOCK_ALLOC_ACCESSIBLE); addr = __memblock_alloc_base(size, align, MEMBLOCK_ALLOC_ACCESSIBLE);
if (addr) { if (addr) {
e820_update_range_saved(addr, size, E820_RAM, E820_RESERVED); e820_update_range_saved(addr, size, E820_RAM, E820_RESERVED);
printk(KERN_INFO "update e820_saved for early_reserve_e820\n"); printk(KERN_INFO "e820: update e820_saved for early_reserve_e820\n");
update_e820_saved(); update_e820_saved();
} }
...@@ -784,7 +784,7 @@ static unsigned long __init e820_end_pfn(unsigned long limit_pfn, unsigned type) ...@@ -784,7 +784,7 @@ static unsigned long __init e820_end_pfn(unsigned long limit_pfn, unsigned type)
if (last_pfn > max_arch_pfn) if (last_pfn > max_arch_pfn)
last_pfn = max_arch_pfn; last_pfn = max_arch_pfn;
printk(KERN_INFO "last_pfn = %#lx max_arch_pfn = %#lx\n", printk(KERN_INFO "e820: last_pfn = %#lx max_arch_pfn = %#lx\n",
last_pfn, max_arch_pfn); last_pfn, max_arch_pfn);
return last_pfn; return last_pfn;
} }
...@@ -888,7 +888,7 @@ void __init finish_e820_parsing(void) ...@@ -888,7 +888,7 @@ void __init finish_e820_parsing(void)
early_panic("Invalid user supplied memory map"); early_panic("Invalid user supplied memory map");
e820.nr_map = nr; e820.nr_map = nr;
printk(KERN_INFO "user-defined physical RAM map:\n"); printk(KERN_INFO "e820: user-defined physical RAM map:\n");
e820_print_map("user"); e820_print_map("user");
} }
} }
...@@ -996,8 +996,9 @@ void __init e820_reserve_resources_late(void) ...@@ -996,8 +996,9 @@ void __init e820_reserve_resources_late(void)
end = MAX_RESOURCE_SIZE; end = MAX_RESOURCE_SIZE;
if (start >= end) if (start >= end)
continue; continue;
printk(KERN_DEBUG "reserve RAM buffer: %016llx - %016llx ", printk(KERN_DEBUG
start, end); "e820: reserve RAM buffer [mem %#010llx-%#010llx]\n",
start, end);
reserve_region_with_split(&iomem_resource, start, end, reserve_region_with_split(&iomem_resource, start, end,
"RAM buffer"); "RAM buffer");
} }
...@@ -1047,7 +1048,7 @@ void __init setup_memory_map(void) ...@@ -1047,7 +1048,7 @@ void __init setup_memory_map(void)
who = x86_init.resources.memory_setup(); who = x86_init.resources.memory_setup();
memcpy(&e820_saved, &e820, sizeof(struct e820map)); memcpy(&e820_saved, &e820, sizeof(struct e820map));
printk(KERN_INFO "BIOS-provided physical RAM map:\n"); printk(KERN_INFO "e820: BIOS-provided physical RAM map:\n");
e820_print_map(who); e820_print_map(who);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7