aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2014-08-06 05:08:21 -0400
committerMichael Ellerman <mpe@ellerman.id.au>2014-09-25 09:14:55 -0400
commitbdce97e94b95db409264d5ae6badd0db7628681c (patch)
tree9d11f53430bf28eb8bd8807c497ebfdd0988cdae /arch
parent92f792ece9c41befde64d8799fd3dde5d57407ab (diff)
powerpc/ppc64: Clean up the boot-time settings display
At boot we display a bunch of low level settings which can be useful to know, and can help to spot bugs when things are fundamentally misconfigured. At the moment they are very widely spaced, so that we can accommodate the line: ppc64_caches.dcache_line_size = 0xYY But we only print that line when the cache line size is not 128, ie. almost never, so it just makes the display look odd usually. The ppc64_caches prefix is redundant so remove it, which means we can align things a bit closer for the common case. While we're there replace the last use of camelCase (physicalMemorySize), and use phys_mem_size. Before: Starting Linux PPC64 #104 SMP Wed Aug 6 18:41:34 EST 2014 ----------------------------------------------------- ppc64_pft_size = 0x1a physicalMemorySize = 0x200000000 ppc64_caches.dcache_line_size = 0xf0 ppc64_caches.icache_line_size = 0xf0 htab_address = 0xdeadbeef htab_hash_mask = 0x7ffff physical_start = 0xf000bar ----------------------------------------------------- After: Starting Linux PPC64 #103 SMP Wed Aug 6 18:38:04 EST 2014 ----------------------------------------------------- ppc64_pft_size = 0x1a phys_mem_size = 0x200000000 dcache_line_size = 0xf0 icache_line_size = 0xf0 htab_address = 0xdeadbeef htab_hash_mask = 0x7ffff physical_start = 0xf000bar ----------------------------------------------------- This patch is final, no bike shedding ;) Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/kernel/setup_64.c22
1 files changed, 12 insertions, 10 deletions
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 75d62d63fe68..32f4c320b9dc 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -525,21 +525,23 @@ void __init setup_system(void)
525 printk("Starting Linux PPC64 %s\n", init_utsname()->version); 525 printk("Starting Linux PPC64 %s\n", init_utsname()->version);
526 526
527 printk("-----------------------------------------------------\n"); 527 printk("-----------------------------------------------------\n");
528 printk("ppc64_pft_size = 0x%llx\n", ppc64_pft_size); 528 printk("ppc64_pft_size = 0x%llx\n", ppc64_pft_size);
529 printk("physicalMemorySize = 0x%llx\n", memblock_phys_mem_size()); 529 printk("phys_mem_size = 0x%llx\n", memblock_phys_mem_size());
530
530 if (ppc64_caches.dline_size != 0x80) 531 if (ppc64_caches.dline_size != 0x80)
531 printk("ppc64_caches.dcache_line_size = 0x%x\n", 532 printk("dcache_line_size = 0x%x\n", ppc64_caches.dline_size);
532 ppc64_caches.dline_size);
533 if (ppc64_caches.iline_size != 0x80) 533 if (ppc64_caches.iline_size != 0x80)
534 printk("ppc64_caches.icache_line_size = 0x%x\n", 534 printk("icache_line_size = 0x%x\n", ppc64_caches.iline_size);
535 ppc64_caches.iline_size); 535
536#ifdef CONFIG_PPC_STD_MMU_64 536#ifdef CONFIG_PPC_STD_MMU_64
537 if (htab_address) 537 if (htab_address)
538 printk("htab_address = 0x%p\n", htab_address); 538 printk("htab_address = 0x%p\n", htab_address);
539 printk("htab_hash_mask = 0x%lx\n", htab_hash_mask); 539
540#endif /* CONFIG_PPC_STD_MMU_64 */ 540 printk("htab_hash_mask = 0x%lx\n", htab_hash_mask);
541#endif
542
541 if (PHYSICAL_START > 0) 543 if (PHYSICAL_START > 0)
542 printk("physical_start = 0x%llx\n", 544 printk("physical_start = 0x%llx\n",
543 (unsigned long long)PHYSICAL_START); 545 (unsigned long long)PHYSICAL_START);
544 printk("-----------------------------------------------------\n"); 546 printk("-----------------------------------------------------\n");
545 547