Commit 374d5c99 authored by Santosh Shilimkar's avatar Santosh Shilimkar Committed by Grant Likely
Browse files

of: Specify initrd location using 64-bit 

On some PAE architectures, the entire range of physical memory could reside
outside the 32-bit limit.  These systems need the ability to specify the
initrd location using 64-bit numbers.

This patch globally modifies the early_init_dt_setup_initrd_arch() function to
use 64-bit numbers instead of the current unsigned long.

There has been quite a bit of debate about whether to use u64 or phys_addr_t.
It was concluded to stick to u64 to be consistent with rest of the device
tree code. As summarized by Geert, "The address to load the initrd is decided
by the bootloader/user and set at that point later in time. The dtb should not
be tied to the kernel you are booting"

More details on the discussion can be found here:
https://lkml.org/lkml/2013/6/20/690
https://lkml.org/lkml/2012/9/13/544



Signed-off-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: default avatarRob Herring <rob.herring@calxeda.com>
Acked-by: default avatarVineet Gupta <vgupta@synopsys.com>
Acked-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: default avatarGrant Likely <grant.likely@linaro.org>
parent dcde8632

arch/arc/mm/init.c

+2 −3
Original line number Diff line number Diff line
@@ -127,9 +127,8 @@ void __init free_initrd_mem(unsigned long start, unsigned long end) 
#endif



#ifdef CONFIG_OF_FLATTREE

void __init early_init_dt_setup_initrd_arch(unsigned long start,

					    unsigned long end)

void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)

{

	pr_err("%s(%lx, %lx)\n", __func__, start, end);

	pr_err("%s(%llx, %llx)\n", __func__, start, end);

}

#endif /* CONFIG_OF_FLATTREE */

arch/arm/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static int __init parse_tag_initrd2(const struct tag *tag) 
__tagtable(ATAG_INITRD2, parse_tag_initrd2);



#ifdef CONFIG_OF_FLATTREE

void __init early_init_dt_setup_initrd_arch(unsigned long start, unsigned long end)

void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)

{

	phys_initrd_start = start;

	phys_initrd_size = end - start;

arch/arm64/mm/init.c

+1 −2
Original line number Diff line number Diff line
@@ -44,8 +44,7 @@ static unsigned long phys_initrd_size __initdata = 0; 


phys_addr_t memstart_addr __read_mostly = 0;



void __init early_init_dt_setup_initrd_arch(unsigned long start,

					    unsigned long end)

void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)

{

	phys_initrd_start = start;

	phys_initrd_size = end - start;

arch/c6x/kernel/devicetree.c

+1 −2
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ void __init early_init_devtree(void *params) 




#ifdef CONFIG_BLK_DEV_INITRD

void __init early_init_dt_setup_initrd_arch(unsigned long start,

		unsigned long end)

void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)

{

	initrd_start = (unsigned long)__va(start);

	initrd_end = (unsigned long)__va(end);

arch/metag/mm/init.c

+2 −3
Original line number Diff line number Diff line
@@ -407,10 +407,9 @@ void free_initrd_mem(unsigned long start, unsigned long end) 
#endif



#ifdef CONFIG_OF_FLATTREE

void __init early_init_dt_setup_initrd_arch(unsigned long start,

					    unsigned long end)

void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)

{

	pr_err("%s(%lx, %lx)\n",

	pr_err("%s(%llx, %llx)\n",

	       __func__, start, end);

}

#endif /* CONFIG_OF_FLATTREE */

CRA Git | Maintained and supported by SUSTech CRA and CCSE