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

Commit a456eaab authored by cpw@sgi.com's avatar cpw@sgi.com Committed by Ingo Molnar
Browse files

x86, UV: Rename hubmask to pnmask 



Rename 'bau_targ_hubmask' to 'pnmask' for clarity.

The BAU distribution bit mask is indexed by pnode number, not hub or
blade number.  This important fact is not clear while the mask is
called a 'hubmask'.

Signed-off-by: default avatarCliff Wickman <cpw@sgi.com>
Link: http://lkml.kernel.org/r/20110621122242.630995969@sgi.com


Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 485f07d3

arch/x86/include/asm/uv/uv_bau.h

+6 −6
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ 
 * 'base_dest_nasid' field of the header corresponds to the

 * destination nodeID associated with that specified bit.

 */

struct bau_targ_hubmask {

struct pnmask {

	unsigned long		bits[BITS_TO_LONGS(UV_DISTRIBUTION_SIZE)];

};
@@ -314,7 +314,7 @@ struct bau_msg_header { 
 * Should be 64 bytes

 */

struct bau_desc {

	struct bau_targ_hubmask	distribution;

	struct pnmask			distribution;

	/*

	 * message template, consisting of header and payload:

	 */
@@ -596,20 +596,20 @@ static inline void write_mmr_data_config(int pnode, unsigned long mr) 
	uv_write_global_mmr64(pnode, UVH_BAU_DATA_CONFIG, mr);

}



static inline int bau_uvhub_isset(int uvhub, struct bau_targ_hubmask *dstp)

static inline int bau_uvhub_isset(int uvhub, struct pnmask *dstp)

{

	return constant_test_bit(uvhub, &dstp->bits[0]);

}

static inline void bau_uvhub_set(int pnode, struct bau_targ_hubmask *dstp)

static inline void bau_uvhub_set(int pnode, struct pnmask *dstp)

{

	__set_bit(pnode, &dstp->bits[0]);

}

static inline void bau_uvhubs_clear(struct bau_targ_hubmask *dstp,

static inline void bau_uvhubs_clear(struct pnmask *dstp,

				    int nbits)

{

	bitmap_zero(&dstp->bits[0], nbits);

}

static inline int bau_uvhub_weight(struct bau_targ_hubmask *dstp)

static inline int bau_uvhub_weight(struct pnmask *dstp)

{

	return bitmap_weight((unsigned long *)&dstp->bits[0],

				UV_DISTRIBUTION_SIZE);

arch/x86/platform/uv/tlb_uv.c

+2 −3
Original line number Diff line number Diff line
@@ -370,8 +370,7 @@ static void do_reset(void *ptr) 
 * Use IPI to get all target uvhubs to release resources held by

 * a given sending cpu number.

 */

static void reset_with_ipi(struct bau_targ_hubmask *distribution,

						struct bau_control *bcp)

static void reset_with_ipi(struct pnmask *distribution, struct bau_control *bcp)

{

	int pnode;

	int apnode;
@@ -384,7 +383,7 @@ static void reset_with_ipi(struct bau_targ_hubmask *distribution, 
	reset_args.sender = sender;

	cpus_clear(mask);

	/* find a single cpu for each uvhub in this distribution mask */

	maskbits = sizeof(struct bau_targ_hubmask) * BITSPERBYTE;

	maskbits = sizeof(struct pnmask) * BITSPERBYTE;

	/* each bit is a pnode relative to the partition base pnode */

	for (pnode = 0; pnode < maskbits; pnode++) {

		int cpu;