Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755757Ab2EHHel (ORCPT ); Tue, 8 May 2012 03:34:41 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:42757 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751916Ab2EHHek (ORCPT ); Tue, 8 May 2012 03:34:40 -0400 From: Ido Yariv To: linux-kernel@vger.kernel.org, Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" Cc: Shai Fultheim , Ido Yariv Subject: [PATCH v3] vsmp: Fix number of CPUs when vsmp is disabled Date: Tue, 8 May 2012 10:34:15 +0300 Message-Id: <1336462455-22544-1-git-send-email-ido@wizery.com> X-Mailer: git-send-email 1.7.6.5 In-Reply-To: <20120507132433.GA9808@gmail.com> References: <20120507132433.GA9808@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2483 Lines: 97 From: Shai Fultheim In case CONFIG_X86_VSMP is not set, limit the number of CPUs to the number of CPUs of the first board. Signed-off-by: Shai Fultheim [ido@wizery.com: rebased, fixed minor coding-style issues] Signed-off-by: Ido Yariv --- Changes from v2: - Addressed Ingo's comments arch/x86/kernel/vsmp_64.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c index a1d804b..6aa0d59 100644 --- a/arch/x86/kernel/vsmp_64.c +++ b/arch/x86/kernel/vsmp_64.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include @@ -22,6 +23,8 @@ #include #include +#define TOPOLOGY_REGISTER_OFFSET 0x10 + #if defined CONFIG_PCI && defined CONFIG_PARAVIRT /* * Interrupt control on vSMPowered systems: @@ -149,12 +152,52 @@ int is_vsmp_box(void) return 0; } #endif + +static void __init vsmp_cap_cpus(void) +{ + void __iomem *address; + unsigned int cfg, topology, node_shift, maxcpus; + +#ifdef CONFIG_X86_VSMP + /* VSMP is enabled, no need to cap cpus */ + return; +#endif + + /* + * CONFIG_X86_VSMP is not configured, so limit the number CPUs to the + * ones present in the first board, unless explicitly overridden by + * setup_max_cpus + */ + if (setup_max_cpus != NR_CPUS) + return; + + /* Read the vSMP Foundation topology register */ + cfg = read_pci_config(0, 0x1f, 0, PCI_BASE_ADDRESS_0); + address = early_ioremap(cfg + TOPOLOGY_REGISTER_OFFSET, 4); + if (WARN_ON(!address)) + return; + + topology = readl(address); + node_shift = (topology >> 16) & 0x7; + if (!node_shift) + /* The value 0 should be decoded as 8 */ + node_shift = 8; + maxcpus = (topology & ((1 << node_shift) - 1)) + 1; + + pr_info("vSMP CTL: Capping CPUs to %d (CONFIG_X86_VSMP is unset)\n", + maxcpus); + setup_max_cpus = maxcpus; + early_iounmap(address, 4); +} + void __init vsmp_init(void) { detect_vsmp_box(); if (!is_vsmp_box()) return; + vsmp_cap_cpus(); + set_vsmp_pv_ops(); return; } -- 1.7.6.5 -- 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/