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

Commit a1e78db3 authored by Tony Luck's avatar Tony Luck
Browse files

Pull define-node-cleanup into release branch

parents fbbb0bd1 59c42235

arch/ia64/sn/kernel/io_init.c

+1 −3
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 
#include "xtalk/hubdev.h"

#include "xtalk/xwidgetdev.h"



nasid_t master_nasid = INVALID_NASID;	/* Partition Master */



static struct list_head sn_sysdata_list;



/* sysdata list struct */
@@ -165,7 +163,7 @@ static void sn_fixup_ionodes(void) 
	 * Get SGI Specific HUB chipset information.

	 * Inform Prom that this kernel can support domain bus numbering.

	 */

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

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

		hubdev = (struct hubdev_info *)(NODEPDA(i)->pdinfo);

		nasid = cnodeid_to_nasid(i);

		hubdev->max_segment_number = 0xffffffff;

arch/ia64/sn/kernel/setup.c

+51 −109
Original line number Diff line number Diff line
@@ -59,8 +59,6 @@ DEFINE_PER_CPU(struct pda_s, pda_percpu); 


#define MAX_PHYS_MEMORY		(1UL << IA64_MAX_PHYS_BITS)	/* Max physical address supported */



lboard_t *root_lboard[MAX_COMPACT_NODES];



extern void bte_init_node(nodepda_t *, cnodeid_t);



extern void sn_timer_init(void);
@@ -97,15 +95,15 @@ u8 sn_region_size; 
EXPORT_SYMBOL(sn_region_size);

int sn_prom_type;	/* 0=hardware, 1=medusa/realprom, 2=medusa/fakeprom */



short physical_node_map[MAX_PHYSNODE_ID];

short physical_node_map[MAX_NUMALINK_NODES];

static unsigned long sn_prom_features[MAX_PROM_FEATURE_SETS];



EXPORT_SYMBOL(physical_node_map);



int numionodes;

int num_cnodes;



static void sn_init_pdas(char **);

static void scan_for_ionodes(void);

static void build_cnode_tables(void);



static nodepda_t *nodepdaindr[MAX_COMPACT_NODES];
@@ -139,19 +137,6 @@ extern char drive_info[4 * 16]; 
char drive_info[4 * 16];

#endif



/*

 * Get nasid of current cpu early in boot before nodepda is initialized

 */

static int

boot_get_nasid(void)

{

	int nasid;



	if (ia64_sn_get_sapic_info(get_sapicid(), &nasid, NULL, NULL))

		BUG();

	return nasid;

}



/*

 * This routine can only be used during init, since

 * smp_boot_data is an init data structure.
@@ -223,7 +208,6 @@ void __init early_sn_setup(void) 
}



extern int platform_intr_list[];

extern nasid_t master_nasid;

static int __initdata shub_1_1_found = 0;



/*
@@ -269,7 +253,6 @@ static void __init sn_check_for_wars(void) 
void __init sn_setup(char **cmdline_p)

{

	long status, ticks_per_sec, drift;

	int pxm;

	u32 version = sn_sal_rev();

	extern void sn_cpu_init(void);
@@ -300,11 +283,10 @@ void __init sn_setup(char **cmdline_p) 


	MAX_DMA_ADDRESS = PAGE_OFFSET + MAX_PHYS_MEMORY;



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

	for (pxm = 0; pxm < MAX_PXM_DOMAINS; pxm++)

		if (pxm_to_nid_map[pxm] != -1)

			physical_node_map[pxm_to_nasid(pxm)] =

			    pxm_to_nid_map[pxm];

	/*

	 * Build the tables for managing cnodes.

	 */

	build_cnode_tables();



	/*

	 * Old PROMs do not provide an ACPI FADT. Disable legacy keyboard
@@ -319,8 +301,6 @@ void __init sn_setup(char **cmdline_p) 


	printk("SGI SAL version %x.%02x\n", version >> 8, version & 0x00FF);



	master_nasid = boot_get_nasid();



	status =

	    ia64_sal_freq_base(SAL_FREQ_BASE_REALTIME_CLOCK, &ticks_per_sec,

			       &drift);
@@ -378,15 +358,6 @@ static void __init sn_init_pdas(char **cmdline_p) 
{

	cnodeid_t cnode;



	memset(sn_cnodeid_to_nasid, -1,

			sizeof(__ia64_per_cpu_var(__sn_cnodeid_to_nasid)));

	for_each_online_node(cnode)

		sn_cnodeid_to_nasid[cnode] =

				pxm_to_nasid(nid_to_pxm_map[cnode]);



	numionodes = num_online_nodes();

	scan_for_ionodes();



	/*

	 * Allocate & initalize the nodepda for each node.

	 */
@@ -402,7 +373,7 @@ static void __init sn_init_pdas(char **cmdline_p) 
	/*

	 * Allocate & initialize nodepda for TIOs.  For now, put them on node 0.

	 */

	for (cnode = num_online_nodes(); cnode < numionodes; cnode++) {

	for (cnode = num_online_nodes(); cnode < num_cnodes; cnode++) {

		nodepdaindr[cnode] =

		    alloc_bootmem_node(NODE_DATA(0), sizeof(nodepda_t));

		memset(nodepdaindr[cnode], 0, sizeof(nodepda_t));
@@ -411,7 +382,7 @@ static void __init sn_init_pdas(char **cmdline_p) 
	/*

	 * Now copy the array of nodepda pointers to each nodepda.

	 */

	for (cnode = 0; cnode < numionodes; cnode++)

	for (cnode = 0; cnode < num_cnodes; cnode++)

		memcpy(nodepdaindr[cnode]->pernode_pdaindr, nodepdaindr,

		       sizeof(nodepdaindr));
@@ -428,7 +399,7 @@ static void __init sn_init_pdas(char **cmdline_p) 
	 * Initialize the per node hubdev.  This includes IO Nodes and

	 * headless/memless nodes.

	 */

	for (cnode = 0; cnode < numionodes; cnode++) {

	for (cnode = 0; cnode < num_cnodes; cnode++) {

		hubdev_init_node(nodepdaindr[cnode], cnode);

	}

}
@@ -553,87 +524,58 @@ void __init sn_cpu_init(void) 
}



/*

 * Scan klconfig for ionodes.  Add the nasids to the

 * physical_node_map and the pda and increment numionodes.

 * Build tables for converting between NASIDs and cnodes.

 */

static inline int __init board_needs_cnode(int type)

{

	return (type == KLTYPE_SNIA || type == KLTYPE_TIO);

}



static void __init scan_for_ionodes(void)

void __init build_cnode_tables(void)

{

	int nasid = 0;

	int nasid;

	int node;

	lboard_t *brd;



	/* fakeprom does not support klgraph */

	if (IS_RUNNING_ON_FAKE_PROM())

		return;



	/* Setup ionodes with memory */

	for (nasid = 0; nasid < MAX_PHYSNODE_ID; nasid += 2) {

		char *klgraph_header;

		cnodeid_t cnodeid;



		if (physical_node_map[nasid] == -1)

			continue;

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

	memset(sn_cnodeid_to_nasid, -1,

			sizeof(__ia64_per_cpu_var(__sn_cnodeid_to_nasid)));



		cnodeid = -1;

		klgraph_header = __va(ia64_sn_get_klconfig_addr(nasid));

		if (!klgraph_header) {

			BUG();	/* All nodes must have klconfig tables! */

		}

		cnodeid = nasid_to_cnodeid(nasid);

		root_lboard[cnodeid] = (lboard_t *)

		    NODE_OFFSET_TO_LBOARD((nasid),

					  ((kl_config_hdr_t

					    *) (klgraph_header))->

					  ch_board_info);

	/*

	 * First populate the tables with C/M bricks. This ensures that

	 * cnode == node for all C & M bricks.

	 */

	for_each_online_node(node) {

		nasid = pxm_to_nasid(nid_to_pxm_map[node]);

		sn_cnodeid_to_nasid[node] = nasid;

		physical_node_map[nasid] = node;

	}



	/* Scan headless/memless IO Nodes. */

	for (nasid = 0; nasid < MAX_PHYSNODE_ID; nasid += 2) {

		/* if there's no nasid, don't try to read the klconfig on the node */

		if (physical_node_map[nasid] == -1)

			continue;

		brd = find_lboard_any((lboard_t *)

				      root_lboard[nasid_to_cnodeid(nasid)],

				      KLTYPE_SNIA);

		if (brd) {

			brd = KLCF_NEXT_ANY(brd);	/* Skip this node's lboard */

			if (!brd)

				continue;

		}

	/*

	 * num_cnodes is total number of C/M/TIO bricks. Because of the 256 node

	 * limit on the number of nodes, we can't use the generic node numbers 

	 * for this. Note that num_cnodes is incremented below as TIOs or

	 * headless/memoryless nodes are discovered.

	 */

	num_cnodes = num_online_nodes();



		brd = find_lboard_any(brd, KLTYPE_SNIA);

	/* fakeprom does not support klgraph */

	if (IS_RUNNING_ON_FAKE_PROM())

		return;



	/* Find TIOs & headless/memoryless nodes and add them to the tables */

	for_each_online_node(node) {

		kl_config_hdr_t *klgraph_header;

		nasid = cnodeid_to_nasid(node);

		if ((klgraph_header = ia64_sn_get_klconfig_addr(nasid)) == NULL)

			BUG();

		brd = NODE_OFFSET_TO_LBOARD(nasid, klgraph_header->ch_board_info);

		while (brd) {

			sn_cnodeid_to_nasid[numionodes] = brd->brd_nasid;

			physical_node_map[brd->brd_nasid] = numionodes;

			root_lboard[numionodes] = brd;

			numionodes++;

			brd = KLCF_NEXT_ANY(brd);

			if (!brd)

				break;



			brd = find_lboard_any(brd, KLTYPE_SNIA);

			if (board_needs_cnode(brd->brd_type) && physical_node_map[brd->brd_nasid] < 0) {

				sn_cnodeid_to_nasid[num_cnodes] = brd->brd_nasid;

				physical_node_map[brd->brd_nasid] = num_cnodes++;

			}

	}



	/* Scan for TIO nodes. */

	for (nasid = 0; nasid < MAX_PHYSNODE_ID; nasid += 2) {

		/* if there's no nasid, don't try to read the klconfig on the node */

		if (physical_node_map[nasid] == -1)

			continue;

		brd = find_lboard_any((lboard_t *)

				      root_lboard[nasid_to_cnodeid(nasid)],

				      KLTYPE_TIO);

		while (brd) {

			sn_cnodeid_to_nasid[numionodes] = brd->brd_nasid;

			physical_node_map[brd->brd_nasid] = numionodes;

			root_lboard[numionodes] = brd;

			numionodes++;

			brd = KLCF_NEXT_ANY(brd);

			if (!brd)

				break;



			brd = find_lboard_any(brd, KLTYPE_TIO);

			brd = find_lboard_next(brd);

		}

	}

}

arch/ia64/sn/kernel/sn2/sn_hwperf.c

+2 −2
Original line number Diff line number Diff line
@@ -476,8 +476,8 @@ static int sn_topology_show(struct seq_file *s, void *d) 
				for_each_online_cpu(j) {

					seq_printf(s, j ? ":%d" : ", dist %d",

						node_distance(

						    cpuid_to_cnodeid(i),

						    cpuid_to_cnodeid(j)));

						    cpu_to_node(i),

						    cpu_to_node(j)));

				}

				seq_putc(s, '\n');

			}

arch/ia64/sn/kernel/tiocx.c

+2 −3
Original line number Diff line number Diff line
@@ -489,12 +489,11 @@ static int __init tiocx_init(void) 


	bus_register(&tiocx_bus_type);



	for (cnodeid = 0; cnodeid < MAX_COMPACT_NODES; cnodeid++) {

	for (cnodeid = 0; cnodeid < num_cnodes; cnodeid++) {

		nasid_t nasid;

		int bt;



		if ((nasid = cnodeid_to_nasid(cnodeid)) < 0)

			break;	/* No more nasids .. bail out of loop */

		nasid = cnodeid_to_nasid(cnodeid);



		if ((nasid & 0x1) && is_fpga_tio(nasid, &bt)) {

			struct hubdev_info *hubdev;

arch/ia64/sn/kernel/xpc_partition.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static u64 xpc_sh2_IPI_access3; 




/* original protection values for each node */

u64 xpc_prot_vec[MAX_COMPACT_NODES];

u64 xpc_prot_vec[MAX_NUMNODES];





/* this partition's reserved page */