Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45f5984a authored by Gregory CLEMENT's avatar Gregory CLEMENT
Browse files

arm: mvebu: Add SMP support for Armada XP 



This enables SMP support on the Armada XP processor. It adds the
mandatory functions to support SMP such as: the SMP initialization
functions in platsmp.c, the secondary CPU entry point in headsmp.S and
the CPU hotplug initial support in hotplug.c.

Signed-off-by: default avatarYehuda Yitschak <yehuday@marvell.com>
Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
Reviewed-by: default avatarWill Deacon <will.deacon@arm.com>
parent de490193

arch/arm/configs/mvebu_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ CONFIG_ARCH_MVEBU=y 
CONFIG_MACH_ARMADA_370=y

CONFIG_MACH_ARMADA_XP=y

# CONFIG_CACHE_L2X0 is not set

# CONFIG_SWP_EMULATE is not set

CONFIG_SMP=y

# CONFIG_LOCAL_TIMERS is not set

CONFIG_AEABI=y

CONFIG_HIGHMEM=y

# CONFIG_COMPACTION is not set

arch/arm/mach-mvebu/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ menu "Marvell SOC with device tree" 
config MACH_ARMADA_370_XP

	bool

	select ARMADA_370_XP_TIMER

	select HAVE_SMP

	select CPU_PJ4B



config MACH_ARMADA_370

arch/arm/mach-mvebu/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -3,3 +3,5 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \ 


obj-y += system-controller.o

obj-$(CONFIG_MACH_ARMADA_370_XP) += armada-370-xp.o irq-armada-370-xp.o addr-map.o coherency.o coherency_ll.o pmsu.o

obj-$(CONFIG_SMP)                += platsmp.o headsmp.o

obj-$(CONFIG_HOTPLUG_CPU)        += hotplug.o

arch/arm/mach-mvebu/armada-370-xp.c

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <asm/mach/time.h>

#include "armada-370-xp.h"

#include "common.h"

#include "coherency.h"



static struct map_desc armada_370_xp_io_desc[] __initdata = {

	{
@@ -51,6 +52,7 @@ struct sys_timer armada_370_xp_timer = { 
static void __init armada_370_xp_dt_init(void)

{

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

	coherency_init();

}



static const char * const armada_370_xp_dt_board_dt_compat[] = {
@@ -60,6 +62,7 @@ static const char * const armada_370_xp_dt_board_dt_compat[] = { 
};



DT_MACHINE_START(ARMADA_XP_DT, "Marvell Aramada 370/XP (Device Tree)")

	.smp		= smp_ops(armada_xp_smp_ops),

	.init_machine	= armada_370_xp_dt_init,

	.map_io		= armada_370_xp_map_io,

	.init_irq	= armada_370_xp_init_irq,

arch/arm/mach-mvebu/common.h

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ void mvebu_restart(char mode, const char *cmd); 
void armada_370_xp_init_irq(void);

void armada_370_xp_handle_irq(struct pt_regs *regs);



void armada_xp_cpu_die(unsigned int cpu);

int armada_370_xp_coherency_init(void);

int armada_370_xp_pmsu_init(void);

void armada_xp_secondary_startup(void);

extern struct smp_operations armada_xp_smp_ops;

#endif