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

csky: move setup_initrd() to setup.c 

Memory used by initrd should be reserved as soon as possible before
there any memblock allocations that might overwrite that memory.

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-3-rppt@kernel.org


Signed-off-by: default avatarMike Rapoport (Microsoft) <rppt@kernel.org>
Acked-by: default avatarGuo Ren (csky) <guoren@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: 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 e11079dd

arch/csky/kernel/setup.c

+43 −0
Original line number Diff line number Diff line
@@ -12,6 +12,45 @@ 
#include <asm/mmu_context.h>

#include <asm/pgalloc.h>



#ifdef CONFIG_BLK_DEV_INITRD

static void __init setup_initrd(void)

{

	unsigned long size;



	if (initrd_start >= initrd_end) {

		pr_err("initrd not found or empty");

		goto disable;

	}



	if (__pa(initrd_end) > PFN_PHYS(max_low_pfn)) {

		pr_err("initrd extends beyond end of memory");

		goto disable;

	}



	size = initrd_end - initrd_start;



	if (memblock_is_region_reserved(__pa(initrd_start), size)) {

		pr_err("INITRD: 0x%08lx+0x%08lx overlaps in-use memory region",

		       __pa(initrd_start), size);

		goto disable;

	}



	memblock_reserve(__pa(initrd_start), size);



	pr_info("Initial ramdisk at: 0x%p (%lu bytes)\n",

		(void *)(initrd_start), size);



	initrd_below_start_ok = 1;



	return;



disable:

	initrd_start = initrd_end = 0;



	pr_err(" - disabling initrd\n");

}

#endif



static void __init csky_memblock_init(void)

{

	unsigned long lowmem_size = PFN_DOWN(LOWMEM_LIMIT - PHYS_OFFSET_OFFSET);
@@ -40,6 +79,10 @@ static void __init csky_memblock_init(void) 
		max_low_pfn = min_low_pfn + sseg_size;

	}



#ifdef CONFIG_BLK_DEV_INITRD

	setup_initrd();

#endif



	max_zone_pfn[ZONE_NORMAL] = max_low_pfn;



	mmu_init(min_low_pfn, max_low_pfn);

arch/csky/mm/init.c

+0 −43
Original line number Diff line number Diff line
@@ -42,45 +42,6 @@ unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)] 
						__page_aligned_bss;

EXPORT_SYMBOL(empty_zero_page);



#ifdef CONFIG_BLK_DEV_INITRD

static void __init setup_initrd(void)

{

	unsigned long size;



	if (initrd_start >= initrd_end) {

		pr_err("initrd not found or empty");

		goto disable;

	}



	if (__pa(initrd_end) > PFN_PHYS(max_low_pfn)) {

		pr_err("initrd extends beyond end of memory");

		goto disable;

	}



	size = initrd_end - initrd_start;



	if (memblock_is_region_reserved(__pa(initrd_start), size)) {

		pr_err("INITRD: 0x%08lx+0x%08lx overlaps in-use memory region",

		       __pa(initrd_start), size);

		goto disable;

	}



	memblock_reserve(__pa(initrd_start), size);



	pr_info("Initial ramdisk at: 0x%p (%lu bytes)\n",

		(void *)(initrd_start), size);



	initrd_below_start_ok = 1;



	return;



disable:

	initrd_start = initrd_end = 0;



	pr_err(" - disabling initrd\n");

}

#endif



void __init mem_init(void)

{

#ifdef CONFIG_HIGHMEM
@@ -92,10 +53,6 @@ void __init mem_init(void) 
#endif

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



#ifdef CONFIG_BLK_DEV_INITRD

	setup_initrd();

#endif



	memblock_free_all();



#ifdef CONFIG_HIGHMEM