of/fdt: move memreserve and dtb memory reservations into core (d1552ce4) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm/include/asm/prom.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,6 @@
	#ifdef CONFIG_OF		#ifdef CONFIG_OF

	extern const struct machine_desc *setup_machine_fdt(unsigned int dt_phys);		extern const struct machine_desc *setup_machine_fdt(unsigned int dt_phys);
	extern void arm_dt_memblock_reserve(void);
	extern void __init arm_dt_init_cpu_maps(void);		extern void __init arm_dt_init_cpu_maps(void);

	#else /* CONFIG_OF */		#else /* CONFIG_OF */
	@@ -24,7 +23,6 @@ static inline const struct machine_desc *setup_machine_fdt(unsigned int dt_phys)
	return NULL;		return NULL;
	}		}

	static inline void arm_dt_memblock_reserve(void) { }
	static inline void arm_dt_init_cpu_maps(void) { }		static inline void arm_dt_init_cpu_maps(void) { }

	#endif /* CONFIG_OF */		#endif /* CONFIG_OF */

arch/arm/kernel/devtree.c

+0 −27

Original line number	Original line	Diff line number	Diff line
	@@ -32,33 +32,6 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size)
	arm_add_memory(base, size);		arm_add_memory(base, size);
	}		}

	void __init arm_dt_memblock_reserve(void)
	{
	u64 *reserve_map, base, size;

	if (!initial_boot_params)
	return;

	/* Reserve the dtb region */
	memblock_reserve(virt_to_phys(initial_boot_params),
	be32_to_cpu(initial_boot_params->totalsize));

	/*
	* Process the reserve map. This will probably overlap the initrd
	* and dtb locations which are already reserved, but overlaping
	* doesn't hurt anything
	*/
	reserve_map = ((void*)initial_boot_params) +
	be32_to_cpu(initial_boot_params->off_mem_rsvmap);
	while (1) {
	base = be64_to_cpup(reserve_map++);
	size = be64_to_cpup(reserve_map++);
	if (!size)
	break;
	memblock_reserve(base, size);
	}
	}

	#ifdef CONFIG_SMP		#ifdef CONFIG_SMP
	extern struct of_cpu_method __cpu_method_of_table_begin[];		extern struct of_cpu_method __cpu_method_of_table_begin[];
	extern struct of_cpu_method __cpu_method_of_table_end[];		extern struct of_cpu_method __cpu_method_of_table_end[];

arch/arm/mm/init.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -317,7 +317,6 @@ void __init arm_memblock_init(struct meminfo *mi,
	#endif		#endif

	arm_mm_memblock_reserve();		arm_mm_memblock_reserve();
	arm_dt_memblock_reserve();

	/* reserve any platform specific memblock areas */		/* reserve any platform specific memblock areas */
	if (mdesc->reserve)		if (mdesc->reserve)

arch/arm64/mm/init.c

+0 −21

Original line number	Original line	Diff line number	Diff line
	@@ -126,8 +126,6 @@ static void arm64_memory_present(void)

	void __init arm64_memblock_init(void)		void __init arm64_memblock_init(void)
	{		{
	u64 *reserve_map, base, size;

	/* Register the kernel text, kernel data and initrd with memblock */		/* Register the kernel text, kernel data and initrd with memblock */
	memblock_reserve(__pa(_text), _end - _text);		memblock_reserve(__pa(_text), _end - _text);
	#ifdef CONFIG_BLK_DEV_INITRD		#ifdef CONFIG_BLK_DEV_INITRD
	@@ -142,25 +140,6 @@ void __init arm64_memblock_init(void)
	memblock_reserve(__pa(swapper_pg_dir), SWAPPER_DIR_SIZE);		memblock_reserve(__pa(swapper_pg_dir), SWAPPER_DIR_SIZE);
	memblock_reserve(__pa(idmap_pg_dir), IDMAP_DIR_SIZE);		memblock_reserve(__pa(idmap_pg_dir), IDMAP_DIR_SIZE);

	/* Reserve the dtb region */
	memblock_reserve(virt_to_phys(initial_boot_params),
	be32_to_cpu(initial_boot_params->totalsize));

	/*
	* Process the reserve map. This will probably overlap the initrd
	* and dtb locations which are already reserved, but overlapping
	* doesn't hurt anything
	*/
	reserve_map = ((void*)initial_boot_params) +
	be32_to_cpu(initial_boot_params->off_mem_rsvmap);
	while (1) {
	base = be64_to_cpup(reserve_map++);
	size = be64_to_cpup(reserve_map++);
	if (!size)
	break;
	memblock_reserve(base, size);
	}

	early_init_fdt_scan_reserved_mem();		early_init_fdt_scan_reserved_mem();
	dma_contiguous_reserve(0);		dma_contiguous_reserve(0);

arch/powerpc/kernel/prom.c

+0 −22

Original line number	Original line	Diff line number	Diff line
	@@ -596,19 +596,11 @@ static void __init early_reserve_mem_dt(void)

	static void __init early_reserve_mem(void)		static void __init early_reserve_mem(void)
	{		{
	u64 base, size;
	__be64 *reserve_map;		__be64 *reserve_map;
	unsigned long self_base;
	unsigned long self_size;

	reserve_map = (__be64 *)(((unsigned long)initial_boot_params) +		reserve_map = (__be64 *)(((unsigned long)initial_boot_params) +
	be32_to_cpu(initial_boot_params->off_mem_rsvmap));		be32_to_cpu(initial_boot_params->off_mem_rsvmap));

	/* before we do anything, lets reserve the dt blob */
	self_base = __pa((unsigned long)initial_boot_params);
	self_size = be32_to_cpu(initial_boot_params->totalsize);
	memblock_reserve(self_base, self_size);

	/* Look for the new "reserved-regions" property in the DT */		/* Look for the new "reserved-regions" property in the DT */
	early_reserve_mem_dt();		early_reserve_mem_dt();

	@@ -637,26 +629,12 @@ static void __init early_reserve_mem(void)
	size_32 = be32_to_cpup(reserve_map_32++);		size_32 = be32_to_cpup(reserve_map_32++);
	if (size_32 == 0)		if (size_32 == 0)
	break;		break;
	/* skip if the reservation is for the blob */
	if (base_32 == self_base && size_32 == self_size)
	continue;
	DBG("reserving: %x -> %x\n", base_32, size_32);		DBG("reserving: %x -> %x\n", base_32, size_32);
	memblock_reserve(base_32, size_32);		memblock_reserve(base_32, size_32);
	}		}
	return;		return;
	}		}
	#endif		#endif
	DBG("Processing reserve map\n");

	/* Handle the reserve map in the fdt blob if it exists */
	while (1) {
	base = be64_to_cpup(reserve_map++);
	size = be64_to_cpup(reserve_map++);
	if (size == 0)
	break;
	DBG("reserving: %llx -> %llx\n", base, size);
	memblock_reserve(base, size);
	}
	}		}

	void __init early_init_devtree(void *params)		void __init early_init_devtree(void *params)