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

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

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



Use shared SCU code on emev2 for SMP boot.

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

arch/arm/mach-shmobile/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ obj-$(CONFIG_ARCH_EMEV2) += setup-emev2.o clock-emev2.o 
smp-y				:= platsmp.o headsmp.o

smp-$(CONFIG_ARCH_SH73A0)	+= smp-sh73a0.o headsmp-scu.o platsmp-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 platsmp-scu.o



# IRQ objects

obj-$(CONFIG_ARCH_SH7372)	+= entry-intc.o

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

+10 −9
Original line number Diff line number Diff line
@@ -34,6 +34,12 @@ 


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

{

	int ret;



	ret = shmobile_smp_scu_boot_secondary(cpu, idle);

	if (ret)

		return ret;



	arch_send_wakeup_ipi_mask(cpumask_of(cpu_logical_map(cpu)));

	return 0;

}
@@ -42,21 +48,16 @@ static void __init emev2_smp_prepare_cpus(unsigned int max_cpus) 
{

	void __iomem *smu;



	/* setup EMEV2 specific SCU base, enable */

	shmobile_scu_base = ioremap(EMEV2_SCU_BASE, PAGE_SIZE);

	scu_enable(shmobile_scu_base);



	/* Tell ROM loader about our vector (in headsmp-scu.S, headsmp.S) */

	/* Tell ROM loader about our vector (in headsmp.S) */

	smu = ioremap(EMEV2_SMU_BASE, PAGE_SIZE);

	if (smu) {

		iowrite32(__pa(shmobile_boot_vector), smu + SMU_GENERAL_REG0);

		iounmap(smu);

	}

	shmobile_boot_fn = virt_to_phys(shmobile_boot_scu);

	shmobile_boot_arg = (unsigned long)shmobile_scu_base;



	/* enable cache coherency on booting CPU */

	scu_power_mode(shmobile_scu_base, SCU_PM_NORMAL);

	/* setup EMEV2 specific SCU bits */

	shmobile_scu_base = ioremap(EMEV2_SCU_BASE, PAGE_SIZE);

	shmobile_smp_scu_prepare_cpus(max_cpus);

}



struct smp_operations emev2_smp_ops __initdata = {