Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933026AbbDJRoU (ORCPT ); Fri, 10 Apr 2015 13:44:20 -0400 Received: from terminus.zytor.com ([198.137.202.10]:44477 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932736AbbDJRoQ (ORCPT ); Fri, 10 Apr 2015 13:44:16 -0400 Date: Fri, 10 Apr 2015 10:44:05 -0700 From: tip-bot for Mike Travis Message-ID: Cc: tglx@linutronix.de, linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org, sivanich@sgi.com, travis@sgi.com, hedi@sgi.com Reply-To: hedi@sgi.com, travis@sgi.com, sivanich@sgi.com, mingo@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, hpa@zytor.com In-Reply-To: <20150409182629.267239403@asylum.americas.sgi.com> References: <20150409182629.267239403@asylum.americas.sgi.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/apic] x86/apic/uv: Update the UV APIC HUB check Git-Commit-ID: 1912c7afa39d2683a574011ff455fe49ada8016c 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 Content-Length: 1724 Lines: 47 Commit-ID: 1912c7afa39d2683a574011ff455fe49ada8016c Gitweb: http://git.kernel.org/tip/1912c7afa39d2683a574011ff455fe49ada8016c Author: Mike Travis AuthorDate: Thu, 9 Apr 2015 13:26:31 -0500 Committer: Ingo Molnar CommitDate: Fri, 10 Apr 2015 10:16:08 +0200 x86/apic/uv: Update the UV APIC HUB check Update the check for UV2000/3000. Note when the HUB is not recognized. Signed-off-by: Mike Travis Acked-by: Hedi Berriche Acked-by: Dimitri Sivanich Link: http://lkml.kernel.org/r/20150409182629.267239403@asylum.americas.sgi.com Signed-off-by: Ingo Molnar --- arch/x86/kernel/apic/x2apic_uv_x.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index e18962c..c8d9295 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/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/