![Linus Torvalds](/assets/img/avatar_default.png)
Pull ARM development updates from Russell King: "Included in this update: - moving PSCI code from ARM64/ARM to drivers/ - removal of some architecture internals from global kernel view - addition of software based "privileged no access" support using the old domains register to turn off the ability for kernel loads/stores to access userspace. Only the proper accessors will be usable. - addition of early fixup support for early console - re-addition (and reimplementation) of OMAP special interconnect barrier - removal of finish_arch_switch() - only expose cpuX/online in sysfs if hotpluggable - a number of code cleanups" * 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: (41 commits) ARM: software-based priviledged-no-access support ARM: entry: provide uaccess assembly macro hooks ARM: entry: get rid of multiple macro definitions ARM: 8421/1: smp: Collapse arch_cpu_idle_dead() into cpu_die() ARM: uaccess: provide uaccess_save_and_enable() and uaccess_restore() ARM: mm: improve do_ldrd_abort macro ARM: entry: ensure that IRQs are enabled when calling syscall_trace_exit() ARM: entry: efficiency cleanups ARM: entry: get rid of asm_trace_hardirqs_on_cond ARM: uaccess: simplify user access assembly ARM: domains: remove DOMAIN_TABLE ARM: domains: keep vectors in separate domain ARM: domains: get rid of manager mode for user domain ARM: domains: move initial domain setting value to asm/domains.h ARM: domains: provide domain_mask() ARM: domains: switch to keeping domain value in register ARM: 8419/1: dma-mapping: harmonize definition of DMA_ERROR_CODE ARM: 8417/1: refactor bitops functions with BIT_MASK() and BIT_WORD() ARM: 8416/1: Feroceon: use of_iomap() to map register base ARM: 8415/1: early fixmap support for earlycon ...
72 lines
2 KiB
C
72 lines
2 KiB
C
/*
|
|
* SMP support for r8a7790
|
|
*
|
|
* Copyright (C) 2012-2013 Renesas Solutions Corp.
|
|
* Copyright (C) 2012 Takashi Yoshii <takashi.yoshii.ze@renesas.com>
|
|
*
|
|
* 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 <asm/smp_plat.h>
|
|
|
|
#include "common.h"
|
|
#include "platsmp-apmu.h"
|
|
#include "pm-rcar.h"
|
|
#include "rcar-gen2.h"
|
|
#include "r8a7790.h"
|
|
|
|
static const struct rcar_sysc_ch r8a7790_ca15_scu = {
|
|
.chan_offs = 0x180, /* PWRSR5 .. PWRER5 */
|
|
.isr_bit = 12, /* CA15-SCU */
|
|
};
|
|
|
|
static const struct rcar_sysc_ch r8a7790_ca7_scu = {
|
|
.chan_offs = 0x100, /* PWRSR3 .. PWRER3 */
|
|
.isr_bit = 21, /* CA7-SCU */
|
|
};
|
|
|
|
static struct rcar_apmu_config r8a7790_apmu_config[] = {
|
|
{
|
|
.iomem = DEFINE_RES_MEM(0xe6152000, 0x188),
|
|
.cpus = { 0, 1, 2, 3 },
|
|
},
|
|
{
|
|
.iomem = DEFINE_RES_MEM(0xe6151000, 0x188),
|
|
.cpus = { 0x100, 0x0101, 0x102, 0x103 },
|
|
}
|
|
};
|
|
|
|
static void __init r8a7790_smp_prepare_cpus(unsigned int max_cpus)
|
|
{
|
|
/* let APMU code install data related to shmobile_boot_vector */
|
|
shmobile_smp_apmu_prepare_cpus(max_cpus,
|
|
r8a7790_apmu_config,
|
|
ARRAY_SIZE(r8a7790_apmu_config));
|
|
|
|
/* turn on power to SCU */
|
|
rcar_gen2_pm_init();
|
|
rcar_sysc_power_up(&r8a7790_ca15_scu);
|
|
rcar_sysc_power_up(&r8a7790_ca7_scu);
|
|
}
|
|
|
|
struct smp_operations r8a7790_smp_ops __initdata = {
|
|
.smp_prepare_cpus = r8a7790_smp_prepare_cpus,
|
|
.smp_boot_secondary = shmobile_smp_apmu_boot_secondary,
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
.cpu_can_disable = shmobile_smp_cpu_can_disable,
|
|
.cpu_die = shmobile_smp_apmu_cpu_die,
|
|
.cpu_kill = shmobile_smp_apmu_cpu_kill,
|
|
#endif
|
|
};
|