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

Commit c756c592 authored by Florian Fainelli's avatar Florian Fainelli Committed by Rob Herring
Browse files

arm64: Utilize phys_initrd_start/phys_initrd_size 



ARM64 is the only architecture that re-defines
__early_init_dt_declare_initrd() in order for that function to populate
initrd_start/initrd_end with physical addresses instead of virtual
addresses. Instead of having an override we can leverage
drivers/of/fdt.c populating phys_initrd_start/phys_initrd_size to
populate those variables for us.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent fe7db757

arch/arm64/mm/init.c

+8 −12
Original line number Diff line number Diff line
@@ -71,8 +71,8 @@ static int __init early_initrd(char *p) 
	if (*endp == ',') {

		size = memparse(endp + 1, NULL);



		initrd_start = start;

		initrd_end = start + size;

		phys_initrd_start = start;

		phys_initrd_size = size;

	}

	return 0;

}
@@ -407,14 +407,14 @@ void __init arm64_memblock_init(void) 
		memblock_add(__pa_symbol(_text), (u64)(_end - _text));

	}



	if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) && initrd_start) {

	if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) && phys_initrd_size) {

		/*

		 * Add back the memory we just removed if it results in the

		 * initrd to become inaccessible via the linear mapping.

		 * Otherwise, this is a no-op

		 */

		u64 base = initrd_start & PAGE_MASK;

		u64 size = PAGE_ALIGN(initrd_end) - base;

		u64 base = phys_initrd_start & PAGE_MASK;

		u64 size = PAGE_ALIGN(phys_initrd_size);



		/*

		 * We can only add back the initrd memory if we don't end up
@@ -458,15 +458,11 @@ void __init arm64_memblock_init(void) 
	 * pagetables with memblock.

	 */

	memblock_reserve(__pa_symbol(_text), _end - _text);

#ifdef CONFIG_BLK_DEV_INITRD

	if (initrd_start) {

		memblock_reserve(initrd_start, initrd_end - initrd_start);



	if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) && phys_initrd_size) {

		/* the generic initrd code expects virtual addresses */

		initrd_start = __phys_to_virt(initrd_start);

		initrd_end = __phys_to_virt(initrd_end);

		initrd_start = __phys_to_virt(phys_initrd_start);

		initrd_end = initrd_start + phys_initrd_size;

	}

#endif



	early_init_fdt_scan_reserved_mem();