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

Commit de22cc6e authored by Vitaly Andrianov's avatar Vitaly Andrianov Committed by Will Deacon
Browse files

ARM: LPAE: use phys_addr_t for initrd location 



This patch fixes the initrd setup code to use phys_addr_t instead of assuming
32-bit addressing.  Without this we cannot boot on systems where initrd is
located above the 4G physical address limit.

Signed-off-by: default avatarVitaly Andrianov <vitalya@ti.com>
Signed-off-by: default avatarCyril Chemparathy <cyril@ti.com>
Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Tested-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Tested-by: default avatarSubash Patel <subash.rp@samsung.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 56bc6286

arch/arm/mm/init.c

+7 −6
Original line number Diff line number Diff line
@@ -36,12 +36,13 @@ 


#include "mm.h"



static unsigned long phys_initrd_start __initdata = 0;

static phys_addr_t phys_initrd_start __initdata = 0;

static unsigned long phys_initrd_size __initdata = 0;



static int __init early_initrd(char *p)

{

	unsigned long start, size;

	phys_addr_t start;

	unsigned long size;

	char *endp;



	start = memparse(p, &endp);
@@ -350,14 +351,14 @@ void __init arm_memblock_init(struct meminfo *mi, struct machine_desc *mdesc) 
#ifdef CONFIG_BLK_DEV_INITRD

	if (phys_initrd_size &&

	    !memblock_is_region_memory(phys_initrd_start, phys_initrd_size)) {

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

		       phys_initrd_start, phys_initrd_size);

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

		       (u64)phys_initrd_start, phys_initrd_size);

		phys_initrd_start = phys_initrd_size = 0;

	}

	if (phys_initrd_size &&

	    memblock_is_region_reserved(phys_initrd_start, phys_initrd_size)) {

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

		       phys_initrd_start, phys_initrd_size);

		pr_err("INITRD: 0x%08llx+0x%08lx overlaps in-use memory region - disabling initrd\n",

		       (u64)phys_initrd_start, phys_initrd_size);

		phys_initrd_start = phys_initrd_size = 0;

	}

	if (phys_initrd_size) {