From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757381AbcEDHRU (ORCPT ); Wed, 4 May 2016 03:17:20 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37474 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757202AbcEDHRT (ORCPT ); Wed, 4 May 2016 03:17:19 -0400 Date: Wed, 4 May 2016 00:16:00 -0700 From: tip-bot for Mike Travis Message-ID: Cc: tglx@linutronix.de, brgerst@gmail.com, mingo@kernel.org, linux-kernel@vger.kernel.org, luto@amacapital.net, dvlasenk@redhat.com, len.brown@intel.com, hpa@zytor.com, gfk@sgi.com, abanman@sgi.com, estabrook@sgi.com, akpm@linux-foundation.org, sivanich@sgi.com, bp@alien8.de, nzimmer@sgi.com, peterz@infradead.org, travis@sgi.com, torvalds@linux-foundation.org, rja@sgi.com Reply-To: len.brown@intel.com, dvlasenk@redhat.com, linux-kernel@vger.kernel.org, mingo@kernel.org, brgerst@gmail.com, tglx@linutronix.de, luto@amacapital.net, nzimmer@sgi.com, rja@sgi.com, torvalds@linux-foundation.org, peterz@infradead.org, travis@sgi.com, gfk@sgi.com, estabrook@sgi.com, abanman@sgi.com, hpa@zytor.com, bp@alien8.de, sivanich@sgi.com, akpm@linux-foundation.org In-Reply-To: <20160429215403.072323684@asylum.americas.sgi.com> References: <20160429215403.072323684@asylum.americas.sgi.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/platform] x86/platform/UV: Add UV4 Specific Defines Git-Commit-ID: a0ec83f316e1d933d8c820d249972574324c2d25 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: a0ec83f316e1d933d8c820d249972574324c2d25 Gitweb: http://git.kernel.org/tip/a0ec83f316e1d933d8c820d249972574324c2d25 Author: Mike Travis AuthorDate: Fri, 29 Apr 2016 16:54:05 -0500 Committer: Ingo Molnar CommitDate: Wed, 4 May 2016 08:48:47 +0200 x86/platform/UV: Add UV4 Specific Defines Add UV4 specific defines to determine if current system type is a UV4 system. 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/20160429215403.072323684@asylum.americas.sgi.com Signed-off-by: Ingo Molnar --- arch/x86/kernel/apic/x2apic_uv_x.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index 8f4942e..9086d95 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -108,6 +108,9 @@ static int __init early_get_pnodeid(void) case UV3_HUB_PART_NUMBER_X: uv_min_hub_revision_id += UV3_HUB_REVISION_BASE; break; + case UV4_HUB_PART_NUMBER: + uv_min_hub_revision_id += UV4_HUB_REVISION_BASE - 1; + break; } uv_hub_info->hub_revision = uv_min_hub_revision_id; @@ -155,8 +158,10 @@ static int __init uv_acpi_madt_oem_check(char *oem_id, char *oem_table_id) * SGI: UV100/1000 * SGI2: UV2000/3000 * SGI3: UV300 (truncated to 4 chars because of different varieties) + * SGI4: UV400 (truncated to 4 chars because of different varieties) */ uv_hub_info->hub_revision = + !strncmp(oem_id, "SGI4", 4) ? UV4_HUB_REVISION_BASE : !strncmp(oem_id, "SGI3", 4) ? UV3_HUB_REVISION_BASE : !strcmp(oem_id, "SGI2") ? UV2_HUB_REVISION_BASE : !strcmp(oem_id, "SGI") ? UV1_HUB_REVISION_BASE : 0; @@ -881,9 +886,10 @@ 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() ? "UV100/1000" : - (is_uv2_hub() ? "UV2000/3000" : - (is_uv3_hub() ? "UV300" : NULL))); + char *hub = is_uv4_hub() ? "UV400" : + is_uv3_hub() ? "UV300" : + is_uv2_hub() ? "UV2000/3000" : + is_uv1_hub() ? "UV100/1000" : NULL; if (!hub) { pr_err("UV: Unknown/unsupported UV hub\n");