Since commit c0114709ed ("irqchip: gic: Perform the gic_secondary_init()
call via CPU notifier") it is no longer required nor possible to call
gic_secondary_init() from platform code.
Signed-off-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
		
	
			
		
			
				
	
	
		
			89 lines
		
	
	
	
		
			2.2 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			89 lines
		
	
	
	
		
			2.2 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * linux/arch/arm/mach-vexpress/mcpm_platsmp.c
 | 
						|
 *
 | 
						|
 * Created by:  Nicolas Pitre, November 2012
 | 
						|
 * Copyright:   (C) 2012-2013  Linaro Limited
 | 
						|
 *
 | 
						|
 * 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.
 | 
						|
 *
 | 
						|
 * Code to handle secondary CPU bringup and hotplug for the cluster power API.
 | 
						|
 */
 | 
						|
 | 
						|
#include <linux/init.h>
 | 
						|
#include <linux/smp.h>
 | 
						|
#include <linux/spinlock.h>
 | 
						|
 | 
						|
#include <asm/mcpm.h>
 | 
						|
#include <asm/smp.h>
 | 
						|
#include <asm/smp_plat.h>
 | 
						|
 | 
						|
static void __init simple_smp_init_cpus(void)
 | 
						|
{
 | 
						|
}
 | 
						|
 | 
						|
static int __cpuinit mcpm_boot_secondary(unsigned int cpu, struct task_struct *idle)
 | 
						|
{
 | 
						|
	unsigned int mpidr, pcpu, pcluster, ret;
 | 
						|
	extern void secondary_startup(void);
 | 
						|
 | 
						|
	mpidr = cpu_logical_map(cpu);
 | 
						|
	pcpu = MPIDR_AFFINITY_LEVEL(mpidr, 0);
 | 
						|
	pcluster = MPIDR_AFFINITY_LEVEL(mpidr, 1);
 | 
						|
	pr_debug("%s: logical CPU %d is physical CPU %d cluster %d\n",
 | 
						|
		 __func__, cpu, pcpu, pcluster);
 | 
						|
 | 
						|
	mcpm_set_entry_vector(pcpu, pcluster, NULL);
 | 
						|
	ret = mcpm_cpu_power_up(pcpu, pcluster);
 | 
						|
	if (ret)
 | 
						|
		return ret;
 | 
						|
	mcpm_set_entry_vector(pcpu, pcluster, secondary_startup);
 | 
						|
	arch_send_wakeup_ipi_mask(cpumask_of(cpu));
 | 
						|
	dsb_sev();
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
static void __cpuinit mcpm_secondary_init(unsigned int cpu)
 | 
						|
{
 | 
						|
	mcpm_cpu_powered_up();
 | 
						|
}
 | 
						|
 | 
						|
#ifdef CONFIG_HOTPLUG_CPU
 | 
						|
 | 
						|
static int mcpm_cpu_disable(unsigned int cpu)
 | 
						|
{
 | 
						|
	/*
 | 
						|
	 * We assume all CPUs may be shut down.
 | 
						|
	 * This would be the hook to use for eventual Secure
 | 
						|
	 * OS migration requests as described in the PSCI spec.
 | 
						|
	 */
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
static void mcpm_cpu_die(unsigned int cpu)
 | 
						|
{
 | 
						|
	unsigned int mpidr, pcpu, pcluster;
 | 
						|
	mpidr = read_cpuid_mpidr();
 | 
						|
	pcpu = MPIDR_AFFINITY_LEVEL(mpidr, 0);
 | 
						|
	pcluster = MPIDR_AFFINITY_LEVEL(mpidr, 1);
 | 
						|
	mcpm_set_entry_vector(pcpu, pcluster, NULL);
 | 
						|
	mcpm_cpu_power_down();
 | 
						|
}
 | 
						|
 | 
						|
#endif
 | 
						|
 | 
						|
static struct smp_operations __initdata mcpm_smp_ops = {
 | 
						|
	.smp_init_cpus		= simple_smp_init_cpus,
 | 
						|
	.smp_boot_secondary	= mcpm_boot_secondary,
 | 
						|
	.smp_secondary_init	= mcpm_secondary_init,
 | 
						|
#ifdef CONFIG_HOTPLUG_CPU
 | 
						|
	.cpu_disable		= mcpm_cpu_disable,
 | 
						|
	.cpu_die		= mcpm_cpu_die,
 | 
						|
#endif
 | 
						|
};
 | 
						|
 | 
						|
void __init mcpm_smp_set_ops(void)
 | 
						|
{
 | 
						|
	smp_set_ops(&mcpm_smp_ops);
 | 
						|
}
 |