8701d8083d
Currently the SCU registers are mapped in SoC-specific code, using
different methods, all involving the static mapping set up from
machine_desc.map_io():
- On emev2, a static (non-identity) mapping is used, with ioremap().
As the static mapping uses the MT_DEVICE type, ioremap() reuses it,
and the returned virtual address is suitable for passing to
shmobile_smp_hook(),
- On sh73a0 and r8a7779, a static identity mapping is used, with the
legacy IOMEM() macro.
As the static mapping uses the MT_DEVICE_NONSHARED type, replacing
IOMEM() by ioremap() would create a new mapping, whose virtual
address cannot be passed to shmobile_smp_hook().
Move the mapping of the SCU registers from SoC-specific code to common
code, always using ioremap(). To work in the absence of a static
mapping, this requires passing the physical SCU base address to
shmobile_smp_hook().
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
67 lines
1.9 KiB
C
67 lines
1.9 KiB
C
/*
|
|
* SMP support for R-Mobile / SH-Mobile - sh73a0 portion
|
|
*
|
|
* Copyright (C) 2010 Magnus Damm
|
|
* Copyright (C) 2010 Takashi Yoshii
|
|
*
|
|
* 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.
|
|
*/
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/smp.h>
|
|
#include <linux/io.h>
|
|
#include <linux/delay.h>
|
|
|
|
#include <asm/smp_plat.h>
|
|
#include <asm/smp_twd.h>
|
|
|
|
#include "common.h"
|
|
#include "sh73a0.h"
|
|
|
|
#define WUPCR IOMEM(0xe6151010)
|
|
#define SRESCR IOMEM(0xe6151018)
|
|
#define PSTR IOMEM(0xe6151040)
|
|
#define SBAR IOMEM(0xe6180020)
|
|
#define APARMBAREA IOMEM(0xe6f10020)
|
|
|
|
#define SH73A0_SCU_BASE 0xf0000000
|
|
|
|
static int sh73a0_boot_secondary(unsigned int cpu, struct task_struct *idle)
|
|
{
|
|
unsigned int lcpu = cpu_logical_map(cpu);
|
|
|
|
if (((__raw_readl(PSTR) >> (4 * lcpu)) & 3) == 3)
|
|
__raw_writel(1 << lcpu, WUPCR); /* wake up */
|
|
else
|
|
__raw_writel(1 << lcpu, SRESCR); /* reset */
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void __init sh73a0_smp_prepare_cpus(unsigned int max_cpus)
|
|
{
|
|
/* Map the reset vector (in headsmp.S) */
|
|
__raw_writel(0, APARMBAREA); /* 4k */
|
|
__raw_writel(__pa(shmobile_boot_vector), SBAR);
|
|
|
|
/* setup sh73a0 specific SCU bits */
|
|
shmobile_smp_scu_prepare_cpus(SH73A0_SCU_BASE, max_cpus);
|
|
}
|
|
|
|
const struct smp_operations sh73a0_smp_ops __initconst = {
|
|
.smp_prepare_cpus = sh73a0_smp_prepare_cpus,
|
|
.smp_boot_secondary = sh73a0_boot_secondary,
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
.cpu_can_disable = shmobile_smp_cpu_can_disable,
|
|
.cpu_die = shmobile_smp_scu_cpu_die,
|
|
.cpu_kill = shmobile_smp_scu_cpu_kill,
|
|
#endif
|
|
};
|