Unverified Commit 4bf841eb authored by Thomas Bogendoerfer's avatar Thomas Bogendoerfer Committed by Paul Burton
Browse files

MIPS: SGI-IP27: get rid of compact node ids 



Node ids don't need to be contiguous in Linux, so the concept to
use compact node ids to make them contiguous isn't needed at all.
This patchset therefore removes it.

Signed-off-by: default avatarThomas Bogendoerfer <tbogendoerfer@suse.de>
Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
parent 46a73e9e

arch/mips/include/asm/mach-ip27/mmzone.h

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#include <asm/sn/arch.h>

#include <asm/sn/hub.h>



#define pa_to_nid(addr)		NASID_TO_COMPACT_NODEID(NASID_GET(addr))

#define pa_to_nid(addr)		NASID_GET(addr)



struct hub_data {

	kern_vars_t	kern_vars;

arch/mips/include/asm/mach-ip27/topology.h

+1 −2
Original line number Diff line number Diff line
@@ -7,14 +7,13 @@ 
#include <asm/mmzone.h>



struct cpuinfo_ip27 {

	cnodeid_t	p_nodeid;	/* my node ID in compact-id-space */

	nasid_t		p_nasid;	/* my node ID in numa-as-id-space */

	unsigned char	p_slice;	/* Physical position on node board */

};



extern struct cpuinfo_ip27 sn_cpu_info[NR_CPUS];



#define cpu_to_node(cpu)	(sn_cpu_info[(cpu)].p_nodeid)

#define cpu_to_node(cpu)	(cputonasid(cpu))

#define cpumask_of_node(node)	((node) == -1 ?				\

				 cpu_all_mask :				\

				 &hub_data(node)->h_cpus)

arch/mips/include/asm/sn/agent.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 


#if defined(CONFIG_SGI_IP27)

#define HUB_NIC_ADDR(_cpuid)						   \

	REMOTE_HUB_ADDR(COMPACT_TO_NASID_NODEID(cpu_to_node(_cpuid)),	    \

	REMOTE_HUB_ADDR(cpu_to_node(_cpuid),				   \

		MD_MLAN_CTL)

#endif

arch/mips/include/asm/sn/arch.h

+0 −23
Original line number Diff line number Diff line
@@ -21,34 +21,11 @@ 
#define cputoslice(cpu)		(sn_cpu_info[(cpu)].p_slice)



#define INVALID_NASID		(nasid_t)-1

#define INVALID_CNODEID		(cnodeid_t)-1

#define INVALID_PNODEID		(pnodeid_t)-1

#define INVALID_MODULE		(moduleid_t)-1

#define INVALID_PARTID		(partid_t)-1



extern nasid_t get_nasid(void);

extern cnodeid_t get_cpu_cnode(cpuid_t);

extern int get_cpu_slice(cpuid_t);



/*

 * NO ONE should access these arrays directly.	The only reason we refer to

 * them here is to avoid the procedure call that would be required in the

 * macros below.  (Really want private data members here :-)

 */

extern cnodeid_t nasid_to_compact_node[MAX_NASIDS];

extern nasid_t compact_to_nasid_node[MAX_COMPACT_NODES];



/*

 * These macros are used by various parts of the kernel to convert

 * between the three different kinds of node numbering.	  At least some

 * of them may change to procedure calls in the future, but the macros

 * will continue to work.  Don't use the arrays above directly.

 */



extern cnodeid_t cpuid_to_compact_node[MAXCPUS];



#define NASID_TO_COMPACT_NODEID(nnode)	(nasid_to_compact_node[nnode])

#define COMPACT_TO_NASID_NODEID(cnode)	(compact_to_nasid_node[cnode])

#define CPUID_TO_COMPACT_NODEID(cpu)	(cpuid_to_compact_node[(cpu)])



#endif /* _ASM_SN_ARCH_H */

arch/mips/include/asm/sn/hub.h

+2 −2
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ 
#include <asm/xtalk/xtalk.h>



/* ip27-hubio.c */

extern unsigned long hub_pio_map(cnodeid_t cnode, xwidgetnum_t widget,

extern unsigned long hub_pio_map(nasid_t nasid, xwidgetnum_t widget,

			  unsigned long xtalk_addr, size_t size);

extern void hub_pio_init(cnodeid_t cnode);

extern void hub_pio_init(nasid_t nasid);



#endif /* __ASM_SN_HUB_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE