From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753667Ab1GVLUD (ORCPT ); Fri, 22 Jul 2011 07:20:03 -0400 Received: from [119.75.36.222] ([119.75.36.222]:42635 "EHLO m.1degreenorth.com" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1753558Ab1GVLUB (ORCPT ); Fri, 22 Jul 2011 07:20:01 -0400 From: Daniel J Blueman To: Ingo Molnar , Thomas Gleixner , H Peter Anvin Cc: Steffen Persvold , linux-kernel@vger.kernel.org, x86@kernel.org, Daniel J Blueman Subject: [PATCH 2/3] Add multi-node boot support Date: Fri, 22 Jul 2011 18:44:35 +0800 Message-Id: <1311331476-8820-2-git-send-email-daniel@numascale-asia.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1311331476-8820-1-git-send-email-daniel@numascale-asia.com> References: <1311331476-8820-1-git-send-email-daniel@numascale-asia.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix booting multi-node systems with Numascale's NumaChip. Signed-off-by: Steffen Persvold Signed-off-by: Daniel J Blueman --- arch/x86/kernel/cpu/amd.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index b13ed39..13513d0 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -7,6 +7,7 @@ #include #include #include +#include #ifdef CONFIG_X86_64 # include @@ -350,6 +351,12 @@ static void __cpuinit srat_detect_node(struct cpuinfo_x86 *c) node = numa_cpu_node(cpu); if (node == NUMA_NO_NODE) node = per_cpu(cpu_llc_id, cpu); + else if (is_numachip_system()) { + /* Fix for multi-node systems: set phys_proc_id and cpu_llc_id + to node number from ACPI SRAT table */ + c->phys_proc_id = node; + per_cpu(cpu_llc_id, cpu) = node; + } if (!node_online(node)) { /* -- 1.7.4.1