Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751831AbeAPD6l (ORCPT + 1 other); Mon, 15 Jan 2018 22:58:41 -0500 Received: from terminus.zytor.com ([65.50.211.136]:45909 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751287AbeAPD6f (ORCPT ); Mon, 15 Jan 2018 22:58:35 -0500 Date: Mon, 15 Jan 2018 19:55:07 -0800 From: tip-bot for Andrew Banman Message-ID: Cc: torvalds@linux-foundation.org, mike.travis@hpe.com, akpm@linux-foundation.org, rja@hpe.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, peterz@infradead.org, sivanich@hpe.com, mingo@kernel.org, abanman@hpe.com, hpa@zytor.com Reply-To: mingo@kernel.org, abanman@hpe.com, hpa@zytor.com, peterz@infradead.org, sivanich@hpe.com, linux-kernel@vger.kernel.org, rja@hpe.com, tglx@linutronix.de, akpm@linux-foundation.org, torvalds@linux-foundation.org, mike.travis@hpe.com In-Reply-To: <1515440592-44060-1-git-send-email-abanman@hpe.com> References: <1515440592-44060-1-git-send-email-abanman@hpe.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/platform] x86/platform/uv/BAU: Replace hard-coded values with MMR definitions Git-Commit-ID: 1da2fd61d956a01ead87173a8367e5c664617f7b X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: Commit-ID: 1da2fd61d956a01ead87173a8367e5c664617f7b Gitweb: https://git.kernel.org/tip/1da2fd61d956a01ead87173a8367e5c664617f7b Author: Andrew Banman AuthorDate: Mon, 8 Jan 2018 13:43:12 -0600 Committer: Ingo Molnar CommitDate: Tue, 16 Jan 2018 03:58:38 +0100 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: Andrew Banman Acked-by: Mike Travis Cc: Andrew Morton Cc: Dimitri Sivanich Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Russ Anderson Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1515440592-44060-1-git-send-email-abanman@hpe.com Signed-off-by: Ingo Molnar --- arch/x86/include/asm/uv/uv_bau.h | 1 - arch/x86/platform/uv/tlb_uv.c | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/uv/uv_bau.h b/arch/x86/include/asm/uv/uv_bau.h index 7cac798..7803114 100644 --- a/arch/x86/include/asm/uv/uv_bau.h +++ b/arch/x86/include/asm/uv/uv_bau.h @@ -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" diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c index 8538a67..c2e9285 100644 --- a/arch/x86/platform/uv/tlb_uv.c +++ b/arch/x86/platform/uv/tlb_uv.c @@ -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