arm64: set initrd_start/initrd_end for fdt scan (ec2eaa73) · Commits · 戴 / test

arch/arm64/mm/init.c

+6 −18

Original line number	Diff line number	Diff line
		@@ -39,17 +39,9 @@

		#include "mm.h"

		static unsigned long phys_initrd_start __initdata = 0;
		static unsigned long phys_initrd_size __initdata = 0;

		phys_addr_t memstart_addr __read_mostly = 0;

		void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)
		{
		phys_initrd_start = start;
		phys_initrd_size = end - start;
		}

		#ifdef CONFIG_BLK_DEV_INITRD
		static int __init early_initrd(char *p)
		{
		unsigned long start, size;
		@@ -59,12 +51,13 @@ static int __init early_initrd(char *p)
		if (*endp == ',') {
		size = memparse(endp + 1, NULL);

		phys_initrd_start = start;
		phys_initrd_size = size;
		initrd_start = (unsigned long)__va(start);
		initrd_end = (unsigned long)__va(start + size);
		}
		return 0;
		}
		early_param("initrd", early_initrd);
		#endif

		#define MAX_DMA32_PFN ((4UL * 1024 * 1024 * 1024) >> PAGE_SHIFT)

		@@ -137,13 +130,8 @@ void __init arm64_memblock_init(void)
		/* Register the kernel text, kernel data and initrd with memblock */
		memblock_reserve(__pa(_text), _end - _text);
		#ifdef CONFIG_BLK_DEV_INITRD
		if (phys_initrd_size) {
		memblock_reserve(phys_initrd_start, phys_initrd_size);

		/* Now convert initrd to virtual addresses */
		initrd_start = __phys_to_virt(phys_initrd_start);
		initrd_end = initrd_start + phys_initrd_size;
		}
		if (initrd_start)
		memblock_reserve(__virt_to_phys(initrd_start), initrd_end - initrd_start);
		#endif

		/*