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

Commit d7b2c3d8 authored by Tang Chen's avatar Tang Chen Committed by Rafael J. Wysocki
Browse files

ACPI / x86: Print Hot-Pluggable Field in SRAT. 



The Hot-Pluggable field in SRAT suggests if the memory could be
hotplugged while the system is running. Print it as well when
parsing SRAT will help users to know which memory is hotpluggable.

Signed-off-by: default avatarTang Chen <tangchen@cn.fujitsu.com>
Reviewed-by: default avatarWanpeng Li <liwanp@linux.vnet.ibm.com>
Reviewed-by: default avatarZhang Yanfei <zhangyanfei@cn.fujitsu.com>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 70f2903b

arch/x86/mm/srat.c

+7 −4
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ int __init 
acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)

{

	u64 start, end;

	u32 hotpluggable;

	int node, pxm;



	if (srat_disabled())
@@ -154,7 +155,8 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) 
		goto out_err_bad_srat;

	if ((ma->flags & ACPI_SRAT_MEM_ENABLED) == 0)

		goto out_err;

	if ((ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) && !save_add_info())

	hotpluggable = ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE;

	if (hotpluggable && !save_add_info())

		goto out_err;



	start = ma->base_address;
@@ -174,9 +176,10 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) 


	node_set(node, numa_nodes_parsed);



	printk(KERN_INFO "SRAT: Node %u PXM %u [mem %#010Lx-%#010Lx]\n",

	pr_info("SRAT: Node %u PXM %u [mem %#010Lx-%#010Lx]%s\n",

		node, pxm,

	       (unsigned long long) start, (unsigned long long) end - 1);

		(unsigned long long) start, (unsigned long long) end - 1,

		hotpluggable ? " hotplug" : "");



	return 0;

out_err_bad_srat: