On Mon, 16 Sep 2013 18:09:15 -0500, Rob Herring <robherri...@gmail.com> wrote:
> From: Rob Herring <rob.herr...@calxeda.com>
>
> 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: Rob Herring <rob.herr...@calxeda.com>
> Cc: Russell King <li...@arm.linux.org.uk>
> Cc: linux-arm-ker...@lists.infradead.org
Acked-by: Grant Likely <grant.lik...@linaro.org>
> ---
> arch/arm/mm/init.c | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
> index febaee7..9eeb1cd 100644
> --- a/arch/arm/mm/init.c
> +++ b/arch/arm/mm/init.c
> @@ -77,11 +77,11 @@ static int __init parse_tag_initrd2(const struct tag *tag)
>
> __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)
> {
> - phys_initrd_start = start;
> - phys_initrd_size = end - start;
> + initrd_start = (unsigned long)__va(start);
> + initrd_end = (unsigned long)__va(end);
> }
> #endif /* CONFIG_OF_FLATTREE */
>
> @@ -351,6 +351,11 @@ void __init arm_memblock_init(struct meminfo *mi,
> memblock_reserve(__pa(_stext), _end - _stext);
> #endif
> #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 &&
> !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",
> --
> 1.8.1.2
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
