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

Commit 40937f74 authored by Simon Horman's avatar Simon Horman
Browse files

Revert "ARM: shmobile: emev2: Replace modify_scu_cpu_psr with scu_power_mode" 



This reverts commit 865d90f8.

The code changes the flags of the wrong cpus - which breaks the whole
bootup of secondary CPUs.

Cc: Bastian Hecht <hechtb@gmail.com>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent d5b68908

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

+20 −2
Original line number Diff line number Diff line
@@ -32,8 +32,24 @@ 


#define EMEV2_SCU_BASE 0x1e000000



static DEFINE_SPINLOCK(scu_lock);

static void __iomem *scu_base;



static void modify_scu_cpu_psr(unsigned long set, unsigned long clr)

{

	unsigned long tmp;



	/* we assume this code is running on a different cpu

	 * than the one that is changing coherency setting */

	spin_lock(&scu_lock);

	tmp = readl(scu_base + 8);

	tmp &= ~clr;

	tmp |= set;

	writel(tmp, scu_base + 8);

	spin_unlock(&scu_lock);



}



static unsigned int __init emev2_get_core_count(void)

{

	if (!scu_base) {
@@ -79,7 +95,7 @@ static int __cpuinit emev2_boot_secondary(unsigned int cpu, struct task_struct * 
	cpu = cpu_logical_map(cpu);



	/* enable cache coherency */

	scu_power_mode(scu_base, 0);

	modify_scu_cpu_psr(0, 3 << (cpu * 8));



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

	emev2_set_boot_vector(__pa(shmobile_secondary_vector));
@@ -90,10 +106,12 @@ static int __cpuinit emev2_boot_secondary(unsigned int cpu, struct task_struct * 


static void __init emev2_smp_prepare_cpus(unsigned int max_cpus)

{

	int cpu = cpu_logical_map(0);



	scu_enable(scu_base);



	/* enable cache coherency on CPU0 */

	scu_power_mode(scu_base, 0);

	modify_scu_cpu_psr(0, 3 << (cpu * 8));

}



static void __init emev2_smp_init_cpus(void)