Commit 3366e358 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Move platform smp ops in to their own structure. 



This cribs the MIPS plat_smp_ops approach for wrapping up the platform
ops. This will allow for mixing and matching different ops on the same
platform in the future.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 4a6feab0

arch/sh/boards/board-urquell.c

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <cpu/sh7786.h>

#include <asm/heartbeat.h>

#include <asm/sizes.h>

#include <asm/smp-ops.h>



/*

 * bit  1234 5678
@@ -203,6 +204,8 @@ static void __init urquell_setup(char **cmdline_p) 
	printk(KERN_INFO "Renesas Technology Corp. Urquell support.\n");



	pm_power_off = urquell_power_off;



	register_smp_ops(&shx3_smp_ops);

}



/*

arch/sh/boards/mach-sdk7786/setup.c

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <asm/heartbeat.h>

#include <asm/sizes.h>

#include <asm/reboot.h>

#include <asm/smp-ops.h>



static struct resource heartbeat_resource = {

	.start		= 0x07fff8b0,
@@ -189,6 +190,8 @@ static void __init sdk7786_setup(char **cmdline_p) 


	machine_ops.restart = sdk7786_restart;

	pm_power_off = sdk7786_power_off;



	register_smp_ops(&shx3_smp_ops);

}



/*

arch/sh/boards/mach-x3proto/setup.c

+7 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/usb/r8a66597.h>

#include <linux/usb/m66592.h>

#include <asm/ilsel.h>

#include <asm/smp-ops.h>



static struct resource heartbeat_resources[] = {

	[0] = {
@@ -152,7 +153,13 @@ static void __init x3proto_init_irq(void) 
	__raw_writel(__raw_readl(0xfe410000) | (1 << 21), 0xfe410000);

}



static void __init x3proto_setup(char **cmdline_p)

{

	register_smp_ops(&shx3_smp_ops);

}



static struct sh_machine_vector mv_x3proto __initmv = {

	.mv_name		= "x3proto",

	.mv_setup		= x3proto_setup,

	.mv_init_irq		= x3proto_init_irq,

};

arch/sh/include/asm/smp-ops.h

0 → 100644
+39 −0
Original line number Diff line number Diff line 
#ifndef __ASM_SH_SMP_OPS_H

#define __ASM_SH_SMP_OPS_H



struct plat_smp_ops {

	void (*smp_setup)(void);

	unsigned int (*smp_processor_id)(void);

	void (*prepare_cpus)(unsigned int max_cpus);

	void (*start_cpu)(unsigned int cpu, unsigned long entry_point);

	void (*send_ipi)(unsigned int cpu, unsigned int message);

};



extern struct plat_smp_ops shx3_smp_ops;



#ifdef CONFIG_SMP



static inline void plat_smp_setup(void)

{

	extern struct plat_smp_ops *mp_ops;	/* private */



	BUG_ON(!mp_ops);

	mp_ops->smp_setup();

}



extern void register_smp_ops(struct plat_smp_ops *ops);



#else



static inline void plat_smp_setup(void)

{

	/* UP, nothing to do ... */

}



static inline void register_smp_ops(struct plat_smp_ops *ops)

{

}



#endif /* CONFIG_SMP */



#endif /* __ASM_SH_SMP_OPS_H */

arch/sh/include/asm/smp.h

+11 −7
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


#include <linux/bitops.h>

#include <linux/cpumask.h>

#include <asm/smp-ops.h>



#ifdef CONFIG_SMP
@@ -11,7 +12,6 @@ 
#include <asm/current.h>



#define raw_smp_processor_id()	(current_thread_info()->cpu)

#define hard_smp_processor_id()	plat_smp_processor_id()



/* Map from cpu id to sequential logical cpu number. */

extern int __cpu_number_map[NR_CPUS];
@@ -36,15 +36,19 @@ void smp_timer_broadcast(const struct cpumask *mask); 
void local_timer_interrupt(void);

void local_timer_setup(unsigned int cpu);



void plat_smp_setup(void);

void plat_prepare_cpus(unsigned int max_cpus);

int plat_smp_processor_id(void);

void plat_start_cpu(unsigned int cpu, unsigned long entry_point);

void plat_send_ipi(unsigned int cpu, unsigned int message);



void arch_send_call_function_single_ipi(int cpu);

extern void arch_send_call_function_ipi_mask(const struct cpumask *mask);



static inline int hard_smp_processor_id(void)

{

	extern struct plat_smp_ops *mp_ops;	/* private */



	if (!mp_ops)

		return 0;	/* boot CPU */



	return mp_ops->smp_processor_id();

}



#else



#define hard_smp_processor_id()	(0)