From: "Fenghua Yu" <fenghua.yu@intel.com>
To: "Ingo Molnar" <mingo@elte.hu>,
"Thomas Gleixner" <tglx@linutronix.de>,
"H Peter Anvin" <hpa@zytor.com>,
"Linus Torvalds" <torvalds@linux-foundation.org>,
"Andrew Morton" <akpm@linux-foundation.org>,
"Asit K Mallick" <asit.k.mallick@intel.com>,
"Tony Luck" <tony.luck@intel.com>,
"Arjan van de Ven" <arjan.van.de.ven@intel.com>,
"Suresh B Siddha" <suresh.b.siddha@intel.com>,
"Len Brown" <len.brown@intel.com>,
"Randy Dunlap" <rdunlap@xenotime.net>,
"Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
Peter Zijlstra <peterz@infradead.org>,
"Chen Gong" <gong.chen@linux.intel.com>,
"linux-kernel" <linux-kernel@vger.kernel.org>,
"linux-pm" <linux-pm@vger.kernel.org>, "x86" <x86@kernel.org>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Subject: [PATCH v5 09/12] x86/common.c: Init CPU0 data during CPU0 online
Date: Wed, 11 Jan 2012 09:04:50 -0800 [thread overview]
Message-ID: <1326301493-28760-10-git-send-email-fenghua.yu@intel.com> (raw)
In-Reply-To: <1326301493-28760-1-git-send-email-fenghua.yu@intel.com>
From: Fenghua Yu <fenghua.yu@intel.com>
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 <fenghua.yu@intel.com>
---
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 aa9088c..861d0e9 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -160,6 +160,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 *);
extern void init_scattered_cpuid_features(struct cpuinfo_x86 *c);
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index d43cad7..300e3e2 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -911,6 +911,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);
@@ -1189,7 +1201,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
@@ -1221,8 +1233,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
next prev parent reply other threads:[~2012-01-11 17:27 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-11 17:04 [PATCH v5 0/12] x86: Arbitrary CPU hot(un)plug support Fenghua Yu
2012-01-11 17:04 ` [PATCH v5 01/12] Documentations/cpu-hotplug.tx, kernel-parameters.txt: Add x86 CPU0 online/offline feature Fenghua Yu
2012-01-11 17:04 ` [PATCH v5 02/12] x86/Kconfig: Add config switch for CPU0 hotplug Fenghua Yu
2012-01-11 17:04 ` [PATCH v5 03/12] x86/topology.c: Support functions for CPU0 online/offline Fenghua Yu
2012-01-16 17:35 ` Ben Hutchings
2012-01-24 22:31 ` Yu, Fenghua
2012-01-24 22:52 ` Ben Hutchings
2012-01-24 23:00 ` Yu, Fenghua
2012-01-11 17:04 ` [PATCH v5 04/12] x86/smpboot.c: Don't offline CPU0 if any irq can not be migrated out of it and remove CPU0 check in smp_callin() Fenghua Yu
2012-01-11 17:04 ` [PATCH v5 05/12] x86/power/cpu.c: Don't hibernate/suspend if CPU0 is offline Fenghua Yu
2012-01-11 17:04 ` [PATCH v5 06/12] x86/head_64.S: Define start_cpu0 Fenghua Yu
2012-01-11 17:04 ` [PATCH v5 07/12] x86/head_32.S: " Fenghua Yu
2012-01-11 17:04 ` [PATCH v5 08/12] x86/smpboot.c: Wake up CPU0 via NMI instead of INITs Fenghua Yu
2012-01-12 12:31 ` Brian Gerst
2012-01-11 17:04 ` Fenghua Yu [this message]
2012-01-11 17:04 ` [PATCH v5 10/12] x86/mtrr/main.c: Ask the first online CPU to save mtrr Fenghua Yu
2012-01-12 12:33 ` Brian Gerst
2012-01-16 0:07 ` H. Peter Anvin
2012-01-25 17:58 ` Yu, Fenghua
2012-01-25 19:01 ` Yu, Fenghua
2012-01-11 17:04 ` [PATCH v5 11/12] x86/i387.c: Thread xstate is initialized only on CPU0 once Fenghua Yu
2012-01-11 17:04 ` [PATCH v5 12/12] x86/topology.c: debug CPU0 hotplug Fenghua Yu
2012-01-15 15:24 ` Jiang Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1326301493-28760-10-git-send-email-fenghua.yu@intel.com \
--to=fenghua.yu@intel.com \
--cc=akpm@linux-foundation.org \
--cc=arjan.van.de.ven@intel.com \
--cc=asit.k.mallick@intel.com \
--cc=gong.chen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=konrad.wilk@oracle.com \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=rdunlap@xenotime.net \
--cc=srivatsa.bhat@linux.vnet.ibm.com \
--cc=suresh.b.siddha@intel.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=torvalds@linux-foundation.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).