Merge tag 'renesas-smp-for-v3.12' of... (25475030) · Commits · 戴 / test

arch/arm/mach-shmobile/Makefile

+3 −3

Original line number	Diff line number	Diff line
		@@ -17,9 +17,9 @@ obj-$(CONFIG_ARCH_EMEV2) += setup-emev2.o clock-emev2.o

		# SMP objects
		smp-y := platsmp.o headsmp.o
		smp-$(CONFIG_ARCH_SH73A0) += smp-sh73a0.o headsmp-scu.o
		smp-$(CONFIG_ARCH_R8A7779) += smp-r8a7779.o headsmp-scu.o
		smp-$(CONFIG_ARCH_EMEV2) += smp-emev2.o headsmp-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 platsmp-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/headsmp.S

+49 −0

Original line number	Diff line number	Diff line
		@@ -36,3 +36,52 @@ shmobile_boot_fn:
		.globl shmobile_boot_arg
		shmobile_boot_arg:
		2: .space 4

		/*
		* Per-CPU SMP boot function/argument selection code based on MPIDR
		*/

		ENTRY(shmobile_smp_boot)
		@ r0 = MPIDR_HWID_BITMASK
		mrc p15, 0, r1, c0, c0, 5 @ r1 = MPIDR
		and r0, r1, r0 @ r0 = cpu_logical_map() value
		mov r1, #0 @ r1 = CPU index
		adr r5, 1f @ array of per-cpu mpidr values
		adr r6, 2f @ array of per-cpu functions
		adr r7, 3f @ array of per-cpu arguments

		shmobile_smp_boot_find_mpidr:
		ldr r8, [r5, r1, lsl #2]
		cmp r8, r0
		bne shmobile_smp_boot_next

		ldr r9, [r6, r1, lsl #2]
		cmp r9, #0
		bne shmobile_smp_boot_found

		shmobile_smp_boot_next:
		add r1, r1, #1
		cmp r1, #CONFIG_NR_CPUS
		blo shmobile_smp_boot_find_mpidr

		b shmobile_smp_sleep

		shmobile_smp_boot_found:
		ldr r0, [r7, r1, lsl #2]
		mov pc, r9
		ENDPROC(shmobile_smp_boot)

		ENTRY(shmobile_smp_sleep)
		wfi
		b shmobile_smp_boot
		ENDPROC(shmobile_smp_sleep)

		.globl shmobile_smp_mpidr
		shmobile_smp_mpidr:
		1: .space CONFIG_NR_CPUS * 4
		.globl shmobile_smp_fn
		shmobile_smp_fn:
		2: .space CONFIG_NR_CPUS * 4
		.globl shmobile_smp_arg
		shmobile_smp_arg:
		3: .space CONFIG_NR_CPUS * 4

arch/arm/mach-shmobile/include/mach/common.h

+9 −0

Original line number	Diff line number	Diff line
		@@ -9,7 +9,16 @@ extern void shmobile_setup_console(void);
		extern void shmobile_boot_vector(void);
		extern unsigned long shmobile_boot_fn;
		extern unsigned long shmobile_boot_arg;
		extern void shmobile_smp_boot(void);
		extern void shmobile_smp_sleep(void);
		extern void shmobile_smp_hook(unsigned int cpu, unsigned long fn,
		unsigned long arg);
		extern void shmobile_boot_scu(void);
		extern void shmobile_smp_scu_prepare_cpus(unsigned int max_cpus);
		extern int shmobile_smp_scu_boot_secondary(unsigned int cpu,
		struct task_struct *idle);
		extern void shmobile_smp_scu_cpu_die(unsigned int cpu);
		extern int shmobile_smp_scu_cpu_kill(unsigned int cpu);
		struct clk;
		extern int shmobile_clk_init(void);
		extern void shmobile_handle_irq_intc(struct pt_regs *);

arch/arm/mach-shmobile/platsmp-scu.c

0 → 100644

+81 −0

Original line number	Diff line number	Diff line
		/*
		* SMP support for SoCs with SCU covered by mach-shmobile
		*
		* Copyright (C) 2013 Magnus Damm
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as
		* published by the Free Software Foundation.
		*/
		#include <linux/delay.h>
		#include <linux/init.h>
		#include <linux/io.h>
		#include <linux/smp.h>
		#include <asm/cacheflush.h>
		#include <asm/smp_plat.h>
		#include <asm/smp_scu.h>
		#include <mach/common.h>

		void __init shmobile_smp_scu_prepare_cpus(unsigned int max_cpus)
		{
		/* install boot code shared by all CPUs */
		shmobile_boot_fn = virt_to_phys(shmobile_smp_boot);
		shmobile_boot_arg = MPIDR_HWID_BITMASK;

		/* enable SCU and cache coherency on booting CPU */
		scu_enable(shmobile_scu_base);
		scu_power_mode(shmobile_scu_base, SCU_PM_NORMAL);
		}

		int shmobile_smp_scu_boot_secondary(unsigned int cpu, struct task_struct *idle)
		{
		/* For this particular CPU register SCU boot vector */
		shmobile_smp_hook(cpu, virt_to_phys(shmobile_boot_scu),
		(unsigned long)shmobile_scu_base);
		return 0;
		}

		#ifdef CONFIG_HOTPLUG_CPU
		void shmobile_smp_scu_cpu_die(unsigned int cpu)
		{
		/* For this particular CPU deregister boot vector */
		shmobile_smp_hook(cpu, 0, 0);

		dsb();
		flush_cache_all();

		/* disable cache coherency */
		scu_power_mode(shmobile_scu_base, SCU_PM_POWEROFF);

		/* jump to shared mach-shmobile sleep / reset code */
		shmobile_smp_sleep();
		}

		static int shmobile_smp_scu_psr_core_disabled(int cpu)
		{
		unsigned long mask = SCU_PM_POWEROFF << (cpu * 8);

		if ((__raw_readl(shmobile_scu_base + 8) & mask) == mask)
		return 1;

		return 0;
		}

		int shmobile_smp_scu_cpu_kill(unsigned int cpu)
		{
		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 (shmobile_smp_scu_psr_core_disabled(cpu))
		return 1;

		mdelay(1);
		}

		return 0;
		}
		#endif

arch/arm/mach-shmobile/platsmp.c

+18 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,9 @@
		*/
		#include <linux/init.h>
		#include <linux/smp.h>
		#include <asm/cacheflush.h>
		#include <asm/smp_plat.h>
		#include <mach/common.h>

		void __init shmobile_smp_init_cpus(unsigned int ncores)
		{
		@@ -26,3 +29,18 @@ void __init shmobile_smp_init_cpus(unsigned int ncores)
		for (i = 0; i < ncores; i++)
		set_cpu_possible(i, true);
		}

		extern unsigned long shmobile_smp_fn[];
		extern unsigned long shmobile_smp_arg[];
		extern unsigned long shmobile_smp_mpidr[];

		void shmobile_smp_hook(unsigned int cpu, unsigned long fn, unsigned long arg)
		{
		shmobile_smp_fn[cpu] = 0;
		flush_cache_all();

		shmobile_smp_mpidr[cpu] = cpu_logical_map(cpu);
		shmobile_smp_fn[cpu] = fn;
		shmobile_smp_arg[cpu] = arg;
		flush_cache_all();
		}

Admin message