Commit 41a9ada3 authored by Reza Arbab's avatar Reza Arbab Committed by Linus Torvalds
Browse files

of/fdt: mark hotpluggable memory 

When movable nodes are enabled, any node containing only hotpluggable
memory is made movable at boot time.

On x86, hotpluggable memory is discovered by parsing the ACPI SRAT,
making corresponding calls to memblock_mark_hotplug().

If we introduce a dt property to describe memory as hotpluggable,
configs supporting early fdt may then also do this marking and use
movable nodes.

Link: http://lkml.kernel.org/r/1479160961-25840-5-git-send-email-arbab@linux.vnet.ibm.com


Signed-off-by: default avatarReza Arbab <arbab@linux.vnet.ibm.com>
Tested-by: default avatarBalbir Singh <bsingharora@gmail.com>
Acked-by: default avatarBalbir Singh <bsingharora@gmail.com>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Alistair Popple <apopple@au1.ibm.com>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Bharata B Rao <bharata@linux.vnet.ibm.com>
Cc: Frank Rowand <frowand.list@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Stewart Smith <stewart@linux.vnet.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 114cf3cc

drivers/of/fdt.c

+19 −0
Original line number Diff line number Diff line
@@ -1015,6 +1015,7 @@ int __init early_init_dt_scan_memory(unsigned long node, const char *uname, 
	const char *type = of_get_flat_dt_prop(node, "device_type", NULL);

	const __be32 *reg, *endp;

	int l;

	bool hotpluggable;



	/* We are scanning "memory" nodes only */

	if (type == NULL) {
@@ -1034,6 +1035,7 @@ int __init early_init_dt_scan_memory(unsigned long node, const char *uname, 
		return 0;



	endp = reg + (l / sizeof(__be32));

	hotpluggable = of_get_flat_dt_prop(node, "hotpluggable", NULL);



	pr_debug("memory scan node %s, reg size %d,\n", uname, l);
@@ -1049,6 +1051,13 @@ int __init early_init_dt_scan_memory(unsigned long node, const char *uname, 
		    (unsigned long long)size);



		early_init_dt_add_memory_arch(base, size);



		if (!hotpluggable)

			continue;



		if (early_init_dt_mark_hotplug_memory_arch(base, size))

			pr_warn("failed to mark hotplug range 0x%llx - 0x%llx\n",

				base, base + size);

	}



	return 0;
@@ -1146,6 +1155,11 @@ void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size) 
	memblock_add(base, size);

}



int __init __weak early_init_dt_mark_hotplug_memory_arch(u64 base, u64 size)

{

	return memblock_mark_hotplug(base, size);

}



int __init __weak early_init_dt_reserve_memory_arch(phys_addr_t base,

					phys_addr_t size, bool nomap)

{
@@ -1168,6 +1182,11 @@ void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size) 
	WARN_ON(1);

}



int __init __weak early_init_dt_mark_hotplug_memory_arch(u64 base, u64 size)

{

	return -ENOSYS;

}



int __init __weak early_init_dt_reserve_memory_arch(phys_addr_t base,

					phys_addr_t size, bool nomap)

{

include/linux/of_fdt.h

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ extern int early_init_dt_scan_chosen_stdout(void); 
extern void early_init_fdt_scan_reserved_mem(void);

extern void early_init_fdt_reserve_self(void);

extern void early_init_dt_add_memory_arch(u64 base, u64 size);

extern int early_init_dt_mark_hotplug_memory_arch(u64 base, u64 size);

extern int early_init_dt_reserve_memory_arch(phys_addr_t base, phys_addr_t size,

					     bool no_map);

extern void * early_init_dt_alloc_memory_arch(u64 size, u64 align);

mm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ config MOVABLE_NODE 
	bool "Enable to assign a node which has only movable memory"

	depends on HAVE_MEMBLOCK

	depends on NO_BOOTMEM

	depends on X86_64 || MEMORY_HOTPLUG

	depends on X86_64 || OF_EARLY_FLATTREE || MEMORY_HOTPLUG

	depends on NUMA

	default n

	help

CRA Git | Maintained and supported by SUSTech CRA and CCSE