Commit 762834e8 authored by Yasunori Goto's avatar Yasunori Goto Committed by Linus Torvalds
Browse files

[PATCH] Unify pxm_to_node() and node_to_pxm() 



Consolidate the various arch-specific implementations of pxm_to_node() and
node_to_pxm() into a single generic version.

Signed-off-by: default avatarYasunori Goto <y-goto@jp.fujitsu.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Andi Kleen <ak@muc.de>
Cc: Dave Hansen <haveblue@us.ibm.com>
Cc: "Brown, Len" <len.brown@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d6277db4

arch/i386/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -173,6 +173,12 @@ config ACPI_SRAT 
	bool

	default y

	depends on NUMA && (X86_SUMMIT || X86_GENERICARCH)

	select ACPI_NUMA



config HAVE_ARCH_PARSE_SRAT

       bool

       default y

       depends on ACPI_SRAT



config X86_SUMMIT_NUMA

	bool

arch/i386/kernel/srat.c

+2 −17
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
#define NODE_ARRAY_OFFSET(x)	((x) % 8)	/* 8 bits/char */

#define BMAP_SET(bmap, bit)	((bmap)[NODE_ARRAY_INDEX(bit)] |= 1 << NODE_ARRAY_OFFSET(bit))

#define BMAP_TEST(bmap, bit)	((bmap)[NODE_ARRAY_INDEX(bit)] & (1 << NODE_ARRAY_OFFSET(bit)))

#define MAX_PXM_DOMAINS		256	/* 1 byte and no promises about values */

/* bitmap length; _PXM is at most 255 */

#define PXM_BITMAP_LEN (MAX_PXM_DOMAINS / 8) 

static u8 pxm_bitmap[PXM_BITMAP_LEN];	/* bitmap of proximity domains */
@@ -213,19 +212,11 @@ static __init void node_read_chunk(int nid, struct node_memory_chunk_s *memory_c 
		node_end_pfn[nid] = memory_chunk->end_pfn;

}



static u8 pxm_to_nid_map[MAX_PXM_DOMAINS];/* _PXM to logical node ID map */



int pxm_to_node(int pxm)

{

	return pxm_to_nid_map[pxm];

}



/* Parse the ACPI Static Resource Affinity Table */

static int __init acpi20_parse_srat(struct acpi_table_srat *sratp)

{

	u8 *start, *end, *p;

	int i, j, nid;

	u8 nid_to_pxm_map[MAX_NUMNODES];/* logical node ID to _PXM map */



	start = (u8 *)(&(sratp->reserved) + 1);	/* skip header */

	p = start;
@@ -235,10 +226,6 @@ static int __init acpi20_parse_srat(struct acpi_table_srat *sratp) 
	memset(node_memory_chunk, 0, sizeof(node_memory_chunk));

	memset(zholes_size, 0, sizeof(zholes_size));



	/* -1 in these maps means not available */

	memset(pxm_to_nid_map, -1, sizeof(pxm_to_nid_map));

	memset(nid_to_pxm_map, -1, sizeof(nid_to_pxm_map));



	num_memory_chunks = 0;

	while (p < end) {

		switch (*p) {
@@ -278,9 +265,7 @@ static int __init acpi20_parse_srat(struct acpi_table_srat *sratp) 
	nodes_clear(node_online_map);

	for (i = 0; i < MAX_PXM_DOMAINS; i++) {

		if (BMAP_TEST(pxm_bitmap, i)) {

			nid = num_online_nodes();

			pxm_to_nid_map[i] = nid;

			nid_to_pxm_map[nid] = i;

			int nid = acpi_map_pxm_to_node(i);

			node_set_online(nid);

		}

	}
@@ -288,7 +273,7 @@ static int __init acpi20_parse_srat(struct acpi_table_srat *sratp) 


	/* set cnode id in memory chunk structure */

	for (i = 0; i < num_memory_chunks; i++)

		node_memory_chunk[i].nid = pxm_to_nid_map[node_memory_chunk[i].pxm];

		node_memory_chunk[i].nid = pxm_to_node(node_memory_chunk[i].pxm);



	printk("pxm bitmap: ");

	for (i = 0; i < sizeof(pxm_bitmap); i++) {

arch/ia64/hp/common/sba_iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -1958,7 +1958,7 @@ sba_map_ioc_to_node(struct ioc *ioc, acpi_handle handle) 
	if (pxm < 0)

		return;



	node = pxm_to_nid_map[pxm];

	node = pxm_to_node(pxm);



	if (node >= MAX_NUMNODES || !node_online(node))

		return;

arch/ia64/kernel/acpi.c

+8 −16
Original line number Diff line number Diff line
@@ -415,9 +415,6 @@ static int __initdata srat_num_cpus; /* number of cpus */ 
static u32 __devinitdata pxm_flag[PXM_FLAG_LEN];

#define pxm_bit_set(bit)	(set_bit(bit,(void *)pxm_flag))

#define pxm_bit_test(bit)	(test_bit(bit,(void *)pxm_flag))

/* maps to convert between proximity domain and logical node ID */

int __devinitdata pxm_to_nid_map[MAX_PXM_DOMAINS];

int __initdata nid_to_pxm_map[MAX_NUMNODES];

static struct acpi_table_slit __initdata *slit_table;



static int get_processor_proximity_domain(struct acpi_table_processor_affinity *pa)
@@ -533,22 +530,17 @@ void __init acpi_numa_arch_fixup(void) 
	 * MCD - This can probably be dropped now.  No need for pxm ID to node ID

	 * mapping with sparse node numbering iff MAX_PXM_DOMAINS <= MAX_NUMNODES.

	 */

	/* calculate total number of nodes in system from PXM bitmap */

	memset(pxm_to_nid_map, -1, sizeof(pxm_to_nid_map));

	memset(nid_to_pxm_map, -1, sizeof(nid_to_pxm_map));

	nodes_clear(node_online_map);

	for (i = 0; i < MAX_PXM_DOMAINS; i++) {

		if (pxm_bit_test(i)) {

			int nid = num_online_nodes();

			pxm_to_nid_map[i] = nid;

			nid_to_pxm_map[nid] = i;

			int nid = acpi_map_pxm_to_node(i);

			node_set_online(nid);

		}

	}



	/* set logical node id in memory chunk structure */

	for (i = 0; i < num_node_memblks; i++)

		node_memblk[i].nid = pxm_to_nid_map[node_memblk[i].nid];

		node_memblk[i].nid = pxm_to_node(node_memblk[i].nid);



	/* assign memory bank numbers for each chunk on each node */

	for_each_online_node(i) {
@@ -562,7 +554,7 @@ void __init acpi_numa_arch_fixup(void) 


	/* set logical node id in cpu structure */

	for (i = 0; i < srat_num_cpus; i++)

		node_cpuid[i].nid = pxm_to_nid_map[node_cpuid[i].nid];

		node_cpuid[i].nid = pxm_to_node(node_cpuid[i].nid);



	printk(KERN_INFO "Number of logical nodes in system = %d\n",

	       num_online_nodes());
@@ -575,11 +567,11 @@ void __init acpi_numa_arch_fixup(void) 
	for (i = 0; i < slit_table->localities; i++) {

		if (!pxm_bit_test(i))

			continue;

		node_from = pxm_to_nid_map[i];

		node_from = pxm_to_node(i);

		for (j = 0; j < slit_table->localities; j++) {

			if (!pxm_bit_test(j))

				continue;

			node_to = pxm_to_nid_map[j];

			node_to = pxm_to_node(j);

			node_distance(node_from, node_to) =

			    slit_table->entry[i * slit_table->localities + j];

		}
@@ -785,9 +777,9 @@ int acpi_map_cpu2node(acpi_handle handle, int cpu, long physid) 


	/*

	 * Assuming that the container driver would have set the proximity

	 * domain and would have initialized pxm_to_nid_map[pxm_id] && pxm_flag

	 * domain and would have initialized pxm_to_node(pxm_id) && pxm_flag

	 */

	node_cpuid[cpu].nid = (pxm_id < 0) ? 0 : pxm_to_nid_map[pxm_id];

	node_cpuid[cpu].nid = (pxm_id < 0) ? 0 : pxm_to_node(pxm_id);



	node_cpuid[cpu].phys_id = physid;

#endif
@@ -966,7 +958,7 @@ acpi_map_iosapic(acpi_handle handle, u32 depth, void *context, void **ret) 
	if (pxm < 0)

		return AE_OK;



	node = pxm_to_nid_map[pxm];

	node = pxm_to_node(pxm);



	if (node >= MAX_NUMNODES || !node_online(node) ||

	    cpus_empty(node_to_cpumask(node)))

arch/ia64/pci/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ pci_acpi_scan_root(struct acpi_device *device, int domain, int bus) 
	pxm = acpi_get_pxm(controller->acpi_handle);

#ifdef CONFIG_NUMA

	if (pxm >= 0)

		controller->node = pxm_to_nid_map[pxm];

		controller->node = pxm_to_node(pxm);

#endif



	acpi_walk_resources(device->handle, METHOD_NAME__CRS, count_window,

CRA Git | Maintained and supported by SUSTech CRA and CCSE