From: Magnus Damm <magnus.damm@gmail.com>
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 02/07] ARM: shmobile: Use shared SCU SMP boot code on sh73a0
Date: Wed, 31 Jul 2013 07:07:21 +0000 [thread overview]
Message-ID: <20130731070721.14444.80422.sendpatchset@w520> (raw)
In-Reply-To: <20130731070702.14444.64961.sendpatchset@w520>
From: Magnus Damm <damm@opensource.se>
Use shared SCU code on sh73a0 for SMP boot.
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/Makefile | 2 +-
arch/arm/mach-shmobile/smp-sh73a0.c | 26 +++++++++++++-------------
2 files changed, 14 insertions(+), 14 deletions(-)
--- 0001/arch/arm/mach-shmobile/Makefile
+++ work/arch/arm/mach-shmobile/Makefile 2013-07-29 21:40:18.000000000 +0900
@@ -17,7 +17,7 @@ obj-$(CONFIG_ARCH_EMEV2) += setup-emev2.
# SMP objects
smp-y := platsmp.o headsmp.o
-smp-$(CONFIG_ARCH_SH73A0) += smp-sh73a0.o headsmp-scu.o
+smp-$(CONFIG_ARCH_SH73A0) += smp-sh73a0.o headsmp-scu.o platsmp-scu.o
smp-$(CONFIG_ARCH_R8A7779) += smp-r8a7779.o headsmp-scu.o
smp-$(CONFIG_ARCH_EMEV2) += smp-emev2.o headsmp-scu.o
--- 0002/arch/arm/mach-shmobile/smp-sh73a0.c
+++ work/arch/arm/mach-shmobile/smp-sh73a0.c 2013-07-29 21:41:27.000000000 +0900
@@ -50,30 +50,30 @@ void __init sh73a0_register_twd(void)
static int __cpuinit sh73a0_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
- cpu = cpu_logical_map(cpu);
+ unsigned int lcpu = cpu_logical_map(cpu);
+ int ret;
- if (((__raw_readl(PSTR) >> (4 * cpu)) & 3) = 3)
- __raw_writel(1 << cpu, WUPCR); /* wake up */
+ ret = shmobile_smp_scu_boot_secondary(cpu, idle);
+ if (ret)
+ return ret;
+
+ if (((__raw_readl(PSTR) >> (4 * lcpu)) & 3) = 3)
+ __raw_writel(1 << lcpu, WUPCR); /* wake up */
else
- __raw_writel(1 << cpu, SRESCR); /* reset */
+ __raw_writel(1 << lcpu, SRESCR); /* reset */
return 0;
}
static void __init sh73a0_smp_prepare_cpus(unsigned int max_cpus)
{
- /* setup sh73a0 specific SCU base */
- shmobile_scu_base = IOMEM(SH73A0_SCU_BASE);
- scu_enable(shmobile_scu_base);
-
- /* Map the reset vector (in headsmp-scu.S, headsmp.S) */
+ /* Map the reset vector (in headsmp.S) */
__raw_writel(0, APARMBAREA); /* 4k */
__raw_writel(__pa(shmobile_boot_vector), SBAR);
- shmobile_boot_fn = virt_to_phys(shmobile_boot_scu);
- shmobile_boot_arg = (unsigned long)shmobile_scu_base;
- /* enable cache coherency on booting CPU */
- scu_power_mode(shmobile_scu_base, SCU_PM_NORMAL);
+ /* setup sh73a0 specific SCU bits */
+ shmobile_scu_base = IOMEM(SH73A0_SCU_BASE);
+ shmobile_smp_scu_prepare_cpus(max_cpus);
}
#ifdef CONFIG_HOTPLUG_CPU
WARNING: multiple messages have this Message-ID (diff)
From: magnus.damm@gmail.com (Magnus Damm)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 02/07] ARM: shmobile: Use shared SCU SMP boot code on sh73a0
Date: Wed, 31 Jul 2013 16:07:21 +0900 [thread overview]
Message-ID: <20130731070721.14444.80422.sendpatchset@w520> (raw)
In-Reply-To: <20130731070702.14444.64961.sendpatchset@w520>
From: Magnus Damm <damm@opensource.se>
Use shared SCU code on sh73a0 for SMP boot.
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/Makefile | 2 +-
arch/arm/mach-shmobile/smp-sh73a0.c | 26 +++++++++++++-------------
2 files changed, 14 insertions(+), 14 deletions(-)
--- 0001/arch/arm/mach-shmobile/Makefile
+++ work/arch/arm/mach-shmobile/Makefile 2013-07-29 21:40:18.000000000 +0900
@@ -17,7 +17,7 @@ obj-$(CONFIG_ARCH_EMEV2) += setup-emev2.
# SMP objects
smp-y := platsmp.o headsmp.o
-smp-$(CONFIG_ARCH_SH73A0) += smp-sh73a0.o headsmp-scu.o
+smp-$(CONFIG_ARCH_SH73A0) += smp-sh73a0.o headsmp-scu.o platsmp-scu.o
smp-$(CONFIG_ARCH_R8A7779) += smp-r8a7779.o headsmp-scu.o
smp-$(CONFIG_ARCH_EMEV2) += smp-emev2.o headsmp-scu.o
--- 0002/arch/arm/mach-shmobile/smp-sh73a0.c
+++ work/arch/arm/mach-shmobile/smp-sh73a0.c 2013-07-29 21:41:27.000000000 +0900
@@ -50,30 +50,30 @@ void __init sh73a0_register_twd(void)
static int __cpuinit sh73a0_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
- cpu = cpu_logical_map(cpu);
+ unsigned int lcpu = cpu_logical_map(cpu);
+ int ret;
- if (((__raw_readl(PSTR) >> (4 * cpu)) & 3) == 3)
- __raw_writel(1 << cpu, WUPCR); /* wake up */
+ ret = shmobile_smp_scu_boot_secondary(cpu, idle);
+ if (ret)
+ return ret;
+
+ if (((__raw_readl(PSTR) >> (4 * lcpu)) & 3) == 3)
+ __raw_writel(1 << lcpu, WUPCR); /* wake up */
else
- __raw_writel(1 << cpu, SRESCR); /* reset */
+ __raw_writel(1 << lcpu, SRESCR); /* reset */
return 0;
}
static void __init sh73a0_smp_prepare_cpus(unsigned int max_cpus)
{
- /* setup sh73a0 specific SCU base */
- shmobile_scu_base = IOMEM(SH73A0_SCU_BASE);
- scu_enable(shmobile_scu_base);
-
- /* Map the reset vector (in headsmp-scu.S, headsmp.S) */
+ /* Map the reset vector (in headsmp.S) */
__raw_writel(0, APARMBAREA); /* 4k */
__raw_writel(__pa(shmobile_boot_vector), SBAR);
- shmobile_boot_fn = virt_to_phys(shmobile_boot_scu);
- shmobile_boot_arg = (unsigned long)shmobile_scu_base;
- /* enable cache coherency on booting CPU */
- scu_power_mode(shmobile_scu_base, SCU_PM_NORMAL);
+ /* setup sh73a0 specific SCU bits */
+ shmobile_scu_base = IOMEM(SH73A0_SCU_BASE);
+ shmobile_smp_scu_prepare_cpus(max_cpus);
}
#ifdef CONFIG_HOTPLUG_CPU
next prev parent reply other threads:[~2013-07-31 7:07 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-31 7:07 [PATCH 00/07] ARM: shmobile: sh73a0, r8a7779 and emev2 SMP SCU rework Magnus Damm
2013-07-31 7:07 ` Magnus Damm
2013-07-31 7:07 ` [PATCH 01/07] ARM: shmobile: Introduce shared SCU SMP boot code Magnus Damm
2013-07-31 7:07 ` Magnus Damm
2013-07-31 7:07 ` Magnus Damm [this message]
2013-07-31 7:07 ` [PATCH 02/07] ARM: shmobile: Use shared SCU SMP boot code on sh73a0 Magnus Damm
2013-07-31 7:07 ` [PATCH 03/07] ARM: shmobile: Use shared SCU SMP boot code on r8a7779 Magnus Damm
2013-07-31 7:07 ` Magnus Damm
2013-07-31 7:07 ` [PATCH 04/07] ARM: shmobile: Use shared SCU SMP boot code on emev2 Magnus Damm
2013-07-31 7:07 ` Magnus Damm
2013-07-31 7:07 ` [PATCH 05/07] ARM: shmobile: Add shared SCU CPU Hotplug code Magnus Damm
2013-07-31 7:07 ` Magnus Damm
2013-07-31 7:07 ` [PATCH 06/07] ARM: shmobile: Use shared SCU CPU Hotplug code on sh73a0 Magnus Damm
2013-07-31 7:07 ` Magnus Damm
2013-07-31 7:08 ` [PATCH 07/07] ARM: shmobile: Use shared SCU CPU Hotplug code on r8a7779 Magnus Damm
2013-07-31 7:08 ` Magnus Damm
2013-08-01 7:34 ` [PATCH 00/07] ARM: shmobile: sh73a0, r8a7779 and emev2 SMP SCU rework Simon Horman
2013-08-01 7:34 ` Simon Horman
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=20130731070721.14444.80422.sendpatchset@w520 \
--to=magnus.damm@gmail.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.