Commit 05c74a6c authored by Russell King's avatar Russell King
Browse files

ARM: SMP: consolidate the common parts of smp_prepare_cpus() 



There is a certain amount of smp_prepare_cpus() which doesn't belong
in the platform support code - that is, code which is invariant to the
SMP implementation.  Move this code into arch/arm/kernel/smp.c, and
add a platform_ prefix to the original function.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent aec66ba1

arch/arm/include/asm/smp.h

+5 −4
Original line number Diff line number Diff line
@@ -45,10 +45,6 @@ asmlinkage void do_IPI(int ipinr, struct pt_regs *regs); 
 */

extern void smp_init_cpus(void);



/*

 * Move global data into per-processor storage.

 */

extern void smp_store_cpu_info(unsigned int cpuid);



/*

 * Raise an IPI cross call on CPUs in callmap.
@@ -72,6 +68,11 @@ asmlinkage void secondary_start_kernel(void); 
 */

extern void platform_secondary_init(unsigned int cpu);



/*

 * Initialize cpu_possible map, and enable coherency

 */

extern void platform_smp_prepare_cpus(unsigned int);



/*

 * Initial data for bringing up a secondary CPU.

 */

arch/arm/kernel/smp.c

+38 −11
Original line number Diff line number Diff line
@@ -281,6 +281,17 @@ void __ref cpu_die(void) 
}

#endif /* CONFIG_HOTPLUG_CPU */



/*

 * Called by both boot and secondaries to move global data into

 * per-processor storage.

 */

static void __cpuinit smp_store_cpu_info(unsigned int cpuid)

{

	struct cpuinfo_arm *cpu_info = &per_cpu(cpu_data, cpuid);



	cpu_info->loops_per_jiffy = loops_per_jiffy;

}



/*

 * This is the secondary CPU boot entry.  We're using this CPUs

 * idle thread stack, but a set of temporary page tables.
@@ -339,17 +350,6 @@ asmlinkage void __cpuinit secondary_start_kernel(void) 
	cpu_idle();

}



/*

 * Called by both boot and secondaries to move global data into

 * per-processor storage.

 */

void __cpuinit smp_store_cpu_info(unsigned int cpuid)

{

	struct cpuinfo_arm *cpu_info = &per_cpu(cpu_data, cpuid);



	cpu_info->loops_per_jiffy = loops_per_jiffy;

}



void __init smp_cpus_done(unsigned int max_cpus)

{

	int cpu;
@@ -372,6 +372,33 @@ void __init smp_prepare_boot_cpu(void) 
	per_cpu(cpu_data, cpu).idle = current;

}



void __init smp_prepare_cpus(unsigned int max_cpus)

{

	unsigned int ncores = num_possible_cpus();



	smp_store_cpu_info(smp_processor_id());



	/*

	 * are we trying to boot more cores than exist?

	 */

	if (max_cpus > ncores)

		max_cpus = ncores;



	if (max_cpus > 1) {

		/*

		 * Enable the local timer or broadcast device for the

		 * boot CPU, but only if we have more than one CPU.

		 */

		percpu_timer_setup();



		/*

		 * Initialise the SCU if there are more than one CPU

		 * and let them know where to start.

		 */

		platform_smp_prepare_cpus(max_cpus);

	}

}



void arch_send_call_function_ipi_mask(const struct cpumask *mask)

{

	smp_cross_call(mask, IPI_CALL_FUNC);

arch/arm/mach-omap2/omap-smp.c

+7 −26
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <linux/io.h>



#include <asm/cacheflush.h>

#include <asm/localtimer.h>

#include <asm/smp_scu.h>

#include <mach/hardware.h>

#include <mach/omap4-common.h>
@@ -123,20 +122,10 @@ void __init smp_init_cpus(void) 
		set_cpu_possible(i, true);

}



void __init smp_prepare_cpus(unsigned int max_cpus)

void __init platform_smp_prepare_cpus(unsigned int max_cpus)

{

	unsigned int ncores = num_possible_cpus();

	unsigned int cpu = smp_processor_id();

	int i;



	smp_store_cpu_info(cpu);



	/*

	 * are we trying to boot more cores than exist?

	 */

	if (max_cpus > ncores)

		max_cpus = ncores;



	/*

	 * Initialise the present map, which describes the set of CPUs

	 * actually populated at the present time.
@@ -144,13 +133,6 @@ void __init smp_prepare_cpus(unsigned int max_cpus) 
	for (i = 0; i < max_cpus; i++)

		set_cpu_present(i, true);



	if (max_cpus > 1) {

		/*

		 * Enable the local timer or broadcast device for the

		 * boot CPU, but only if we have more than one CPU.

		 */

		percpu_timer_setup();



	/*

	 * Initialise the SCU and wake up the secondary core using

	 * wakeup_secondary().
@@ -158,4 +140,3 @@ void __init smp_prepare_cpus(unsigned int max_cpus) 
	scu_enable(scu_base);

	wakeup_secondary();

}
 
}

arch/arm/mach-realview/platsmp.c

+11 −30
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <asm/cacheflush.h>

#include <mach/hardware.h>

#include <asm/mach-types.h>

#include <asm/localtimer.h>

#include <asm/unified.h>



#include <mach/board-eb.h>
@@ -147,20 +146,10 @@ void __init smp_init_cpus(void) 
		set_cpu_possible(i, true);

}



void __init smp_prepare_cpus(unsigned int max_cpus)

void __init platform_smp_prepare_cpus(unsigned int max_cpus)

{

	unsigned int ncores = num_possible_cpus();

	unsigned int cpu = smp_processor_id();

	int i;



	smp_store_cpu_info(cpu);



	/*

	 * are we trying to boot more cores than exist?

	 */

	if (max_cpus > ncores)

		max_cpus = ncores;



	/*

	 * Initialise the present map, which describes the set of CPUs

	 * actually populated at the present time.
@@ -168,13 +157,6 @@ void __init smp_prepare_cpus(unsigned int max_cpus) 
	for (i = 0; i < max_cpus; i++)

		set_cpu_present(i, true);



	if (max_cpus > 1) {

		/*

		 * Enable the local timer or broadcast device for the

		 * boot CPU, but only if we have more than one CPU.

		 */

		percpu_timer_setup();



	scu_enable(scu_base_addr());



	/*
@@ -186,4 +168,3 @@ void __init smp_prepare_cpus(unsigned int max_cpus) 
	__raw_writel(BSYM(virt_to_phys(realview_secondary_startup)),

		     __io_address(REALVIEW_SYS_FLAGSSET));

}
 
}

arch/arm/mach-s5pv310/platsmp.c

+7 −28
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <linux/io.h>



#include <asm/cacheflush.h>

#include <asm/localtimer.h>

#include <asm/smp_scu.h>

#include <asm/unified.h>
@@ -142,18 +141,10 @@ void __init smp_init_cpus(void) 
		set_cpu_possible(i, true);

}



void __init smp_prepare_cpus(unsigned int max_cpus)

void __init platform_smp_prepare_cpus(unsigned int max_cpus)

{

	unsigned int ncores = num_possible_cpus();

	unsigned int cpu = smp_processor_id();

	int i;



	smp_store_cpu_info(cpu);



	/* are we trying to boot more cores than exist? */

	if (max_cpus > ncores)

		max_cpus = ncores;



	/*

	 * Initialise the present map, which describes the set of CPUs

	 * actually populated at the present time.
@@ -161,17 +152,6 @@ void __init smp_prepare_cpus(unsigned int max_cpus) 
	for (i = 0; i < max_cpus; i++)

		set_cpu_present(i, true);



	/*

	 * Initialise the SCU if there are more than one CPU and let

	 * them know where to start.

	 */

	if (max_cpus > 1) {

		/*

		 * Enable the local timer or broadcast device for the

		 * boot CPU, but only if we have more than one CPU.

		 */

		percpu_timer_setup();



	scu_enable(scu_base_addr());



	/*
@@ -182,4 +162,3 @@ void __init smp_prepare_cpus(unsigned int max_cpus) 
	 */

	__raw_writel(BSYM(virt_to_phys(s5pv310_secondary_startup)), S5P_VA_SYSRAM);

}
 
}

CRA Git | Maintained and supported by SUSTech CRA and CCSE