Commit 8bbcd729 authored by Magnus Damm's avatar Magnus Damm Committed by Simon Horman

ARM: shmobile: Update r8a7779 to use scu_power_mode()

Update the SMP code for R8A7779 to make use of the
shared SCU function scu_power_mode() together with
the early setup code in shmobile_secondary_vector_scu.

With this patch in place the secondary CPUs modify the
SCU setting during early boot instead of letting other
CPUs deal with the coherency setting before boot. In
other words, we used to setup coherency before boot
in r8a7779_boot_secondary() but that bit is now instead
handled by the code in shmobile_secondary_vector_scu.
Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent bbf2627c
...@@ -58,9 +58,6 @@ static struct r8a7779_pm_ch *r8a7779_ch_cpu[4] = { ...@@ -58,9 +58,6 @@ static struct r8a7779_pm_ch *r8a7779_ch_cpu[4] = {
[3] = &r8a7779_ch_cpu3, [3] = &r8a7779_ch_cpu3,
}; };
static DEFINE_SPINLOCK(scu_lock);
static unsigned long tmp;
#ifdef CONFIG_HAVE_ARM_TWD #ifdef CONFIG_HAVE_ARM_TWD
static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, R8A7779_SCU_BASE + 0x600, 29); static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, R8A7779_SCU_BASE + 0x600, 29);
void __init r8a7779_register_twd(void) void __init r8a7779_register_twd(void)
...@@ -79,20 +76,6 @@ static int r8a7779_scu_psr_core_disabled(int cpu) ...@@ -79,20 +76,6 @@ static int r8a7779_scu_psr_core_disabled(int cpu)
return 0; return 0;
} }
static void modify_scu_cpu_psr(unsigned long set, unsigned long clr)
{
void __iomem *scu_base = shmobile_scu_base;
spin_lock(&scu_lock);
tmp = __raw_readl(scu_base + 8);
tmp &= ~clr;
tmp |= set;
spin_unlock(&scu_lock);
/* disable cache coherency after releasing the lock */
__raw_writel(tmp, scu_base + 8);
}
static int r8a7779_platform_cpu_kill(unsigned int cpu) static int r8a7779_platform_cpu_kill(unsigned int cpu)
{ {
struct r8a7779_pm_ch *ch = NULL; struct r8a7779_pm_ch *ch = NULL;
...@@ -133,7 +116,7 @@ static void __maybe_unused r8a7779_cpu_die(unsigned int cpu) ...@@ -133,7 +116,7 @@ static void __maybe_unused r8a7779_cpu_die(unsigned int cpu)
flush_cache_all(); flush_cache_all();
/* disable cache coherency */ /* disable cache coherency */
modify_scu_cpu_psr(3 << (cpu * 8), 0); scu_power_mode(shmobile_scu_base, SCU_PM_POWEROFF);
/* Endless loop until power off from r8a7779_cpu_kill() */ /* Endless loop until power off from r8a7779_cpu_kill() */
while (1) while (1)
...@@ -158,9 +141,6 @@ static int __cpuinit r8a7779_boot_secondary(unsigned int cpu, struct task_struct ...@@ -158,9 +141,6 @@ static int __cpuinit r8a7779_boot_secondary(unsigned int cpu, struct task_struct
cpu = cpu_logical_map(cpu); cpu = cpu_logical_map(cpu);
/* enable cache coherency */
modify_scu_cpu_psr(0, 3 << (cpu * 8));
if (cpu < ARRAY_SIZE(r8a7779_ch_cpu)) if (cpu < ARRAY_SIZE(r8a7779_ch_cpu))
ch = r8a7779_ch_cpu[cpu]; ch = r8a7779_ch_cpu[cpu];
...@@ -172,15 +152,13 @@ static int __cpuinit r8a7779_boot_secondary(unsigned int cpu, struct task_struct ...@@ -172,15 +152,13 @@ static int __cpuinit r8a7779_boot_secondary(unsigned int cpu, struct task_struct
static void __init r8a7779_smp_prepare_cpus(unsigned int max_cpus) static void __init r8a7779_smp_prepare_cpus(unsigned int max_cpus)
{ {
int cpu = cpu_logical_map(0);
scu_enable(shmobile_scu_base); scu_enable(shmobile_scu_base);
/* Map the reset vector (in headsmp.S) */ /* Map the reset vector (in headsmp-scu.S) */
__raw_writel(__pa(shmobile_secondary_vector), AVECR); __raw_writel(__pa(shmobile_secondary_vector_scu), AVECR);
/* enable cache coherency on CPU0 */ /* enable cache coherency on booting CPU */
modify_scu_cpu_psr(0, 3 << (cpu * 8)); scu_power_mode(shmobile_scu_base, SCU_PM_NORMAL);
r8a7779_pm_init(); r8a7779_pm_init();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment