0e51793e16
Pull ARM updates from Russell King:
"This is the first chunk of ARM updates for this merge window.
Conflicts are expected in two files - asm/timex.h and
mach-integrator/integrator_cp.c. Nothing particularly stands out more
than anything else.
Most of the growth is down to the opcodes stuff from Dave Martin,
which is countered by Rob's patches to use more of the asm-generic
headers on ARM."
(A few more conflicts grew since then, but it all looked fairly trivial)
* 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (44 commits)
ARM: 7548/1: include linux/sched.h in syscall.h
ARM: 7541/1: Add ARM ERRATA 775420 workaround
ARM: ensure vm_struct has its phys_addr member filled in
ARM: 7540/1: kexec: Check segment memory addresses
ARM: 7539/1: kexec: scan for dtb magic in segments
ARM: 7538/1: delay: add registration mechanism for delay timer sources
ARM: 7536/1: smp: Formalize an IPI for wakeup
ARM: 7525/1: ptrace: use updated syscall number for syscall auditing
ARM: 7524/1: support syscall tracing
ARM: 7519/1: integrator: convert platform devices to Device Tree
ARM: 7518/1: integrator: convert AMBA devices to device tree
ARM: 7517/1: integrator: initial device tree support
ARM: 7516/1: plat-versatile: add DT support to FPGA IRQ
ARM: 7515/1: integrator: check PL010 base address from resource
ARM: 7514/1: integrator: call common init function from machine
ARM: 7522/1: arch_timers: register a time/cycle counter
ARM: 7523/1: arch_timers: enable the use of the virtual timer
ARM: 7531/1: mark kernelmode mem{cpy,set} non-experimental
ARM: 7520/1: Build dtb files in all target
ARM: Fix build warning in arch/arm/mm/alignment.c
...
134 lines
3.4 KiB
C
134 lines
3.4 KiB
C
/*
|
|
* SMP support for Emma Mobile EV2
|
|
*
|
|
* Copyright (C) 2012 Renesas Solutions Corp.
|
|
* Copyright (C) 2012 Magnus Damm
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; version 2 of the License.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/smp.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/io.h>
|
|
#include <linux/delay.h>
|
|
#include <mach/common.h>
|
|
#include <mach/emev2.h>
|
|
#include <asm/smp_plat.h>
|
|
#include <asm/smp_scu.h>
|
|
#include <asm/hardware/gic.h>
|
|
#include <asm/cacheflush.h>
|
|
|
|
#define EMEV2_SCU_BASE 0x1e000000
|
|
|
|
static DEFINE_SPINLOCK(scu_lock);
|
|
static void __iomem *scu_base;
|
|
|
|
static void modify_scu_cpu_psr(unsigned long set, unsigned long clr)
|
|
{
|
|
unsigned long tmp;
|
|
|
|
/* we assume this code is running on a different cpu
|
|
* than the one that is changing coherency setting */
|
|
spin_lock(&scu_lock);
|
|
tmp = readl(scu_base + 8);
|
|
tmp &= ~clr;
|
|
tmp |= set;
|
|
writel(tmp, scu_base + 8);
|
|
spin_unlock(&scu_lock);
|
|
|
|
}
|
|
|
|
static unsigned int __init emev2_get_core_count(void)
|
|
{
|
|
if (!scu_base) {
|
|
scu_base = ioremap(EMEV2_SCU_BASE, PAGE_SIZE);
|
|
emev2_clock_init(); /* need ioremapped SMU */
|
|
}
|
|
|
|
WARN_ON_ONCE(!scu_base);
|
|
|
|
return scu_base ? scu_get_core_count(scu_base) : 1;
|
|
}
|
|
|
|
static int emev2_platform_cpu_kill(unsigned int cpu)
|
|
{
|
|
return 0; /* not supported yet */
|
|
}
|
|
|
|
static int __maybe_unused emev2_cpu_kill(unsigned int cpu)
|
|
{
|
|
int k;
|
|
|
|
/* this function is running on another CPU than the offline target,
|
|
* here we need wait for shutdown code in platform_cpu_die() to
|
|
* finish before asking SoC-specific code to power off the CPU core.
|
|
*/
|
|
for (k = 0; k < 1000; k++) {
|
|
if (shmobile_cpu_is_dead(cpu))
|
|
return emev2_platform_cpu_kill(cpu);
|
|
mdelay(1);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
static void __cpuinit emev2_secondary_init(unsigned int cpu)
|
|
{
|
|
gic_secondary_init(0);
|
|
}
|
|
|
|
static int __cpuinit emev2_boot_secondary(unsigned int cpu, struct task_struct *idle)
|
|
{
|
|
cpu = cpu_logical_map(cpu);
|
|
|
|
/* enable cache coherency */
|
|
modify_scu_cpu_psr(0, 3 << (cpu * 8));
|
|
|
|
/* Tell ROM loader about our vector (in headsmp.S) */
|
|
emev2_set_boot_vector(__pa(shmobile_secondary_vector));
|
|
|
|
gic_raise_softirq(cpumask_of(cpu), 0);
|
|
return 0;
|
|
}
|
|
|
|
static void __init emev2_smp_prepare_cpus(unsigned int max_cpus)
|
|
{
|
|
int cpu = cpu_logical_map(0);
|
|
|
|
scu_enable(scu_base);
|
|
|
|
/* enable cache coherency on CPU0 */
|
|
modify_scu_cpu_psr(0, 3 << (cpu * 8));
|
|
}
|
|
|
|
static void __init emev2_smp_init_cpus(void)
|
|
{
|
|
unsigned int ncores = emev2_get_core_count();
|
|
|
|
shmobile_smp_init_cpus(ncores);
|
|
}
|
|
|
|
struct smp_operations emev2_smp_ops __initdata = {
|
|
.smp_init_cpus = emev2_smp_init_cpus,
|
|
.smp_prepare_cpus = emev2_smp_prepare_cpus,
|
|
.smp_secondary_init = emev2_secondary_init,
|
|
.smp_boot_secondary = emev2_boot_secondary,
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
.cpu_kill = emev2_cpu_kill,
|
|
.cpu_die = shmobile_cpu_die,
|
|
.cpu_disable = shmobile_cpu_disable,
|
|
#endif
|
|
};
|