Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933259AbbDIS0h (ORCPT ); Thu, 9 Apr 2015 14:26:37 -0400 Received: from relay1.sgi.com ([192.48.180.66]:60468 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755252AbbDIS0b (ORCPT ); Thu, 9 Apr 2015 14:26:31 -0400 Message-Id: <20150409182629.267239403@asylum.americas.sgi.com> References: <20150409182628.627594537@asylum.americas.sgi.com> User-Agent: quilt/0.46-1 Date: Thu, 09 Apr 2015 13:26:31 -0500 From: Mike Travis To: Ingo Molnar , Andrew Morton , Thomas Gleixner , "H. Peter Anvin" Cc: Hedi Berriche , Dimitri Sivanich , x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] X86, UV: Update UV APIC HUB check Content-Disposition: inline; filename=update-uv-apic-hub-check Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1148 Lines: 36 Update check for UV2000/3000. Note when HUB is not recognized. Signed-off-by: Mike Travis Acked-by: Hedi Berriche Acked-by: Dimitri Sivanich --- arch/x86/kernel/apic/x2apic_uv_x.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) --- linux.orig/arch/x86/kernel/apic/x2apic_uv_x.c +++ linux/arch/x86/kernel/apic/x2apic_uv_x.c @@ -881,10 +881,14 @@ void __init uv_system_init(void) unsigned long mmr_base, present, paddr; unsigned short pnode_mask; unsigned char n_lshift; - char *hub = (is_uv1_hub() ? "UV1" : - (is_uv2_hub() ? "UV2" : - "UV3")); + char *hub = (is_uv1_hub() ? "UV100/1000" : + (is_uv2_hub() ? "UV2000/3000" : + (is_uv3_hub() ? "UV300" : NULL))); + if (!hub) { + pr_err("UV: Unknown/unsupported UV hub\n"); + return; + } pr_info("UV: Found %s hub\n", hub); map_low_mmrs(); -- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/