From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752845AbcD1XOH (ORCPT ); Thu, 28 Apr 2016 19:14:07 -0400 Received: from relay1.sgi.com ([192.48.180.66]:57050 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752478AbcD1XKf (ORCPT ); Thu, 28 Apr 2016 19:10:35 -0400 Message-Id: <20160428231033.096643916@asylum.americas.sgi.com> References: <20160428231031.265120287@asylum.americas.sgi.com> User-Agent: quilt/0.46-1 Date: Thu, 28 Apr 2016 18:10:40 -0500 From: Mike Travis To: Ingo Molnar , "H. Peter Anvin" , Thomas Gleixner , Andrew Morton , Len Brown , Dimitri Sivanich Cc: Russ Anderson , John Estabrook , Andrew Banman , Nathan Zimmer , x86@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 09/21] X86_64, UV: Update MMIOH setup function to work for both UV3 and UV4 Content-Disposition: inline; filename=uv4_merge_uv3_mmioh Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since UV3 and UV4 MMIOH regions are setup the same, we can use a common function to setup both. Signed-off-by: Mike Travis Reviewed-by: Dimitri Sivanich Tested-by: John Estabrook Tested-by: Gary Kroening Tested-by: Nathan Zimmer --- arch/x86/kernel/apic/x2apic_uv_x.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- linux.orig/arch/x86/kernel/apic/x2apic_uv_x.c +++ linux/arch/x86/kernel/apic/x2apic_uv_x.c @@ -628,6 +628,7 @@ static __initdata struct mmioh_config mm }, }; +/* 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; @@ -707,7 +708,7 @@ static __init void map_mmioh_high(int mi 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); --