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

Commit 0271f910 authored by Haicheng Li's avatar Haicheng Li Committed by H. Peter Anvin
Browse files

x86, acpi: Map hotadded cpu to correct node. 



When hotadd new cpu to system, if its affinitive node is online,
should map the cpu to its own node.  Otherwise, let kernel select one
online node for the new cpu later.

Signed-off-by: default avatarHaicheng Li <haicheng.li@linux.intel.com>
LKML-Reference: <4B6AAA39.6000300@linux.intel.com>
Tested-by: default avatarThomas Renninger <trenn@suse.de>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent e28cab42

arch/x86/kernel/acpi/boot.c

+21 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ EXPORT_SYMBOL(acpi_disabled); 


#ifdef	CONFIG_X86_64

# include <asm/proto.h>

# include <asm/numa_64.h>

#endif				/* X86 */



#define BAD_MADT_ENTRY(entry, end) (					    \
@@ -482,6 +483,25 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger, int polarity) 
 */

#ifdef CONFIG_ACPI_HOTPLUG_CPU



static void acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)

{

#ifdef CONFIG_ACPI_NUMA

	int nid;



	nid = acpi_get_node(handle);

	if (nid == -1 || !node_online(nid))

		return;

#ifdef CONFIG_X86_64

	apicid_to_node[physid] = nid;

	numa_set_node(cpu, nid);

#else /* CONFIG_X86_32 */

	apicid_2_node[physid] = nid;

	cpu_to_node_map[cpu] = nid;

#endif



#endif

}



static int __cpuinit _acpi_map_lsapic(acpi_handle handle, int *pcpu)

{

	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
@@ -540,6 +560,7 @@ static int __cpuinit _acpi_map_lsapic(acpi_handle handle, int *pcpu) 
	}



	cpu = cpumask_first(new_map);

	acpi_map_cpu2node(handle, cpu, physid);



	*pcpu = cpu;

	retval = 0;