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

Commit 365811d6 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Linus Torvalds
Browse files

x86: print 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:

    -found SMP MP-table at [ffff8800000fce90] fce90
    +found SMP MP-table at [mem 0x000fce90-0x000fce9f] mapped at [ffff8800000fce90]
    -initial memory mapped : 0 - 20000000
    +initial memory mapped: [mem 0x00000000-0x1fffffff]
    -Base memory trampoline at [ffff88000009c000] 9c000 size 8192
    +Base memory trampoline [mem 0x0009c000-0x0009dfff] mapped at [ffff88000009c000]
    -SRAT: Node 0 PXM 0 0-80000000
    +SRAT: Node 0 PXM 0 [mem 0x00000000-0x7fffffff]

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 91eb0f67

arch/x86/kernel/mpparse.c

+6 −4
Original line number Diff line number Diff line
@@ -568,8 +568,8 @@ static int __init smp_scan_config(unsigned long base, unsigned long length) 
	struct mpf_intel *mpf;

	unsigned long mem;



	apic_printk(APIC_VERBOSE, "Scan SMP from %p for %ld bytes.\n",

			bp, length);

	apic_printk(APIC_VERBOSE, "Scan for SMP in [mem %#010lx-%#010lx]\n",

		    base, base + length - 1);

	BUILD_BUG_ON(sizeof(*mpf) != 16);



	while (length > 0) {
@@ -584,8 +584,10 @@ static int __init smp_scan_config(unsigned long base, unsigned long length) 
#endif

			mpf_found = mpf;



			printk(KERN_INFO "found SMP MP-table at [%p] %llx\n",

			       mpf, (u64)virt_to_phys(mpf));

			printk(KERN_INFO "found SMP MP-table at [mem %#010llx-%#010llx] mapped at [%p]\n",

			       (unsigned long long) virt_to_phys(mpf),

			       (unsigned long long) virt_to_phys(mpf) +

			       sizeof(*mpf) - 1, mpf);



			mem = virt_to_phys(mpf);

			memblock_reserve(mem, sizeof(*mpf));

arch/x86/kernel/setup.c

+8 −8
Original line number Diff line number Diff line
@@ -334,8 +334,8 @@ static void __init relocate_initrd(void) 
	memblock_reserve(ramdisk_here, area_size);

	initrd_start = ramdisk_here + PAGE_OFFSET;

	initrd_end   = initrd_start + ramdisk_size;

	printk(KERN_INFO "Allocated new RAMDISK: %08llx - %08llx\n",

			 ramdisk_here, ramdisk_here + ramdisk_size);

	printk(KERN_INFO "Allocated new RAMDISK: [mem %#010llx-%#010llx]\n",

			 ramdisk_here, ramdisk_here + ramdisk_size - 1);



	q = (char *)initrd_start;
@@ -366,8 +366,8 @@ static void __init relocate_initrd(void) 
	/* high pages is not converted by early_res_to_bootmem */

	ramdisk_image = boot_params.hdr.ramdisk_image;

	ramdisk_size  = boot_params.hdr.ramdisk_size;

	printk(KERN_INFO "Move RAMDISK from %016llx - %016llx to"

		" %08llx - %08llx\n",

	printk(KERN_INFO "Move RAMDISK from [mem %#010llx-%#010llx] to"

		" [mem %#010llx-%#010llx]\n",

		ramdisk_image, ramdisk_image + ramdisk_size - 1,

		ramdisk_here, ramdisk_here + ramdisk_size - 1);

}
@@ -392,8 +392,8 @@ static void __init reserve_initrd(void) 
		       ramdisk_size, end_of_lowmem>>1);

	}



	printk(KERN_INFO "RAMDISK: %08llx - %08llx\n", ramdisk_image,

			ramdisk_end);

	printk(KERN_INFO "RAMDISK: [mem %#010llx-%#010llx]\n", ramdisk_image,

			ramdisk_end - 1);





	if (ramdisk_end <= end_of_lowmem) {
@@ -906,8 +906,8 @@ void __init setup_arch(char **cmdline_p) 
	setup_bios_corruption_check();

#endif



	printk(KERN_DEBUG "initial memory mapped : 0 - %08lx\n",

			max_pfn_mapped<<PAGE_SHIFT);

	printk(KERN_DEBUG "initial memory mapped: [mem 0x00000000-%#010lx]\n",

			(max_pfn_mapped<<PAGE_SHIFT) - 1);



	setup_trampolines();

arch/x86/mm/init.c

+9 −7
Original line number Diff line number Diff line
@@ -84,8 +84,9 @@ static void __init find_early_table_space(struct map_range *mr, unsigned long en 
	pgt_buf_end = pgt_buf_start;

	pgt_buf_top = pgt_buf_start + (tables >> PAGE_SHIFT);



	printk(KERN_DEBUG "kernel direct mapping tables up to %lx @ %lx-%lx\n",

		end, pgt_buf_start << PAGE_SHIFT, pgt_buf_top << PAGE_SHIFT);

	printk(KERN_DEBUG "kernel direct mapping tables up to %#lx @ [mem %#010lx-%#010lx]\n",

		end - 1, pgt_buf_start << PAGE_SHIFT,

		(pgt_buf_top << PAGE_SHIFT) - 1);

}



void __init native_pagetable_reserve(u64 start, u64 end)
@@ -132,7 +133,8 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, 
	int nr_range, i;

	int use_pse, use_gbpages;



	printk(KERN_INFO "init_memory_mapping: %016lx-%016lx\n", start, end);

	printk(KERN_INFO "init_memory_mapping: [mem %#010lx-%#010lx]\n",

	       start, end - 1);



#if defined(CONFIG_DEBUG_PAGEALLOC) || defined(CONFIG_KMEMCHECK)

	/*
@@ -251,8 +253,8 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, 
	}



	for (i = 0; i < nr_range; i++)

		printk(KERN_DEBUG " %010lx - %010lx page %s\n",

				mr[i].start, mr[i].end,

		printk(KERN_DEBUG " [mem %#010lx-%#010lx] page %s\n",

				mr[i].start, mr[i].end - 1,

			(mr[i].page_size_mask & (1<<PG_LEVEL_1G))?"1G":(

			 (mr[i].page_size_mask & (1<<PG_LEVEL_2M))?"2M":"4k"));
@@ -350,8 +352,8 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end) 
	 * create a kernel page fault:

	 */

#ifdef CONFIG_DEBUG_PAGEALLOC

	printk(KERN_INFO "debug: unmapping init memory %08lx..%08lx\n",

		begin, end);

	printk(KERN_INFO "debug: unmapping init [mem %#010lx-%#010lx]\n",

		begin, end - 1);

	set_memory_np(begin, (end - begin) >> PAGE_SHIFT);

#else

	/*

arch/x86/mm/numa.c

+16 −16
Original line number Diff line number Diff line
@@ -141,8 +141,8 @@ static int __init numa_add_memblk_to(int nid, u64 start, u64 end, 


	/* whine about and ignore invalid blks */

	if (start > end || nid < 0 || nid >= MAX_NUMNODES) {

		pr_warning("NUMA: Warning: invalid memblk node %d (%Lx-%Lx)\n",

			   nid, start, end);

		pr_warning("NUMA: Warning: invalid memblk node %d [mem %#010Lx-%#010Lx]\n",

			   nid, start, end - 1);

		return 0;

	}
@@ -210,8 +210,8 @@ static void __init setup_node_data(int nid, u64 start, u64 end) 


	start = roundup(start, ZONE_ALIGN);



	printk(KERN_INFO "Initmem setup node %d %016Lx-%016Lx\n",

	       nid, start, end);

	printk(KERN_INFO "Initmem setup node %d [mem %#010Lx-%#010Lx]\n",

	       nid, start, end - 1);



	/*

	 * Allocate node data.  Try remap allocator first, node-local
@@ -232,7 +232,7 @@ static void __init setup_node_data(int nid, u64 start, u64 end) 
	}



	/* report and initialize */

	printk(KERN_INFO "  NODE_DATA [%016Lx - %016Lx]%s\n",

	printk(KERN_INFO "  NODE_DATA [mem %#010Lx-%#010Lx]%s\n",

	       nd_pa, nd_pa + nd_size - 1, remapped ? " (remapped)" : "");

	tnid = early_pfn_to_nid(nd_pa >> PAGE_SHIFT);

	if (!remapped && tnid != nid)
@@ -291,14 +291,14 @@ int __init numa_cleanup_meminfo(struct numa_meminfo *mi) 
			 */

			if (bi->end > bj->start && bi->start < bj->end) {

				if (bi->nid != bj->nid) {

					pr_err("NUMA: node %d (%Lx-%Lx) overlaps with node %d (%Lx-%Lx)\n",

					       bi->nid, bi->start, bi->end,

					       bj->nid, bj->start, bj->end);

					pr_err("NUMA: node %d [mem %#010Lx-%#010Lx] overlaps with node %d [mem %#010Lx-%#010Lx]\n",

					       bi->nid, bi->start, bi->end - 1,

					       bj->nid, bj->start, bj->end - 1);

					return -EINVAL;

				}

				pr_warning("NUMA: Warning: node %d (%Lx-%Lx) overlaps with itself (%Lx-%Lx)\n",

					   bi->nid, bi->start, bi->end,

					   bj->start, bj->end);

				pr_warning("NUMA: Warning: node %d [mem %#010Lx-%#010Lx] overlaps with itself [mem %#010Lx-%#010Lx]\n",

					   bi->nid, bi->start, bi->end - 1,

					   bj->start, bj->end - 1);

			}



			/*
@@ -320,9 +320,9 @@ int __init numa_cleanup_meminfo(struct numa_meminfo *mi) 
			}

			if (k < mi->nr_blks)

				continue;

			printk(KERN_INFO "NUMA: Node %d [%Lx,%Lx) + [%Lx,%Lx) -> [%Lx,%Lx)\n",

			       bi->nid, bi->start, bi->end, bj->start, bj->end,

			       start, end);

			printk(KERN_INFO "NUMA: Node %d [mem %#010Lx-%#010Lx] + [mem %#010Lx-%#010Lx] -> [mem %#010Lx-%#010Lx]\n",

			       bi->nid, bi->start, bi->end - 1, bj->start,

			       bj->end - 1, start, end - 1);

			bi->start = start;

			bi->end = end;

			numa_remove_memblk_from(j--, mi);
@@ -616,8 +616,8 @@ static int __init dummy_numa_init(void) 
{

	printk(KERN_INFO "%s\n",

	       numa_off ? "NUMA turned off" : "No NUMA configuration found");

	printk(KERN_INFO "Faking a node at %016Lx-%016Lx\n",

	       0LLU, PFN_PHYS(max_pfn));

	printk(KERN_INFO "Faking a node at [mem %#018Lx-%#018Lx]\n",

	       0LLU, PFN_PHYS(max_pfn) - 1);



	node_set(0, numa_nodes_parsed);

	numa_add_memblk(0, 0, PFN_PHYS(max_pfn));

arch/x86/mm/numa_emulation.c

+2 −2
Original line number Diff line number Diff line
@@ -68,8 +68,8 @@ static int __init emu_setup_memblk(struct numa_meminfo *ei, 
		numa_remove_memblk_from(phys_blk, pi);

	}



	printk(KERN_INFO "Faking node %d at %016Lx-%016Lx (%LuMB)\n", nid,

	       eb->start, eb->end, (eb->end - eb->start) >> 20);

	printk(KERN_INFO "Faking node %d at [mem %#018Lx-%#018Lx] (%LuMB)\n",

	       nid, eb->start, eb->end - 1, (eb->end - eb->start) >> 20);

	return 0;

}