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

Commit a89dea58 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Catalin Marinas
Browse files

arm64: defer __va translation of initrd_start and initrd_end 



Before deferring the assignment of memstart_addr in a subsequent patch, to
the moment where all memory has been discovered and possibly clipped based
on the size of the linear region and the presence of a mem= command line
parameter, we need to ensure that memstart_addr is not used to perform __va
translations before it is assigned.

One such use is in the generic early DT discovery of the initrd location,
which is recorded as a virtual address in the globals initrd_start and
initrd_end. So wire up the generic support to declare the initrd addresses,
and implement it without __va() translations, and perform the translation
after memstart_addr has been assigned.

Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent f9040773

arch/arm64/include/asm/memory.h

+8 −0
Original line number Diff line number Diff line
@@ -121,6 +121,14 @@ 
#define IOREMAP_MAX_ORDER	(PMD_SHIFT)

#endif



#ifdef CONFIG_BLK_DEV_INITRD

#define __early_init_dt_declare_initrd(__start, __end)			\

	do {								\

		initrd_start = (__start);				\

		initrd_end = (__end);					\

	} while (0)

#endif



#ifndef __ASSEMBLY__



extern phys_addr_t		memstart_addr;

arch/arm64/mm/init.c

+9 −4
Original line number Diff line number Diff line
@@ -59,8 +59,8 @@ static int __init early_initrd(char *p) 
	if (*endp == ',') {

		size = memparse(endp + 1, NULL);



		initrd_start = (unsigned long)__va(start);

		initrd_end = (unsigned long)__va(start + size);

		initrd_start = start;

		initrd_end = start + size;

	}

	return 0;

}
@@ -168,8 +168,13 @@ void __init arm64_memblock_init(void) 
	 */

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

#ifdef CONFIG_BLK_DEV_INITRD

	if (initrd_start)

		memblock_reserve(__virt_to_phys(initrd_start), initrd_end - initrd_start);

	if (initrd_start) {

		memblock_reserve(initrd_start, initrd_end - initrd_start);



		/* the generic initrd code expects virtual addresses */

		initrd_start = __phys_to_virt(initrd_start);

		initrd_end = __phys_to_virt(initrd_end);

	}

#endif



	early_init_fdt_scan_reserved_mem();