Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933256AbeAHTna (ORCPT + 1 other); Mon, 8 Jan 2018 14:43:30 -0500 Received: from relay2.sgi.com ([192.48.180.65]:44287 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756657AbeAHTn1 (ORCPT ); Mon, 8 Jan 2018 14:43:27 -0500 From: Andrew Banman To: Ingo Molnar Cc: Russ Anderson , Dimitri Sivanich , Andrew Banman , Thomas Gleixner , Andrew Morton , x86@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 7/7] x86/platform/uv/BAU: Replace hard-coded values with MMR definitions Date: Mon, 8 Jan 2018 13:43:12 -0600 Message-Id: <1515440592-44060-1-git-send-email-abanman@hpe.com> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1515440405-20880-1-git-send-email-mike.travis@hpe.com> References: <1515440405-20880-1-git-send-email-mike.travis@hpe.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: Replaces hard-coded node ID shift for the descriptor base mmr to fix initialization on UV4A while maintaining previous architectures. Signed-off-by: Andrew Banman Acked-by: Mike Travis --- 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 -- 1.8.2.1