x86/uv: Fix UV2 BAU legacy mode

The SGI Altix UV2 BAU (Broadcast Assist Unit) as used for tlb-shootdown (selective broadcast mode) always uses UV2 broadcast descriptor format. There is no need to clear the 'legacy' (UV1) mode, because the hardware always uses UV2 mode for selective broadcast. But the BIOS uses general broadcast and legacy mode, and the hardware pays attention to the legacy mode bit for general broadcast. So the kernel must not clear that mode bit.

Cliff Wickman committed 14 years ago

Commit d5d2d2e1 parent bd2753b2 files · +0 −2Browse files

Unified · Split

2 files

arch/x86/include/asm/uv/uv_bau.h +0 −1
arch/x86/platform/uv/tlb_uv.c +0 −1

arch/x86/include/asm/uv/uv_bau.h+0−1

@@ -149,7 +149,6 @@ · 148 unmodified lines
149	/* 4 bits of software ack period */	149	/* 4 bits of software ack period */
150	#define UV2_ACK_MASK 0x7UL	150	#define UV2_ACK_MASK 0x7UL
151	#define UV2_ACK_UNITS_SHFT 3	151	#define UV2_ACK_UNITS_SHFT 3
152	#define UV2_LEG_SHFT UV2H_LB_BAU_MISC_CONTROL_USE_LEGACY_DESCRIPTOR_FORMATS_SHFT
153	#define UV2_EXT_SHFT UV2H_LB_BAU_MISC_CONTROL_ENABLE_EXTENDED_SB_STATUS_SHFT	152	#define UV2_EXT_SHFT UV2H_LB_BAU_MISC_CONTROL_ENABLE_EXTENDED_SB_STATUS_SHFT
154		153
155	/*	154	/*

arch/x86/platform/uv/tlb_uv.c+0−1

@@ -1295,7 +1295,6 @@ static void __init enable_timeouts(void) · 1294 unmodified lines
1295	*/	1295	*/
1296	mmr_image \|= (1L << SOFTACK_MSHIFT);	1296	mmr_image \|= (1L << SOFTACK_MSHIFT);
1297	if (is_uv2_hub()) {	1297	if (is_uv2_hub()) {
1298	mmr_image &= ~(1L << UV2_LEG_SHFT);
1299	mmr_image \|= (1L << UV2_EXT_SHFT);	1298	mmr_image \|= (1L << UV2_EXT_SHFT);
1300	}	1299	}
1301	write_mmr_misc_control(pnode, mmr_image);	1300	write_mmr_misc_control(pnode, mmr_image);