On 11/5/18 2:58 PM, Florian Fainelli wrote:
> ARC, ARM, ARM64 and Unicore32 are all capable of parsing the "initrd="
> command line parameter to allow specifying the physical address and size
> of an initrd. Move that parsing into init/do_mounts_initrd.c such that
> we no longer duplicate that logic.
>
> Signed-off-by: Florian Fainelli <f.fainelli@xxxxxxxxx>
> ---
> arch/arc/mm/init.c | 25 +++++--------------------
> arch/arm/mm/init.c | 17 -----------------
> arch/arm64/mm/init.c | 18 ------------------
> arch/unicore32/mm/init.c | 18 ------------------
> init/do_mounts_initrd.c | 17 +++++++++++++++++
> 5 files changed, 22 insertions(+), 73 deletions(-)
>
> diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c
> index f8fe5668b30f..43bf4c3a1290 100644
> --- a/arch/arc/mm/init.c
> +++ b/arch/arc/mm/init.c
> @@ -78,24 +78,6 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size)
> base, TO_MB(size), !in_use ? "Not used":"");
> }
>
> -#ifdef CONFIG_BLK_DEV_INITRD
> -static int __init early_initrd(char *p)
> -{
> - unsigned long start, size;
> - char *endp;
> -
> - start = memparse(p, &endp);
> - if (*endp == ',') {
> - size = memparse(endp + 1, NULL);
> -
> - initrd_start = (unsigned long)__va(start);
> - initrd_end = (unsigned long)__va(start + size);
> - }
> - return 0;
> -}
> -early_param("initrd", early_initrd);
> -#endif
> -
> /*
> * First memory setup routine called from setup_arch()
> * 1. setup swapper's mm @init_mm
> @@ -140,8 +122,11 @@ void __init setup_arch_memory(void)
> memblock_reserve(low_mem_start, __pa(_end) - low_mem_start);
>
> #ifdef CONFIG_BLK_DEV_INITRD
> - if (initrd_start)
> - memblock_reserve(__pa(initrd_start), initrd_end - initrd_start);
> + if (phys_initrd_size) {
> + memblock_reserve(phys_initrd_start, phys_initrd_size);
> + initrd_start = (unsigned long)__va(phys_initrd_start);
> + initrd_end = initrd_start + phys_initrd_size;
> + }
> #endif
The common code now uses phys_initrd*, and you also use the same in ARC code, do
we still need the initrd_* setting here ?
ARC semantics was using them as PA anyways.
[snip]...
> /*
> * This keeps memory configuration data used by a couple memory
> * initialization functions, as well as show_mem() for the skipping
> diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
> index 45865b72f4ea..732d21f4a637 100644
> --- a/init/do_mounts_initrd.c
> +++ b/init/do_mounts_initrd.c
> @@ -27,6 +27,23 @@ static int __init no_initrd(char *str)
>
> __setup("noinitrd", no_initrd);
>
> +static int __init early_initrd(char *p)
> +{
> + phys_addr_t start;
> + unsigned long size;
> + char *endp;
> +
> + start = memparse(p, &endp);
> + if (*endp == ',') {
> + size = memparse(endp + 1, NULL);
> +
> + phys_initrd_start = start;
> + phys_initrd_size = size;
> + }
> + return 0;
> +}
> +early_param("initrd", early_initrd);
> +
> static int init_linuxrc(struct subprocess_info *info, struct cred *new)
> {
> ksys_unshare(CLONE_FS | CLONE_FILES);
