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

MIPS: make setup_zero_pages() use memblock 

Allocating the zero pages from memblock is simpler because the memory is
already reserved.

This will also 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-6-rppt@kernel.org


Signed-off-by: default avatarMike Rapoport (Microsoft) <rppt@kernel.org>
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: Max Filippov <jcmvbkbc@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: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 67e7a600

arch/mips/include/asm/mmzone.h

+0 −2
Original line number Diff line number Diff line
@@ -20,6 +20,4 @@ 
#define nid_to_addrbase(nid) 0

#endif



extern void setup_zero_pages(void);



#endif /* _ASM_MMZONE_H_ */

arch/mips/mm/init.c

+5 −13
Original line number Diff line number Diff line
@@ -59,24 +59,16 @@ EXPORT_SYMBOL(zero_page_mask); 
/*

 * Not static inline because used by IP27 special magic initialization code

 */

void setup_zero_pages(void)

static void __init setup_zero_pages(void)

{

	unsigned int order, i;

	struct page *page;

	unsigned int order;



	if (cpu_has_vce)

		order = 3;

	else

		order = 0;



	empty_zero_page = __get_free_pages(GFP_KERNEL | __GFP_ZERO, order);

	if (!empty_zero_page)

		panic("Oh boy, that early out of memory?");



	page = virt_to_page((void *)empty_zero_page);

	split_page(page, order);

	for (i = 0; i < (1 << order); i++, page++)

		mark_page_reserved(page);

	empty_zero_page = (unsigned long)memblock_alloc_or_panic(PAGE_SIZE << order, PAGE_SIZE);



	zero_page_mask = ((PAGE_SIZE << order) - 1) & PAGE_MASK;

}
@@ -470,9 +462,9 @@ void __init mem_init(void) 
	BUILD_BUG_ON(IS_ENABLED(CONFIG_32BIT) && (PFN_PTE_SHIFT > PAGE_SHIFT));



	maar_init();

	memblock_free_all();

	setup_zero_pages();	/* Setup zeroed pages.  */

	mem_init_free_highmem();

	memblock_free_all();



#ifdef CONFIG_64BIT

	if ((unsigned long) &_text > (unsigned long) CKSEG0)
@@ -486,8 +478,8 @@ void __init mem_init(void) 
void __init mem_init(void)

{

	high_memory = (void *) __va(get_num_physpages() << PAGE_SHIFT);

	memblock_free_all();

	setup_zero_pages();	/* This comes from node 0 */

	memblock_free_all();

}

#endif /* !CONFIG_NUMA */