Merge branch 'rmobile/core' into rmobile/marzen (ea75b9c1) · Commits · e / devices / android_kernel_teracube_mt6765

arch/arm/mach-shmobile/headsmp.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		#include <linux/init.h>
		#include <asm/memory.h>

		__INIT
		__CPUINIT

		/*
		* Reset vector for secondary CPUs.

+31 −1

Original line number	Diff line number	Diff line
		@@ -12,14 +12,43 @@
		#include <linux/kernel.h>
		#include <linux/errno.h>
		#include <linux/smp.h>
		#include <linux/cpumask.h>
		#include <linux/delay.h>
		#include <mach/common.h>
		#include <asm/cacheflush.h>

		static cpumask_t dead_cpus;

		int platform_cpu_kill(unsigned int cpu)
		{
		return 1;
		int k;

		/* this function is running on another CPU than the offline target,
		* here we need wait for shutdown code in platform_cpu_die() to
		* finish before asking SoC-specific code to power off the CPU core.
		*/
		for (k = 0; k < 1000; k++) {
		if (cpumask_test_cpu(cpu, &dead_cpus))
		return shmobile_platform_cpu_kill(cpu);

		mdelay(1);
		}

		return 0;
		}

		void platform_cpu_die(unsigned int cpu)
		{
		/* hardware shutdown code running on the CPU that is being offlined */
		flush_cache_all();
		dsb();

		/* notify platform_cpu_kill() that hardware shutdown is finished */
		cpumask_set_cpu(cpu, &dead_cpus);

		/* wait for SoC code in platform_cpu_kill() to shut off CPU core
		* power. CPU bring up starts from the reset vector.
		*/
		while (1) {
		/*
		* here's the WFI
		@@ -33,6 +62,7 @@ void platform_cpu_die(unsigned int cpu)

		int platform_cpu_disable(unsigned int cpu)
		{
		cpumask_clear_cpu(cpu, &dead_cpus);
		/*
		* we don't allow CPU 0 to be shutdown (it is still too special
		* e.g. clock tick interrupts)

+1 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@
		extern struct sys_timer shmobile_timer;
		extern void shmobile_setup_console(void);
		extern void shmobile_secondary_vector(void);
		extern int shmobile_platform_cpu_kill(unsigned int cpu);
		struct clk;
		extern int clk_init(void);
		extern void shmobile_handle_irq_intc(struct pt_regs *);

+5 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,11 @@ static void __init shmobile_smp_prepare_cpus(void)
		sh73a0_smp_prepare_cpus();
		}

		int shmobile_platform_cpu_kill(unsigned int cpu)
		{
		return 1;
		}

		void __cpuinit platform_secondary_init(unsigned int cpu)
		{
		trace_hardirqs_off();