Commit 65939301 authored by Rob Herring's avatar Rob Herring
Browse files

arm: set initrd_start/initrd_end for fdt scan 



In order to unify the initrd scanning for DT across architectures, make
arm set initrd_start and initrd_end instead of the physical addresses.
This is aligned with all other architectures.

Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: linux-arm-kernel@lists.infradead.org
Acked-by: default avatarGrant Likely <grant.likely@linaro.org>
parent 068f6310

arch/arm/mm/init.c

+8 −3
Original line number Original line Diff line number Diff line
@@ -77,11 +77,11 @@ static int __init parse_tag_initrd2(const struct tag *tag) 




__tagtable(ATAG_INITRD2, parse_tag_initrd2);

__tagtable(ATAG_INITRD2, parse_tag_initrd2);





#ifdef CONFIG_OF_FLATTREE

#if defined(CONFIG_OF_FLATTREE) && defined(CONFIG_BLK_DEV_INITRD)

void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)

void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)

{

{

	phys_initrd_start = start;

	initrd_start = (unsigned long)__va(start);

	phys_initrd_size = end - start;

	initrd_end = (unsigned long)__va(end);

}

}

#endif /* CONFIG_OF_FLATTREE */

#endif /* CONFIG_OF_FLATTREE */
@@ -351,6 +351,11 @@ void __init arm_memblock_init(struct meminfo *mi, 
	memblock_reserve(__pa(_stext), _end - _stext);

	memblock_reserve(__pa(_stext), _end - _stext);

#endif

#endif

#ifdef CONFIG_BLK_DEV_INITRD

#ifdef CONFIG_BLK_DEV_INITRD

	/* FDT scan will populate initrd_start */

	if (initrd_start) {

		phys_initrd_start = __virt_to_phys(initrd_start);

		phys_initrd_size = initrd_end - initrd_start;

	}

	if (phys_initrd_size &&

	if (phys_initrd_size &&

	    !memblock_is_region_memory(phys_initrd_start, phys_initrd_size)) {

	    !memblock_is_region_memory(phys_initrd_start, phys_initrd_size)) {

		pr_err("INITRD: 0x%08llx+0x%08lx is not a memory region - disabling initrd\n",

		pr_err("INITRD: 0x%08llx+0x%08lx is not a memory region - disabling initrd\n",

CRA Git | Maintained and supported by SUSTech CRA and CCSE