xtensa: split out printing of virtual memory layout to a function

This will help with pulling out memblock_free_all() to the generic
code and reducing code duplication in arch::mem_init().

Link: https://lkml.kernel.org/r/20250313135003.836600-9-rppt@kernel.org
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Reviewed-by: Max Filippov <jcmvbkbc@gmail.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Andreas Larsson <andreas@gaisler.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Borislav Betkov <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Dinh Nguyen <dinguyen@kernel.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Gerald Schaefer <gerald.schaefer@linux.ibm.com>
Cc: Guo Ren (csky) <guoren@kernel.org>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Helge Deller <deller@gmx.de>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Russel King <linux@armlinux.org.uk>
Cc: Stafford Horne <shorne@gmail.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Thomas Gleinxer <tglx@linutronix.de>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Vineet Gupta <vgupta@kernel.org>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c
index b2587a1a7c4622e43426e73628dcae7fbbd1cf82..01577d33e602a8bc6b55893125b38f4d5cf39ab0 100644 (file)
--- a/arch/xtensa/mm/init.c
+++ b/arch/xtensa/mm/init.c
@@ -66,6 +66,55 @@ void __init bootmem_init(void)
        memblock_dump_all();
 }
 
+static void __init print_vm_layout(void)
+{
+       pr_info("virtual kernel memory layout:\n"
+#ifdef CONFIG_KASAN
+               "    kasan   : 0x%08lx - 0x%08lx  (%5lu MB)\n"
+#endif
+#ifdef CONFIG_MMU
+               "    vmalloc : 0x%08lx - 0x%08lx  (%5lu MB)\n"
+#endif
+#ifdef CONFIG_HIGHMEM
+               "    pkmap   : 0x%08lx - 0x%08lx  (%5lu kB)\n"
+               "    fixmap  : 0x%08lx - 0x%08lx  (%5lu kB)\n"
+#endif
+               "    lowmem  : 0x%08lx - 0x%08lx  (%5lu MB)\n"
+               "    .text   : 0x%08lx - 0x%08lx  (%5lu kB)\n"
+               "    .rodata : 0x%08lx - 0x%08lx  (%5lu kB)\n"
+               "    .data   : 0x%08lx - 0x%08lx  (%5lu kB)\n"
+               "    .init   : 0x%08lx - 0x%08lx  (%5lu kB)\n"
+               "    .bss    : 0x%08lx - 0x%08lx  (%5lu kB)\n",
+#ifdef CONFIG_KASAN
+               KASAN_SHADOW_START, KASAN_SHADOW_START + KASAN_SHADOW_SIZE,
+               KASAN_SHADOW_SIZE >> 20,
+#endif
+#ifdef CONFIG_MMU
+               VMALLOC_START, VMALLOC_END,
+               (VMALLOC_END - VMALLOC_START) >> 20,
+#ifdef CONFIG_HIGHMEM
+               PKMAP_BASE, PKMAP_BASE + LAST_PKMAP * PAGE_SIZE,
+               (LAST_PKMAP*PAGE_SIZE) >> 10,
+               FIXADDR_START, FIXADDR_END,
+               (FIXADDR_END - FIXADDR_START) >> 10,
+#endif
+               PAGE_OFFSET, PAGE_OFFSET +
+               (max_low_pfn - min_low_pfn) * PAGE_SIZE,
+#else
+               min_low_pfn * PAGE_SIZE, max_low_pfn * PAGE_SIZE,
+#endif
+               ((max_low_pfn - min_low_pfn) * PAGE_SIZE) >> 20,
+               (unsigned long)_text, (unsigned long)_etext,
+               (unsigned long)(_etext - _text) >> 10,
+               (unsigned long)__start_rodata, (unsigned long)__end_rodata,
+               (unsigned long)(__end_rodata - __start_rodata) >> 10,
+               (unsigned long)_sdata, (unsigned long)_edata,
+               (unsigned long)(_edata - _sdata) >> 10,
+               (unsigned long)__init_begin, (unsigned long)__init_end,
+               (unsigned long)(__init_end - __init_begin) >> 10,
+               (unsigned long)__bss_start, (unsigned long)__bss_stop,
+               (unsigned long)(__bss_stop - __bss_start) >> 10);
+}
 
 void __init zones_init(void)
 {
@@ -77,6 +126,7 @@ void __init zones_init(void)
 #endif
        };
        free_area_init(max_zone_pfn);
+       print_vm_layout();
 }
 
 static void __init free_highpages(void)
@@ -118,53 +168,6 @@ void __init mem_init(void)
        high_memory = (void *)__va(max_low_pfn << PAGE_SHIFT);
 
        memblock_free_all();
-
-       pr_info("virtual kernel memory layout:\n"
-#ifdef CONFIG_KASAN
-               "    kasan   : 0x%08lx - 0x%08lx  (%5lu MB)\n"
-#endif
-#ifdef CONFIG_MMU
-               "    vmalloc : 0x%08lx - 0x%08lx  (%5lu MB)\n"
-#endif
-#ifdef CONFIG_HIGHMEM
-               "    pkmap   : 0x%08lx - 0x%08lx  (%5lu kB)\n"
-               "    fixmap  : 0x%08lx - 0x%08lx  (%5lu kB)\n"
-#endif
-               "    lowmem  : 0x%08lx - 0x%08lx  (%5lu MB)\n"
-               "    .text   : 0x%08lx - 0x%08lx  (%5lu kB)\n"
-               "    .rodata : 0x%08lx - 0x%08lx  (%5lu kB)\n"
-               "    .data   : 0x%08lx - 0x%08lx  (%5lu kB)\n"
-               "    .init   : 0x%08lx - 0x%08lx  (%5lu kB)\n"
-               "    .bss    : 0x%08lx - 0x%08lx  (%5lu kB)\n",
-#ifdef CONFIG_KASAN
-               KASAN_SHADOW_START, KASAN_SHADOW_START + KASAN_SHADOW_SIZE,
-               KASAN_SHADOW_SIZE >> 20,
-#endif
-#ifdef CONFIG_MMU
-               VMALLOC_START, VMALLOC_END,
-               (VMALLOC_END - VMALLOC_START) >> 20,
-#ifdef CONFIG_HIGHMEM
-               PKMAP_BASE, PKMAP_BASE + LAST_PKMAP * PAGE_SIZE,
-               (LAST_PKMAP*PAGE_SIZE) >> 10,
-               FIXADDR_START, FIXADDR_END,
-               (FIXADDR_END - FIXADDR_START) >> 10,
-#endif
-               PAGE_OFFSET, PAGE_OFFSET +
-               (max_low_pfn - min_low_pfn) * PAGE_SIZE,
-#else
-               min_low_pfn * PAGE_SIZE, max_low_pfn * PAGE_SIZE,
-#endif
-               ((max_low_pfn - min_low_pfn) * PAGE_SIZE) >> 20,
-               (unsigned long)_text, (unsigned long)_etext,
-               (unsigned long)(_etext - _text) >> 10,
-               (unsigned long)__start_rodata, (unsigned long)__end_rodata,
-               (unsigned long)(__end_rodata - __start_rodata) >> 10,
-               (unsigned long)_sdata, (unsigned long)_edata,
-               (unsigned long)(_edata - _sdata) >> 10,
-               (unsigned long)__init_begin, (unsigned long)__init_end,
-               (unsigned long)(__init_end - __init_begin) >> 10,
-               (unsigned long)__bss_start, (unsigned long)__bss_stop,
-               (unsigned long)(__bss_stop - __bss_start) >> 10);
 }
 
 static void __init parse_memmap_one(char *p)