Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/x86/kernel/e820.c

+27 −26
Original line number Diff line number Diff line
@@ -113,7 +113,9 @@ static void __init __e820_add_region(struct e820map *e820x, u64 start, u64 size, 
	int x = e820x->nr_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;

	}
@@ -133,19 +135,19 @@ static void __init e820_print_type(u32 type) 
	switch (type) {

	case E820_RAM:

	case E820_RESERVED_KERN:

		printk(KERN_CONT "(usable)");

		printk(KERN_CONT "usable");

		break;

	case E820_RESERVED:

		printk(KERN_CONT "(reserved)");

		printk(KERN_CONT "reserved");

		break;

	case E820_ACPI:

		printk(KERN_CONT "(ACPI data)");

		printk(KERN_CONT "ACPI data");

		break;

	case E820_NVS:

		printk(KERN_CONT "(ACPI NVS)");

		printk(KERN_CONT "ACPI NVS");

		break;

	case E820_UNUSABLE:

		printk(KERN_CONT "(unusable)");

		printk(KERN_CONT "unusable");

		break;

	default:

		printk(KERN_CONT "type %u", type);
@@ -158,10 +160,10 @@ void __init e820_print_map(char *who) 
	int 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 + e820.map[i].size));

		       (e820.map[i].addr + e820.map[i].size - 1));

		e820_print_type(e820.map[i].type);

		printk(KERN_CONT "\n");

	}
@@ -428,9 +430,8 @@ static u64 __init __e820_update_range(struct e820map *e820x, u64 start, 
		size = ULLONG_MAX - start;



	end = start + size;

	printk(KERN_DEBUG "e820 update range: %016Lx - %016Lx ",

		       (unsigned long long) start,

		       (unsigned long long) end);

	printk(KERN_DEBUG "e820: update [mem %#010Lx-%#010Lx] ",

	       (unsigned long long) start, (unsigned long long) (end - 1));

	e820_print_type(old_type);

	printk(KERN_CONT " ==> ");

	e820_print_type(new_type);
@@ -509,9 +510,8 @@ u64 __init e820_remove_range(u64 start, u64 size, unsigned old_type, 
		size = ULLONG_MAX - start;



	end = start + size;

	printk(KERN_DEBUG "e820 remove range: %016Lx - %016Lx ",

		       (unsigned long long) start,

		       (unsigned long long) end);

	printk(KERN_DEBUG "e820: remove [mem %#010Lx-%#010Lx] ",

	       (unsigned long long) start, (unsigned long long) (end - 1));

	if (checktype)

		e820_print_type(old_type);

	printk(KERN_CONT "\n");
@@ -567,7 +567,7 @@ void __init update_e820(void) 
	if (sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &nr_map))

		return;

	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");

}

static void __init update_e820_saved(void)
@@ -637,8 +637,8 @@ __init void e820_setup_gap(void) 
	if (!found) {

		gapstart = (max_pfn << PAGE_SHIFT) + 1024*1024;

		printk(KERN_ERR

	"PCI: Warning: Cannot find a gap in the 32bit address range\n"

	"PCI: Unassigned devices with 32bit resource registers may break!\n");

	"e820: cannot find a gap in the 32bit address range\n"

	"e820: PCI devices with unassigned 32bit BARs may break!\n");

	}

#endif
@@ -648,8 +648,8 @@ __init void e820_setup_gap(void) 
	pci_mem_start = gapstart;



	printk(KERN_INFO

	       "Allocating PCI resources starting at %lx (gap: %lx:%lx)\n",

	       pci_mem_start, gapstart, gapsize);

	       "e820: [mem %#010lx-%#010lx] available for PCI devices\n",

	       gapstart, gapstart + gapsize - 1);

}



/**
@@ -667,7 +667,7 @@ void __init parse_e820_ext(struct setup_data *sdata) 
	extmap = (struct e820entry *)(sdata->data);

	__append_e820_map(extmap, entries);

	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");

}
@@ -734,7 +734,7 @@ u64 __init early_reserve_e820(u64 size, u64 align) 
	addr = __memblock_alloc_base(size, align, MEMBLOCK_ALLOC_ACCESSIBLE);

	if (addr) {

		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();

	}
@@ -784,7 +784,7 @@ static unsigned long __init e820_end_pfn(unsigned long limit_pfn, unsigned type) 
	if (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);

	return last_pfn;

}
@@ -888,7 +888,7 @@ void __init finish_e820_parsing(void) 
			early_panic("Invalid user supplied memory map");

		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");

	}

}
@@ -996,7 +996,8 @@ void __init e820_reserve_resources_late(void) 
			end = MAX_RESOURCE_SIZE;

		if (start >= end)

			continue;

		printk(KERN_DEBUG "reserve RAM buffer: %016llx - %016llx ",

		printk(KERN_DEBUG

		       "e820: reserve RAM buffer [mem %#010llx-%#010llx]\n",

		       start, end);

		reserve_region_with_split(&iomem_resource, start, end,

					  "RAM buffer");
@@ -1047,7 +1048,7 @@ void __init setup_memory_map(void) 


	who = x86_init.resources.memory_setup();

	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);

}