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

Commit 6525afdf authored by Hanjun Guo's avatar Hanjun Guo Committed by Rafael J. Wysocki
Browse files

ACPI / NUMA: move acpi_numa_slit_init() to drivers/acpi/numa.c 



Identical implementations of acpi_numa_slit_init() are used by both
x86 and follow-on arm64 support.  Move it to drivers/acpi/numa.c, and
guard with CONFIG_X86 || CONFIG_ARM64 because ia64 has its own
architecture specific implementation.

No code change.

Signed-off-by: default avatarHanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: default avatarRobert Richter <rrichter@cavium.com>
Signed-off-by: default avatarDavid Daney <david.daney@cavium.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 312521d0

arch/x86/mm/srat.c

+0 −27
Original line number Diff line number Diff line
@@ -42,33 +42,6 @@ static __init inline int srat_disabled(void) 
	return acpi_numa < 0;

}



/*

 * Callback for SLIT parsing.  pxm_to_node() returns NUMA_NO_NODE for

 * I/O localities since SRAT does not list them.  I/O localities are

 * not supported at this point.

 */

void __init acpi_numa_slit_init(struct acpi_table_slit *slit)

{

	int i, j;



	for (i = 0; i < slit->locality_count; i++) {

		const int from_node = pxm_to_node(i);



		if (from_node == NUMA_NO_NODE)

			continue;



		for (j = 0; j < slit->locality_count; j++) {

			const int to_node = pxm_to_node(j);



			if (to_node == NUMA_NO_NODE)

				continue;



			numa_set_distance(from_node, to_node,

				slit->entry[slit->locality_count * i + j]);

		}

	}

}



/* Callback for Proximity Domain -> x2APIC mapping */

void __init

acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa)

drivers/acpi/numa.c

+29 −0
Original line number Diff line number Diff line
@@ -197,6 +197,35 @@ static int __init slit_valid(struct acpi_table_slit *slit) 
	return 1;

}



#if defined(CONFIG_X86) || defined(CONFIG_ARM64)

/*

 * Callback for SLIT parsing.  pxm_to_node() returns NUMA_NO_NODE for

 * I/O localities since SRAT does not list them.  I/O localities are

 * not supported at this point.

 */

void __init acpi_numa_slit_init(struct acpi_table_slit *slit)

{

	int i, j;



	for (i = 0; i < slit->locality_count; i++) {

		const int from_node = pxm_to_node(i);



		if (from_node == NUMA_NO_NODE)

			continue;



		for (j = 0; j < slit->locality_count; j++) {

			const int to_node = pxm_to_node(j);



			if (to_node == NUMA_NO_NODE)

				continue;



			numa_set_distance(from_node, to_node,

				slit->entry[slit->locality_count * i + j]);

		}

	}

}

#endif /* defined(CONFIG_X86) || defined (CONFIG_ARM64) */



static int __init acpi_parse_slit(struct acpi_table_header *table)

{

	struct acpi_table_slit *slit = (struct acpi_table_slit *)table;