Commit 0ca2894b authored by Magnus Damm's avatar Magnus Damm Committed by Simon Horman
Browse files

ARM: shmobile: Use shared SCU SMP boot code on r8a7779 



Use shared SCU code on r8a7779 for SMP boot.

Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 12eb8474

arch/arm/mach-shmobile/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ obj-$(CONFIG_ARCH_EMEV2) += setup-emev2.o clock-emev2.o 
# SMP objects

# SMP objects

smp-y				:= platsmp.o headsmp.o

smp-y				:= platsmp.o headsmp.o

smp-$(CONFIG_ARCH_SH73A0)	+= smp-sh73a0.o headsmp-scu.o platsmp-scu.o

smp-$(CONFIG_ARCH_SH73A0)	+= smp-sh73a0.o headsmp-scu.o platsmp-scu.o

smp-$(CONFIG_ARCH_R8A7779)	+= smp-r8a7779.o headsmp-scu.o

smp-$(CONFIG_ARCH_R8A7779)	+= smp-r8a7779.o headsmp-scu.o platsmp-scu.o

smp-$(CONFIG_ARCH_EMEV2)	+= smp-emev2.o headsmp-scu.o

smp-$(CONFIG_ARCH_EMEV2)	+= smp-emev2.o headsmp-scu.o





# IRQ objects

# IRQ objects

arch/arm/mach-shmobile/smp-r8a7779.c

+12 −11
Original line number Original line Diff line number Diff line
@@ -84,33 +84,34 @@ static int r8a7779_platform_cpu_kill(unsigned int cpu) 
static int __cpuinit r8a7779_boot_secondary(unsigned int cpu, struct task_struct *idle)

static int __cpuinit r8a7779_boot_secondary(unsigned int cpu, struct task_struct *idle)

{

{

	struct r8a7779_pm_ch *ch = NULL;

	struct r8a7779_pm_ch *ch = NULL;

	int ret = -EIO;

	unsigned int lcpu = cpu_logical_map(cpu);

	int ret;





	cpu = cpu_logical_map(cpu);

	ret = shmobile_smp_scu_boot_secondary(cpu, idle);

	if (ret)

		return ret;





	if (cpu < ARRAY_SIZE(r8a7779_ch_cpu))

	if (lcpu < ARRAY_SIZE(r8a7779_ch_cpu))

		ch = r8a7779_ch_cpu[cpu];

		ch = r8a7779_ch_cpu[lcpu];





	if (ch)

	if (ch)

		ret = r8a7779_sysc_power_up(ch);

		ret = r8a7779_sysc_power_up(ch);

	else

		ret = -EIO;





	return ret;

	return ret;

}

}





static void __init r8a7779_smp_prepare_cpus(unsigned int max_cpus)

static void __init r8a7779_smp_prepare_cpus(unsigned int max_cpus)

{

{



	/* setup r8a7779 specific SCU base */

	shmobile_scu_base = IOMEM(R8A7779_SCU_BASE);

	scu_enable(shmobile_scu_base);



	/* Map the reset vector (in headsmp-scu.S, headsmp.S) */

	/* Map the reset vector (in headsmp-scu.S, headsmp.S) */

	__raw_writel(__pa(shmobile_boot_vector), AVECR);

	__raw_writel(__pa(shmobile_boot_vector), AVECR);

	shmobile_boot_fn = virt_to_phys(shmobile_boot_scu);

	shmobile_boot_fn = virt_to_phys(shmobile_boot_scu);

	shmobile_boot_arg = (unsigned long)shmobile_scu_base;

	shmobile_boot_arg = (unsigned long)shmobile_scu_base;





	/* enable cache coherency on booting CPU */

	/* setup r8a7779 specific SCU bits */

	scu_power_mode(shmobile_scu_base, SCU_PM_NORMAL);

	shmobile_scu_base = IOMEM(R8A7779_SCU_BASE);

	shmobile_smp_scu_prepare_cpus(max_cpus);





	r8a7779_pm_init();

	r8a7779_pm_init();