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

Commit 8923a166 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Will Deacon
Browse files

arm64: remove the now unneeded relocate_initrd() 



This removes the relocate_initrd() implementation and invocation, which are
no longer needed now that the placement of the initrd is guaranteed to be
covered by the linear mapping.

Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 177e15f0

arch/arm64/kernel/setup.c

+0 −64
Original line number Diff line number Diff line
@@ -224,69 +224,6 @@ static void __init request_standard_resources(void) 
	}

}



#ifdef CONFIG_BLK_DEV_INITRD

/*

 * Relocate initrd if it is not completely within the linear mapping.

 * This would be the case if mem= cuts out all or part of it.

 */

static void __init relocate_initrd(void)

{

	phys_addr_t orig_start = __virt_to_phys(initrd_start);

	phys_addr_t orig_end = __virt_to_phys(initrd_end);

	phys_addr_t ram_end = memblock_end_of_DRAM();

	phys_addr_t new_start;

	unsigned long size, to_free = 0;

	void *dest;



	if (orig_end <= ram_end)

		return;



	/*

	 * Any of the original initrd which overlaps the linear map should

	 * be freed after relocating.

	 */

	if (orig_start < ram_end)

		to_free = ram_end - orig_start;



	size = orig_end - orig_start;

	if (!size)

		return;



	/* initrd needs to be relocated completely inside linear mapping */

	new_start = memblock_find_in_range(0, PFN_PHYS(max_pfn),

					   size, PAGE_SIZE);

	if (!new_start)

		panic("Cannot relocate initrd of size %ld\n", size);

	memblock_reserve(new_start, size);



	initrd_start = __phys_to_virt(new_start);

	initrd_end   = initrd_start + size;



	pr_info("Moving initrd from [%llx-%llx] to [%llx-%llx]\n",

		orig_start, orig_start + size - 1,

		new_start, new_start + size - 1);



	dest = (void *)initrd_start;



	if (to_free) {

		memcpy(dest, (void *)__phys_to_virt(orig_start), to_free);

		dest += to_free;

	}



	copy_from_early_mem(dest, orig_start + to_free, size - to_free);



	if (to_free) {

		pr_info("Freeing original RAMDISK from [%llx-%llx]\n",

			orig_start, orig_start + to_free - 1);

		memblock_free(orig_start, to_free);

	}

}

#else

static inline void __init relocate_initrd(void)

{

}

#endif



u64 __cpu_logical_map[NR_CPUS] = { [0 ... NR_CPUS-1] = INVALID_HWID };



void __init setup_arch(char **cmdline_p)
@@ -327,7 +264,6 @@ void __init setup_arch(char **cmdline_p) 
	acpi_boot_table_init();



	paging_init();

	relocate_initrd();



	kasan_init();