Unify pxm_to_node id ver.2. (for ia64)
This is to use generic pxm_to_node() function instead of old pxm_to_nid_map for ia64. And remove old definition.
Signed-off-by Bob Picco <[email protected]>
Signed-off-by Yasunori Goto <[email protected]>
arch/ia64/hp/common/sba_iommu.c | 2 +- arch/ia64/kernel/acpi.c | 25 +++++++++---------------- arch/ia64/pci/pci.c | 2 +- arch/ia64/sn/kernel/setup.c | 4 ++-- include/asm-ia64/acpi.h | 7 ------- 5 files changed, 13 insertions(+), 27 deletions(-)
arch/ia64/kernel/acpi.c +9 -16
@@ -415,9 +415,6 @@ static int __initdata srat_num_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;/*
@@ -506,22 +503,18 @@ 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); +pxm_bit_set (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) {
@@ -535,7 +528,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 ());
@@ -548,11 +541,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]; }
@@ -758,9 +751,9 @@ int acpi_map_cpu2node(acpi_handle handle/* * 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
@@ -886,7 +879,7 @@ acpi_map_iosapic(acpi_handle handle, u32if (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
@@ -353,7 +353,7 @@ pci_acpi_scan_root(struct acpi_device *d 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,
include/asm-ia64/acpi.h +0 -7
@@ -107,13 +107,6 @@ extern unsigned int is_cpu_cpei_target(uextern void set_cpei_target_cpu (unsigned int cpu);extern unsigned int get_cpei_target_cpu (void ); -#ifdef CONFIG_ACPI_NUMA -/* Proximity bitmap length; _PXM is at most 255 (8 bit)*/ -#define MAX_PXM_DOMAINS (256) -extern int __devinitdata pxm_to_nid_map[MAX_PXM_DOMAINS ]; -extern int __initdata nid_to_pxm_map[MAX_NUMNODES ]; -#endif -extern u16 ia64_acpiid_to_sapicid[];/*
arch/ia64/hp/common/sba_iommu.c +1 -1
@@ -1958,7 +1958,7 @@ sba_map_ioc_to_node(struct ioc *ioc, acpif (pxm <0 )return ; - node = pxm_to_nid_map[pxm]; + node =pxm_to_node (pxm);if (node >=MAX_NUMNODES || !node_online (node))return ;
arch/ia64/sn/kernel/setup.c +2 -2
@@ -152,7 +152,7 @@ static int __init pxm_to_nasid(int pxm)int i;int nid; - nid = pxm_to_nid_map[pxm]; + nid =pxm_to_node (pxm);for (i =0 ; i < num_node_memblks; i++) {if (node_memblk[i].nid == nid) {return NASID_GET (node_memblk[i].start_paddr);
@@ -698,7 +698,7 @@ void __init build_cnode_tables(void)* cnode == node for all C & M bricks. */ for_each_online_node (node) { - nasid =pxm_to_nasid (nid_to_pxm_map[node]); + nasid =pxm_to_nasid (node_to_pxm (node)); sn_cnodeid_to_nasid[node] = nasid; physical_node_map[nasid] = node; }
Signature · 1 line
Yasunori Goto
Quoted 3 lines · Yasunori Goto
This is to use generic
pxm_to_node()function instead of oldpxm_to_nid_mapfor ia64. And remove old definition.
I applied the patch & booted on a couple of SN systems. No problem...
Signature · 1 line
Jack