From: "Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>
To: peterz@infradead.org, paulmck@linux.vnet.ibm.com
Cc: rusty@rustcorp.com.au, mingo@kernel.org, yong.zhang0@gmail.com,
akpm@linux-foundation.org, vatsa@linux.vnet.ibm.com, rjw@sisk.pl,
linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org,
srivatsa.bhat@linux.vnet.ibm.com, nikunj@linux.vnet.ibm.com,
Chris Metcalf <cmetcalf@tilera.com>,
Thomas Gleixner <tglx@linutronix.de>Yong Zhang
<yong.zhang0@gmail.com>
Subject: [PATCH 12/27] tile, smpboot: Use generic SMP booting infrastructure
Date: Fri, 01 Jun 2012 14:42:56 +0530 [thread overview]
Message-ID: <20120601091248.31979.59256.stgit@srivatsabhat.in.ibm.com> (raw)
In-Reply-To: <20120601090952.31979.24799.stgit@srivatsabhat.in.ibm.com>
Convert tile to use the generic framework to boot secondary CPUs.
Notes:
1. Don't enable interrupts in start_secondary().
2. Remove the unnecessary calls to local_irq_enable() in __cpu_up().
3. cpu_idle() was being called after doing a preempt_enable() instead
of a preempt_disable()! Fix it.
Cc: Chris Metcalf <cmetcalf@tilera.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Yong Zhang <yong.zhang0@gmail.com>
Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
---
arch/tile/kernel/smpboot.c | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/arch/tile/kernel/smpboot.c b/arch/tile/kernel/smpboot.c
index 24a9c06..8558824 100644
--- a/arch/tile/kernel/smpboot.c
+++ b/arch/tile/kernel/smpboot.c
@@ -145,8 +145,6 @@ static void __cpuinit start_secondary(void)
/* Set our thread pointer appropriately. */
set_my_cpu_offset(__per_cpu_offset[cpuid]);
- preempt_disable();
-
/*
* In large machines even this will slow us down, since we
* will be contending for for the printk spinlock.
@@ -165,7 +163,6 @@ static void __cpuinit start_secondary(void)
/* Allow hypervisor messages to be received */
init_messaging();
- local_irq_enable();
/* Indicate that we're ready to come up. */
/* Must not do this before we're ready to receive messages */
@@ -183,6 +180,11 @@ static void __cpuinit start_secondary(void)
*/
void __cpuinit online_secondary(void)
{
+ smpboot_start_secondary(NULL);
+}
+
+void __cpuinit __cpu_pre_starting(void *unused)
+{
/*
* low-memory mappings have been cleared, flush them from
* the local TLBs too.
@@ -193,21 +195,15 @@ void __cpuinit online_secondary(void)
/* This must be done before setting cpu_online_mask */
wmb();
+}
- notify_cpu_starting(smp_processor_id());
-
- set_cpu_online(smp_processor_id(), 1);
- __get_cpu_var(cpu_state) = CPU_ONLINE;
-
+void __cpuinit __cpu_post_online(void *unused)
+{
/* Set up tile-specific state for this cpu. */
setup_cpu(0);
/* Set up tile-timer clock-event device on this cpu */
setup_tile_timer();
-
- preempt_enable();
-
- cpu_idle();
}
int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *tidle)
@@ -217,13 +213,11 @@ int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *tidle)
for (; !cpumask_test_cpu(cpu, &cpu_started); timeout++) {
if (timeout >= 50000) {
pr_info("skipping unresponsive cpu%d\n", cpu);
- local_irq_enable();
return -EIO;
}
udelay(100);
}
- local_irq_enable();
per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
/* Unleash the CPU! */
WARNING: multiple messages have this Message-ID (diff)
From: "Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>
To: tglx@linutronix.de, peterz@infradead.org, paulmck@linux.vnet.ibm.com
Cc: rusty@rustcorp.com.au, mingo@kernel.org, yong.zhang0@gmail.com,
akpm@linux-foundation.org, vatsa@linux.vnet.ibm.com, rjw@sisk.pl,
linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org,
srivatsa.bhat@linux.vnet.ibm.com, nikunj@linux.vnet.ibm.com,
Chris Metcalf <cmetcalf@tilera.com>Yong Zhang
<yong.zhang0@gmail.com>
Subject: [PATCH 12/27] tile, smpboot: Use generic SMP booting infrastructure
Date: Fri, 01 Jun 2012 14:42:56 +0530 [thread overview]
Message-ID: <20120601091248.31979.59256.stgit@srivatsabhat.in.ibm.com> (raw)
Message-ID: <20120601091256.4-gAJvgi-GCCPkvPUIvpQ25KraznTqkiiETKzcW4tUw@z> (raw)
In-Reply-To: <20120601090952.31979.24799.stgit@srivatsabhat.in.ibm.com>
Convert tile to use the generic framework to boot secondary CPUs.
Notes:
1. Don't enable interrupts in start_secondary().
2. Remove the unnecessary calls to local_irq_enable() in __cpu_up().
3. cpu_idle() was being called after doing a preempt_enable() instead
of a preempt_disable()! Fix it.
Cc: Chris Metcalf <cmetcalf@tilera.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Yong Zhang <yong.zhang0@gmail.com>
Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
---
arch/tile/kernel/smpboot.c | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/arch/tile/kernel/smpboot.c b/arch/tile/kernel/smpboot.c
index 24a9c06..8558824 100644
--- a/arch/tile/kernel/smpboot.c
+++ b/arch/tile/kernel/smpboot.c
@@ -145,8 +145,6 @@ static void __cpuinit start_secondary(void)
/* Set our thread pointer appropriately. */
set_my_cpu_offset(__per_cpu_offset[cpuid]);
- preempt_disable();
-
/*
* In large machines even this will slow us down, since we
* will be contending for for the printk spinlock.
@@ -165,7 +163,6 @@ static void __cpuinit start_secondary(void)
/* Allow hypervisor messages to be received */
init_messaging();
- local_irq_enable();
/* Indicate that we're ready to come up. */
/* Must not do this before we're ready to receive messages */
@@ -183,6 +180,11 @@ static void __cpuinit start_secondary(void)
*/
void __cpuinit online_secondary(void)
{
+ smpboot_start_secondary(NULL);
+}
+
+void __cpuinit __cpu_pre_starting(void *unused)
+{
/*
* low-memory mappings have been cleared, flush them from
* the local TLBs too.
@@ -193,21 +195,15 @@ void __cpuinit online_secondary(void)
/* This must be done before setting cpu_online_mask */
wmb();
+}
- notify_cpu_starting(smp_processor_id());
-
- set_cpu_online(smp_processor_id(), 1);
- __get_cpu_var(cpu_state) = CPU_ONLINE;
-
+void __cpuinit __cpu_post_online(void *unused)
+{
/* Set up tile-specific state for this cpu. */
setup_cpu(0);
/* Set up tile-timer clock-event device on this cpu */
setup_tile_timer();
-
- preempt_enable();
-
- cpu_idle();
}
int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *tidle)
@@ -217,13 +213,11 @@ int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *tidle)
for (; !cpumask_test_cpu(cpu, &cpu_started); timeout++) {
if (timeout >= 50000) {
pr_info("skipping unresponsive cpu%d\n", cpu);
- local_irq_enable();
return -EIO;
}
udelay(100);
}
- local_irq_enable();
per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
/* Unleash the CPU! */
next prev parent reply other threads:[~2012-06-01 9:12 UTC|newest]
Thread overview: 125+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-01 9:10 [PATCH 00/27] Generic framework for SMP booting/CPU hotplug related code Srivatsa S. Bhat
2012-06-01 9:10 ` [PATCH 01/27] smpboot: Provide a generic method to boot secondary processors Srivatsa S. Bhat
2012-06-01 9:10 ` Srivatsa S. Bhat
2012-06-01 16:51 ` Sam Ravnborg
2012-06-01 22:29 ` Srivatsa S. Bhat
2012-06-04 10:32 ` Thomas Gleixner
2012-06-04 13:07 ` Srivatsa S. Bhat
2012-06-04 13:18 ` Thomas Gleixner
2012-06-04 13:18 ` Thomas Gleixner
2012-06-04 16:53 ` Srivatsa S. Bhat
2012-06-05 5:11 ` Yong Zhang
2012-06-05 6:07 ` Srivatsa S. Bhat
2012-06-01 16:53 ` Sam Ravnborg
2012-06-01 22:41 ` Srivatsa S. Bhat
2012-06-02 15:16 ` Sam Ravnborg
2012-06-02 15:34 ` Srivatsa S. Bhat
2012-06-01 9:10 ` [PATCH 02/27] smpboot: Add provisions for arch-specific locking around cpu_online_mask Srivatsa S. Bhat
2012-06-01 9:10 ` Srivatsa S. Bhat
2012-06-01 9:10 ` [PATCH 03/27] smpboot: Define and use cpu_state per-cpu variable in generic code Srivatsa S. Bhat
2012-06-01 16:59 ` David Daney
2012-06-01 9:11 ` [PATCH 04/27] smpboot, x86, xen: Determine smp booting implementations at run-time Srivatsa S. Bhat
2012-06-01 9:11 ` Srivatsa S. Bhat
2012-06-01 9:11 ` [PATCH 05/27] xen, cpu hotplug: Don't call cpu_bringup() in xen_play_dead() Srivatsa S. Bhat
2012-06-01 9:11 ` Srivatsa S. Bhat
2012-06-01 12:59 ` [Xen-devel] " Jan Beulich
2012-06-01 15:13 ` Srivatsa S. Bhat
2012-06-01 15:36 ` Jan Beulich
2012-06-02 18:06 ` Srivatsa S. Bhat
2012-06-02 18:06 ` Srivatsa S. Bhat
2012-06-05 16:49 ` Konrad Rzeszutek Wilk
2012-06-05 16:49 ` Konrad Rzeszutek Wilk
2012-06-05 17:36 ` Srivatsa S. Bhat
2012-06-05 17:40 ` Thomas Gleixner
2012-06-05 17:40 ` Thomas Gleixner
2012-06-05 17:48 ` Srivatsa S. Bhat
2012-06-05 17:48 ` Srivatsa S. Bhat
2012-06-01 9:11 ` [PATCH 06/27] xen, smpboot: Use generic SMP booting infrastructure Srivatsa S. Bhat
2012-06-01 9:11 ` Srivatsa S. Bhat
2012-06-01 9:11 ` [PATCH 07/27] x86, " Srivatsa S. Bhat
2012-06-01 9:11 ` Srivatsa S. Bhat
2012-06-04 14:29 ` Thomas Gleixner
2012-06-04 17:00 ` Srivatsa S. Bhat
2012-06-01 9:12 ` [PATCH 08/27] m32r: Fix horrible logic in smp_prepare_cpus() Srivatsa S. Bhat
2012-06-01 9:12 ` Srivatsa S. Bhat
2012-06-01 9:12 ` [PATCH 09/27] m32r, smpboot: Use generic SMP booting infrastructure Srivatsa S. Bhat
2012-06-01 9:12 ` Srivatsa S. Bhat
2012-06-01 9:12 ` [PATCH 10/27] mips, " Srivatsa S. Bhat
2012-06-01 9:12 ` Srivatsa S. Bhat
2012-06-03 8:25 ` Yong Zhang
2012-06-03 11:48 ` Srivatsa S. Bhat
2012-06-04 2:17 ` Yong Zhang
2012-06-01 9:12 ` [PATCH 11/27] sh, " Srivatsa S. Bhat
2012-06-01 9:12 ` Srivatsa S. Bhat
2012-06-01 9:12 ` Srivatsa S. Bhat [this message]
2012-06-01 9:12 ` [PATCH 12/27] tile, " Srivatsa S. Bhat
2012-06-01 18:07 ` Chris Metcalf
2012-06-01 9:13 ` [PATCH 13/27] hexagon, " Srivatsa S. Bhat
2012-06-01 9:13 ` Srivatsa S. Bhat
2012-06-01 9:13 ` [PATCH 14/27] ia64: Move holding of vector_lock to __setup_vector_irq() Srivatsa S. Bhat
2012-06-01 9:13 ` Srivatsa S. Bhat
2012-06-01 9:13 ` [PATCH 15/27] ia64, smpboot: Use generic SMP booting infrastructure Srivatsa S. Bhat
2012-06-01 9:13 ` Srivatsa S. Bhat
2012-06-01 9:13 ` [PATCH 16/27] mn10300: Fix horrible logic in smp_prepare_cpus() Srivatsa S. Bhat
2012-06-01 9:13 ` Srivatsa S. Bhat
2012-06-01 9:14 ` [PATCH 17/27] mn10300, smpboot: Use generic SMP booting infrastructure Srivatsa S. Bhat
2012-06-01 9:14 ` Srivatsa S. Bhat
2012-06-03 8:33 ` Yong Zhang
2012-06-03 8:33 ` Yong Zhang
2012-06-03 11:50 ` Srivatsa S. Bhat
2012-06-01 9:14 ` [PATCH 18/27] powerpc, " Srivatsa S. Bhat
2012-06-01 9:14 ` Srivatsa S. Bhat
2012-06-02 6:14 ` Paul Mackerras
2012-06-02 6:14 ` Paul Mackerras
2012-06-01 9:14 ` [PATCH 19/27] blackfin, " Srivatsa S. Bhat
2012-06-01 9:14 ` Srivatsa S. Bhat
2012-06-01 9:14 ` [PATCH 20/27] sparc64, " Srivatsa S. Bhat
2012-06-01 9:14 ` Srivatsa S. Bhat
2012-06-01 17:55 ` David Miller
2012-06-01 22:44 ` [UPDATED PATCH " Srivatsa S. Bhat
2012-06-01 22:44 ` Srivatsa S. Bhat
2012-06-01 22:52 ` David Miller
2012-06-01 22:52 ` David Miller
2012-06-01 9:15 ` [PATCH 21/27] sparc32, " Srivatsa S. Bhat
2012-06-01 9:15 ` Srivatsa S. Bhat
2012-06-01 17:56 ` David Miller
2012-06-01 17:56 ` David Miller
2012-06-01 18:54 ` Sam Ravnborg
2012-06-01 18:54 ` Sam Ravnborg
2012-06-01 22:47 ` [UPDATED PATCH " Srivatsa S. Bhat
2012-06-01 22:53 ` David Miller
2012-06-01 22:53 ` David Miller
2012-06-01 23:17 ` Srivatsa S. Bhat
2012-06-01 23:17 ` Srivatsa S. Bhat
2012-06-02 6:52 ` Sam Ravnborg
2012-06-02 7:44 ` Sam Ravnborg
2012-06-02 8:01 ` Srivatsa S. Bhat
2012-06-02 8:01 ` Srivatsa S. Bhat
2012-06-02 8:14 ` Srivatsa S. Bhat
2012-06-02 15:13 ` Sam Ravnborg
2012-06-02 15:13 ` Sam Ravnborg
2012-06-02 15:58 ` Srivatsa S. Bhat
2012-06-02 16:23 ` Sam Ravnborg
2012-06-02 16:34 ` Srivatsa S. Bhat
2012-06-03 21:17 ` [PATCH] sparc32: refactor smp boot Sam Ravnborg
2012-06-03 21:17 ` Sam Ravnborg
2012-06-04 1:04 ` David Miller
2012-06-04 1:04 ` David Miller
2012-06-04 6:48 ` Srivatsa S. Bhat
2012-06-01 9:15 ` [PATCH 22/27] um, smpboot: Use generic SMP booting infrastructure Srivatsa S. Bhat
2012-06-01 9:15 ` Srivatsa S. Bhat
2012-06-01 9:15 ` [PATCH 23/27] cris, " Srivatsa S. Bhat
2012-06-01 9:15 ` Srivatsa S. Bhat
2012-06-03 8:41 ` Yong Zhang
2012-06-03 8:41 ` Yong Zhang
2012-06-03 11:52 ` Srivatsa S. Bhat
2012-06-01 9:15 ` [PATCH 24/27] parisc, " Srivatsa S. Bhat
2012-06-01 9:15 ` Srivatsa S. Bhat
2012-06-01 9:16 ` [PATCH 25/27] s390, " Srivatsa S. Bhat
2012-06-01 9:16 ` Srivatsa S. Bhat
2012-06-01 10:45 ` Heiko Carstens
2012-06-01 9:16 ` [PATCH 26/27] arm, " Srivatsa S. Bhat
2012-06-01 9:16 ` Srivatsa S. Bhat
2012-06-01 11:04 ` Russell King - ARM Linux
2012-06-01 9:16 ` [PATCH 27/27] alpha, " Srivatsa S. Bhat
2012-06-01 9:16 ` Srivatsa S. Bhat
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=20120601091248.31979.59256.stgit@srivatsabhat.in.ibm.com \
--to=srivatsa.bhat@linux.vnet.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=cmetcalf@tilera.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=nikunj@linux.vnet.ibm.com \
--cc=paulmck@linux.vnet.ibm.com \
--cc=peterz@infradead.org \
--cc=rjw@sisk.pl \
--cc=rusty@rustcorp.com.au \
--cc=tglx@linutronix.de \
--cc=vatsa@linux.vnet.ibm.com \
--cc=yong.zhang0@gmail.com \
/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).