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

Commit 1da2fd61 authored by Andrew Banman's avatar Andrew Banman Committed by Ingo Molnar
Browse files

x86/platform/uv/BAU: Replace hard-coded values with MMR definitions 



Replaces hard-coded node ID shift for the descriptor base MMR to fix
initialization on UV4A while maintaining support for previous architectures.

Signed-off-by: default avatarAndrew Banman <abanman@hpe.com>
Acked-by: default avatarMike Travis <mike.travis@hpe.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Dimitri Sivanich <sivanich@hpe.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Russ Anderson <rja@hpe.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1515440592-44060-1-git-send-email-abanman@hpe.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent a631a0a7

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

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ 
#define UV2_NET_ENDPOINT_INTD		0x28

#define UV_NET_ENDPOINT_INTD		(is_uv1_hub() ?			\

			UV1_NET_ENDPOINT_INTD : UV2_NET_ENDPOINT_INTD)

#define UV_DESC_PSHIFT			49

#define UV_PAYLOADQ_GNODE_SHIFT		49

#define UV_PTC_BASENAME			"sgi_uv/ptc_statistics"

#define UV_BAU_BASENAME			"sgi_uv/bau_tunables"

arch/x86/platform/uv/tlb_uv.c

+2 −1
Original line number Diff line number Diff line
@@ -1751,7 +1751,8 @@ static void activation_descriptor_init(int node, int pnode, int base_pnode) 
		uv1 = 1;



	/* the 14-bit pnode */

	write_mmr_descriptor_base(pnode, (n << UV_DESC_PSHIFT | m));

	write_mmr_descriptor_base(pnode,

		(n << UVH_LB_BAU_SB_DESCRIPTOR_BASE_NODE_ID_SHFT | m));

	/*

	 * Initializing all 8 (ITEMS_PER_DESC) descriptors for each

	 * cpu even though we only use the first one; one descriptor can