Berlin SoC changes for v3.17
- SMP support for BG2 and BG2Q -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJTsWd4AAoJEN2kpao7fSL4Uq8P/2cRieGwUc7KBKIeK9pGIOrf 9rLXyK57siZIgdBCTR0/EitNs+SuHNMy9NEYwVc0EasnarJW70Gy1Iq+F3WlaiVi OZrXqdl//pjGpmzAUujZiacsbg75AAvMKudqCLKeVK0CLvLAviRtHhtOE2878ase YGDEcFqdYqE4cktX6wOnF0MWzJa+s4V/ekh4450P+1XObR+Qluc4S2Q2U7BVfIN3 jSNtyYO1QV5dTwuCYlDA+t0dyxU1ZF7HVHvEZX7nAQQhmS0YKRJP3OdhqTRZCAj4 H0/5nJP298zbqioZ2ilGYz5o17Dn+gNL6+RDiK/rvWxeeUU7z3ZoYEOV1ddwBAxw cMto/v5gILRfQ8aROOQ6++1J0tutcMIvAdnTZ9GHfID1oGbBb9h8BD37+XB5teFX 0EwFzyZ1PPeznK4Ty803t+x5GDaz5wqe4KQpAfqNAXFwUfdpM7Tb+sFE1NDHCqmS uP7J+0yCMQQy2WkUKin3vOV/+2RyFs11QUT8onh5uuiRkG+1IPEFyA3BQjgA+H5J WZqhM923Wqx+9Y/oUK9zOP8MeJpCu5n4Q+f1FQX0Nx++HJZMTUaUIClasf36INo0 EyMqTrF8WrLaUCSiuu6/OsrMBcryFOZH+df5qMmCxVDd6Ztizo3F8rSU7fzXvRcz lVHpsWJnNYiYCN18h7T4 =iBym -----END PGP SIGNATURE----- Merge tag 'berlin-soc-3.17-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/soc Merge "Berlin SoC changes for v3.17" from Sebastian Hesselbarth: - SMP support for BG2 and BG2Q * tag 'berlin-soc-3.17-1' of git://git.infradead.org/users/hesselba/linux-berlin: ARM: berlin: add SMP support Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
commit
3ae22f4d94
@ -13,7 +13,9 @@ config MACH_BERLIN_BG2
|
||||
bool "Marvell Armada 1500 (BG2)"
|
||||
select CACHE_L2X0
|
||||
select CPU_PJ4B
|
||||
select HAVE_ARM_SCU if SMP
|
||||
select HAVE_ARM_TWD if SMP
|
||||
select HAVE_SMP
|
||||
select PINCTRL_BERLIN_BG2
|
||||
|
||||
config MACH_BERLIN_BG2CD
|
||||
@ -25,6 +27,7 @@ config MACH_BERLIN_BG2CD
|
||||
config MACH_BERLIN_BG2Q
|
||||
bool "Marvell Armada 1500 Pro (BG2-Q)"
|
||||
select CACHE_L2X0
|
||||
select HAVE_ARM_SCU if SMP
|
||||
select HAVE_ARM_TWD if SMP
|
||||
select PINCTRL_BERLIN_BG2Q
|
||||
|
||||
|
||||
@ -1 +1,2 @@
|
||||
obj-y += berlin.o
|
||||
obj-y += berlin.o
|
||||
obj-$(CONFIG_SMP) += headsmp.o platsmp.o
|
||||
|
||||
30
arch/arm/mach-berlin/headsmp.S
Normal file
30
arch/arm/mach-berlin/headsmp.S
Normal file
@ -0,0 +1,30 @@
|
||||
/*
|
||||
* Copyright (C) 2014 Marvell Technology Group Ltd.
|
||||
*
|
||||
* Antoine Ténart <antoine.tenart@free-electrons.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*/
|
||||
|
||||
#include <linux/linkage.h>
|
||||
#include <linux/init.h>
|
||||
#include <asm/assembler.h>
|
||||
|
||||
ENTRY(berlin_secondary_startup)
|
||||
ARM_BE8(setend be)
|
||||
bl v7_invalidate_l1
|
||||
b secondary_startup
|
||||
ENDPROC(berlin_secondary_startup)
|
||||
|
||||
/*
|
||||
* If the following instruction is set in the reset exception vector, CPUs
|
||||
* will fetch the value of the software reset address vector when being
|
||||
* reset.
|
||||
*/
|
||||
.global boot_inst
|
||||
boot_inst:
|
||||
ldr pc, [pc, #140]
|
||||
|
||||
.align
|
||||
99
arch/arm/mach-berlin/platsmp.c
Normal file
99
arch/arm/mach-berlin/platsmp.c
Normal file
@ -0,0 +1,99 @@
|
||||
/*
|
||||
* Copyright (C) 2014 Marvell Technology Group Ltd.
|
||||
*
|
||||
* Antoine Ténart <antoine.tenart@free-electrons.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*/
|
||||
|
||||
#include <linux/io.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_address.h>
|
||||
|
||||
#include <asm/cacheflush.h>
|
||||
#include <asm/smp_plat.h>
|
||||
#include <asm/smp_scu.h>
|
||||
|
||||
#define CPU_RESET 0x00
|
||||
|
||||
#define RESET_VECT 0x00
|
||||
#define SW_RESET_ADDR 0x94
|
||||
|
||||
extern void berlin_secondary_startup(void);
|
||||
extern u32 boot_inst;
|
||||
|
||||
static void __iomem *cpu_ctrl;
|
||||
|
||||
static inline void berlin_perform_reset_cpu(unsigned int cpu)
|
||||
{
|
||||
u32 val;
|
||||
|
||||
val = readl(cpu_ctrl + CPU_RESET);
|
||||
val |= BIT(cpu_logical_map(cpu));
|
||||
writel(val, cpu_ctrl + CPU_RESET);
|
||||
}
|
||||
|
||||
static int berlin_boot_secondary(unsigned int cpu, struct task_struct *idle)
|
||||
{
|
||||
if (!cpu_ctrl)
|
||||
return -EFAULT;
|
||||
|
||||
/*
|
||||
* Reset the CPU, making it to execute the instruction in the reset
|
||||
* exception vector.
|
||||
*/
|
||||
berlin_perform_reset_cpu(cpu);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void __init berlin_smp_prepare_cpus(unsigned int max_cpus)
|
||||
{
|
||||
struct device_node *np;
|
||||
void __iomem *scu_base;
|
||||
void __iomem *vectors_base;
|
||||
|
||||
np = of_find_compatible_node(NULL, NULL, "arm,cortex-a9-scu");
|
||||
scu_base = of_iomap(np, 0);
|
||||
of_node_put(np);
|
||||
if (!scu_base)
|
||||
return;
|
||||
|
||||
np = of_find_compatible_node(NULL, NULL, "marvell,berlin-cpu-ctrl");
|
||||
cpu_ctrl = of_iomap(np, 0);
|
||||
of_node_put(np);
|
||||
if (!cpu_ctrl)
|
||||
goto unmap_scu;
|
||||
|
||||
vectors_base = ioremap(CONFIG_VECTORS_BASE, SZ_32K);
|
||||
if (!vectors_base)
|
||||
goto unmap_scu;
|
||||
|
||||
scu_enable(scu_base);
|
||||
flush_cache_all();
|
||||
|
||||
/*
|
||||
* Write the first instruction the CPU will execute after being reset
|
||||
* in the reset exception vector.
|
||||
*/
|
||||
writel(boot_inst, vectors_base + RESET_VECT);
|
||||
|
||||
/*
|
||||
* Write the secondary startup address into the SW reset address
|
||||
* vector. This is used by boot_inst.
|
||||
*/
|
||||
writel(virt_to_phys(berlin_secondary_startup), vectors_base + SW_RESET_ADDR);
|
||||
|
||||
iounmap(vectors_base);
|
||||
unmap_scu:
|
||||
iounmap(scu_base);
|
||||
}
|
||||
|
||||
static struct smp_operations berlin_smp_ops __initdata = {
|
||||
.smp_prepare_cpus = berlin_smp_prepare_cpus,
|
||||
.smp_boot_secondary = berlin_boot_secondary,
|
||||
};
|
||||
CPU_METHOD_OF_DECLARE(berlin_smp, "marvell,berlin-smp", &berlin_smp_ops);
|
||||
Loading…
Reference in New Issue
Block a user