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

Commit 5a0b1d78 authored by Max Filippov's avatar Max Filippov
Browse files

xtensa: nommu: clean up memory map dump 



noMMU configuration doesn't use special area for vmalloc allocations,
don't print it in the memory map.
PAGE_OFFSET is fixed to 0 in noMMU, use min_low_pfn and max_low_pfn for
lowmem range display.
Make all XCHAL_KSEG_* constants unsigned long for consistency with other
addresses.

Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
parent 566fb58e

arch/xtensa/include/asm/page.h

+5 −5
Original line number Diff line number Diff line
@@ -20,10 +20,10 @@ 
 * Fixed TLB translations in the processor.

 */



#define XCHAL_KSEG_CACHED_VADDR 0xd0000000

#define XCHAL_KSEG_BYPASS_VADDR 0xd8000000

#define XCHAL_KSEG_PADDR        0x00000000

#define XCHAL_KSEG_SIZE         0x08000000

#define XCHAL_KSEG_CACHED_VADDR __XTENSA_UL_CONST(0xd0000000)

#define XCHAL_KSEG_BYPASS_VADDR __XTENSA_UL_CONST(0xd8000000)

#define XCHAL_KSEG_PADDR        __XTENSA_UL_CONST(0x00000000)

#define XCHAL_KSEG_SIZE         __XTENSA_UL_CONST(0x08000000)



/*

 * PAGE_SHIFT determines the page size
@@ -37,7 +37,7 @@ 
#define PAGE_OFFSET	XCHAL_KSEG_CACHED_VADDR

#define MAX_MEM_PFN	XCHAL_KSEG_SIZE

#else

#define PAGE_OFFSET	0

#define PAGE_OFFSET	__XTENSA_UL_CONST(0)

#define MAX_MEM_PFN	(PLATFORM_DEFAULT_MEM_START + PLATFORM_DEFAULT_MEM_SIZE)

#endif

arch/xtensa/mm/init.c

+7 −1
Original line number Diff line number Diff line
@@ -343,18 +343,24 @@ void __init mem_init(void) 
		"    pkmap   : 0x%08lx - 0x%08lx  (%5lu kB)\n"

		"    fixmap  : 0x%08lx - 0x%08lx  (%5lu kB)\n"

#endif

#ifdef CONFIG_MMU

		"    vmalloc : 0x%08x - 0x%08x  (%5u MB)\n"

		"    lowmem  : 0x%08x - 0x%08lx  (%5lu MB)\n",

#endif

		"    lowmem  : 0x%08lx - 0x%08lx  (%5lu MB)\n",

#ifdef CONFIG_HIGHMEM

		PKMAP_BASE, PKMAP_BASE + LAST_PKMAP * PAGE_SIZE,

		(LAST_PKMAP*PAGE_SIZE) >> 10,

		FIXADDR_START, FIXADDR_TOP,

		(FIXADDR_TOP - FIXADDR_START) >> 10,

#endif

#ifdef CONFIG_MMU

		VMALLOC_START, VMALLOC_END,

		(VMALLOC_END - VMALLOC_START) >> 20,

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

}