Commit 27bebe44 authored by Mike Rapoport (Microsoft)'s avatar Mike Rapoport (Microsoft) Committed by Andrew Morton
Browse files

powerpc: introduce arch_zone_limits_init() 

Move calculations of zone limits to a dedicated arch_zone_limits_init()
function.

Later MM core will use this function as an architecture specific callback
during nodes and zones initialization and thus there won't be a need to
call free_area_init() from every architecture.

Link: https://lkml.kernel.org/r/20260111082105.290734-16-rppt@kernel.org


Signed-off-by: default avatarMike Rapoport (Microsoft) <rppt@kernel.org>
Reviewed-by: default avatarRitesh Harjani (IBM) <ritesh.list@gmail.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Alex Shi <alexs@kernel.org>
Cc: Andreas Larsson <andreas@gaisler.com>
Cc: "Borislav Petkov (AMD)" <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: David Hildenbrand <david@kernel.org>
Cc: David S. Miller <davem@davemloft.net>
Cc: Dinh Nguyen <dinguyen@kernel.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Guo Ren <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: Johannes Berg <johannes@sipsolutions.net>
Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Klara Modin <klarasmodin@gmail.com>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Cc: Magnus Lindholm <linmag7@gmail.com>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Pratyush Yadav <pratyush@kernel.org>
Cc: Richard Weinberger <richard@nod.at>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Stafford Horne <shorne@gmail.com>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Vineet Gupta <vgupta@kernel.org>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 950696af

arch/powerpc/mm/mem.c

+12 −10
Original line number Diff line number Diff line
@@ -221,13 +221,23 @@ static int __init mark_nonram_nosave(void) 
 * anyway) will take a first dip into ZONE_NORMAL and get otherwise served by

 * ZONE_DMA.

 */

static unsigned long max_zone_pfns[MAX_NR_ZONES];

void __init arch_zone_limits_init(unsigned long *max_zone_pfns)

{

#ifdef CONFIG_ZONE_DMA

	max_zone_pfns[ZONE_DMA] = min((zone_dma_limit >> PAGE_SHIFT) + 1, max_low_pfn);

#endif

	max_zone_pfns[ZONE_NORMAL] = max_low_pfn;

#ifdef CONFIG_HIGHMEM

	max_zone_pfns[ZONE_HIGHMEM] = max_pfn;

#endif

}



/*

 * paging_init() sets up the page tables - in fact we've already done this.

 */

void __init paging_init(void)

{

	unsigned long max_zone_pfns[MAX_NR_ZONES] = { 0 };

	unsigned long long total_ram = memblock_phys_mem_size();

	phys_addr_t top_of_ram = memblock_end_of_DRAM();

	int zone_dma_bits;
@@ -259,15 +269,7 @@ void __init paging_init(void) 


	zone_dma_limit = DMA_BIT_MASK(zone_dma_bits);



#ifdef CONFIG_ZONE_DMA

	max_zone_pfns[ZONE_DMA]	= min(max_low_pfn,

				      1UL << (zone_dma_bits - PAGE_SHIFT));

#endif

	max_zone_pfns[ZONE_NORMAL] = max_low_pfn;

#ifdef CONFIG_HIGHMEM

	max_zone_pfns[ZONE_HIGHMEM] = max_pfn;

#endif



	arch_zone_limits_init(max_zone_pfns);

	free_area_init(max_zone_pfns);



	mark_nonram_nosave();