From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757509AbcEDHTO (ORCPT ); Wed, 4 May 2016 03:19:14 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37636 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757006AbcEDHTJ (ORCPT ); Wed, 4 May 2016 03:19:09 -0400 Date: Wed, 4 May 2016 00:18:02 -0700 From: tip-bot for Mike Travis Message-ID: Cc: abanman@sgi.com, rja@sgi.com, brgerst@gmail.com, linux-kernel@vger.kernel.org, bp@alien8.de, akpm@linux-foundation.org, mingo@kernel.org, hpa@zytor.com, estabrook@sgi.com, luto@amacapital.net, peterz@infradead.org, sivanich@sgi.com, len.brown@intel.com, dvlasenk@redhat.com, gfk@sgi.com, nzimmer@sgi.com, travis@sgi.com, torvalds@linux-foundation.org, tglx@linutronix.de Reply-To: bp@alien8.de, akpm@linux-foundation.org, brgerst@gmail.com, linux-kernel@vger.kernel.org, abanman@sgi.com, rja@sgi.com, peterz@infradead.org, hpa@zytor.com, estabrook@sgi.com, luto@amacapital.net, mingo@kernel.org, travis@sgi.com, gfk@sgi.com, nzimmer@sgi.com, dvlasenk@redhat.com, sivanich@sgi.com, len.brown@intel.com, tglx@linutronix.de, torvalds@linux-foundation.org In-Reply-To: <20160429215404.100504077@asylum.americas.sgi.com> References: <20160429215404.100504077@asylum.americas.sgi.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/platform] x86/platform/UV: Update MMIOH setup function to work for both UV3 and UV4 Git-Commit-ID: a2f28e6950cec75320a8c3c8747a6e3ad08cfd2b 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 Commit-ID: a2f28e6950cec75320a8c3c8747a6e3ad08cfd2b Gitweb: http://git.kernel.org/tip/a2f28e6950cec75320a8c3c8747a6e3ad08cfd2b Author: Mike Travis AuthorDate: Fri, 29 Apr 2016 16:54:11 -0500 Committer: Ingo Molnar CommitDate: Wed, 4 May 2016 08:48:48 +0200 x86/platform/UV: Update MMIOH setup function to work for both UV3 and UV4 Since UV3 and UV4 MMIOH regions are setup the same, we can use a common function to setup both. Tested-by: John Estabrook Tested-by: Gary Kroening Tested-by: Nathan Zimmer Signed-off-by: Mike Travis Reviewed-by: Dimitri Sivanich Cc: Andrew Banman Cc: Andrew Morton Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Len Brown Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Russ Anderson Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20160429215404.100504077@asylum.americas.sgi.com Signed-off-by: Ingo Molnar --- arch/x86/kernel/apic/x2apic_uv_x.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index db5d980..4ca87b9 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -608,6 +608,7 @@ static __initdata struct mmioh_config mmiohs[] = { }, }; +/* UV3 & UV4 have identical MMIOH overlay configs */ static __init void map_mmioh_high_uv3(int index, int min_pnode, int max_pnode) { union uv3h_rh_gam_mmioh_overlay_config0_mmr_u overlay; @@ -687,7 +688,7 @@ static __init void map_mmioh_high(int min_pnode, int max_pnode) unsigned long mmr, base; int shift, enable, m_io, n_io; - if (is_uv3_hub()) { + if (is_uv3_hub() || is_uv4_hub()) { /* Map both MMIOH Regions */ map_mmioh_high_uv3(0, min_pnode, max_pnode); map_mmioh_high_uv3(1, min_pnode, max_pnode);