From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757543Ab2EJQ3F (ORCPT ); Thu, 10 May 2012 12:29:05 -0400 Received: from mga09.intel.com ([134.134.136.24]:27165 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755305Ab2EJQ20 (ORCPT ); Thu, 10 May 2012 12:28:26 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.67,351,1309762800"; d="scan'208";a="142389158" From: "Fenghua Yu" To: "Ingo Molnar" , "Thomas Gleixner" , "H Peter Anvin" , "Linus Torvalds" , "Andrew Morton" , "Asit K Mallick" , "Tony Luck" , "Arjan Dan De Ven" , "Suresh B Siddha" , "Len Brown" , "Srivatssa S. Bhat" , "Randy Dunlap" , "Chen Gong" , "linux-kernel" , "linux-pm" , "x86" Cc: "Fenghua Yu" Subject: [PATCH v6 09/12] x86/common.c: Init CPU0 data during CPU0 online Date: Thu, 10 May 2012 09:16:51 -0700 Message-Id: <1336666614-21090-10-git-send-email-fenghua.yu@intel.com> X-Mailer: git-send-email 1.7.2 In-Reply-To: <1336666614-21090-1-git-send-email-fenghua.yu@intel.com> References: <1336666614-21090-1-git-send-email-fenghua.yu@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Fenghua Yu During CPU0 online, enable x2apic, re-init mcheck, set_numa_node, add numa mask, and enable sep cpu for CPU0. Signed-off-by: Fenghua Yu --- arch/x86/include/asm/processor.h | 1 + arch/x86/kernel/cpu/common.c | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index ccbb1ea..81d6993 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -169,6 +169,7 @@ extern struct pt_regs *idle_regs(struct pt_regs *); extern void early_cpu_init(void); extern void identify_boot_cpu(void); +extern void identify_boot_cpu_online(void); extern void identify_secondary_cpu(struct cpuinfo_x86 *); extern void print_cpu_info(struct cpuinfo_x86 *); void print_cpu_msr(struct cpuinfo_x86 *); diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index cf79302..7f9f481 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -913,6 +913,18 @@ void __init identify_boot_cpu(void) #endif } +void __cpuinit identify_boot_cpu_online(void) +{ + mcheck_cpu_init(&boot_cpu_data); + +#ifdef CONFIG_NUMA + numa_add_cpu(smp_processor_id()); +#endif +#ifdef CONFIG_X86_32 + enable_sep_cpu(); +#endif +} + void __cpuinit identify_secondary_cpu(struct cpuinfo_x86 *c) { BUG_ON(c == &boot_cpu_data); @@ -1185,7 +1197,7 @@ void __cpuinit cpu_init(void) oist = &per_cpu(orig_ist, cpu); #ifdef CONFIG_NUMA - if (cpu != 0 && percpu_read(numa_node) == 0 && + if (percpu_read(numa_node) == 0 && early_cpu_to_node(cpu) != NUMA_NO_NODE) set_numa_node(early_cpu_to_node(cpu)); #endif @@ -1217,8 +1229,7 @@ void __cpuinit cpu_init(void) barrier(); x86_configure_nx(); - if (cpu != 0) - enable_x2apic(); + enable_x2apic(); /* * set up and load the per-CPU TSS -- 1.6.0.3