All of lore.kernel.org
 help / color / mirror / Atom feed
From: will.deacon@arm.com (Will Deacon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 7/8] ARM: ux500: convert logical CPU numbers to physical numbers
Date: Mon, 15 Aug 2011 18:30:51 +0100	[thread overview]
Message-ID: <1313429452-2820-8-git-send-email-will.deacon@arm.com> (raw)
In-Reply-To: <1313429452-2820-1-git-send-email-will.deacon@arm.com>

This patch uses the new cpu_logical_map() macro for converting logical
CPU numbers into physical numbers when dealing with the pen_release
variable in the SMP boot and CPU hotplug paths.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
 arch/arm/mach-ux500/hotplug.c |    2 +-
 arch/arm/mach-ux500/platsmp.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-ux500/hotplug.c b/arch/arm/mach-ux500/hotplug.c
index dd8037e..572015e 100644
--- a/arch/arm/mach-ux500/hotplug.c
+++ b/arch/arm/mach-ux500/hotplug.c
@@ -24,7 +24,7 @@ static inline void platform_do_lowpower(unsigned int cpu)
 	for (;;) {
 		__asm__ __volatile__("dsb\n\t" "wfi\n\t"
 				: : : "memory");
-		if (pen_release == cpu) {
+		if (pen_release == cpu_logical_map(cpu)) {
 			/*
 			 * OK, proper wakeup, we're done
 			 */
diff --git a/arch/arm/mach-ux500/platsmp.c b/arch/arm/mach-ux500/platsmp.c
index a33df5f..27e5281 100644
--- a/arch/arm/mach-ux500/platsmp.c
+++ b/arch/arm/mach-ux500/platsmp.c
@@ -96,7 +96,7 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
 	 * the holding pen - release it, then wait for it to flag
 	 * that it has been released by resetting pen_release.
 	 */
-	write_pen_release(cpu);
+	write_pen_release(cpu_logical_map(cpu));
 
 	gic_raise_softirq(cpumask_of(cpu), 1);
 
-- 
1.7.0.4

  parent reply	other threads:[~2011-08-15 17:30 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-15 17:30 [PATCH v2 0/8] Introduce logical CPU mapping Will Deacon
2011-08-15 17:30 ` [PATCH v2 1/8] ARM: cpuid: add support for reading MPIDR Will Deacon
2011-08-16  9:06   ` Vincent Guittot
2011-08-16  9:12     ` Will Deacon
2011-08-15 17:30 ` [PATCH v2 2/8] ARM: smp: populate logical CPU mapping during boot Will Deacon
2011-08-15 17:30 ` [PATCH v2 3/8] ARM: gic: convert logical CPU numbers into physical numbers Will Deacon
2011-08-15 17:30 ` [PATCH v2 4/8] ARM: exynos4: convert logical CPU numbers to " Will Deacon
2011-08-15 17:30 ` [PATCH v2 5/8] ARM: msm: " Will Deacon
2011-08-15 17:30 ` [PATCH v2 6/8] ARM: shmobile: " Will Deacon
2011-08-19 12:52   ` Will Deacon
2011-08-15 17:30 ` Will Deacon [this message]
2011-08-15 17:30 ` [PATCH v2 8/8] ARM: versatile: " Will Deacon

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=1313429452-2820-8-git-send-email-will.deacon@arm.com \
    --to=will.deacon@arm.com \
    --cc=linux-arm-kernel@lists.infradead.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.