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: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Родитель
4a6feab0ee
Коммит
3366e3585f
|
@ -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);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -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,
|
||||
};
|
||||
|
|
|
@ -0,0 +1,39 @@
|
|||
#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 */
|
|
@ -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)
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* SH-X3 SMP
|
||||
*
|
||||
* Copyright (C) 2007 - 2008 Paul Mundt
|
||||
* Copyright (C) 2007 - 2010 Paul Mundt
|
||||
* Copyright (C) 2007 Magnus Damm
|
||||
*
|
||||
* This file is subject to the terms and conditions of the GNU General Public
|
||||
|
@ -37,7 +37,7 @@ static irqreturn_t ipi_interrupt_handler(int irq, void *arg)
|
|||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
void __init plat_smp_setup(void)
|
||||
static void shx3_smp_setup(void)
|
||||
{
|
||||
unsigned int cpu = 0;
|
||||
int i, num;
|
||||
|
@ -63,7 +63,7 @@ void __init plat_smp_setup(void)
|
|||
printk(KERN_INFO "Detected %i available secondary CPU(s)\n", num);
|
||||
}
|
||||
|
||||
void __init plat_prepare_cpus(unsigned int max_cpus)
|
||||
static void shx3_prepare_cpus(unsigned int max_cpus)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
@ -76,7 +76,7 @@ void __init plat_prepare_cpus(unsigned int max_cpus)
|
|||
IRQF_DISABLED | IRQF_PERCPU, "IPI", (void *)(long)i);
|
||||
}
|
||||
|
||||
void plat_start_cpu(unsigned int cpu, unsigned long entry_point)
|
||||
static void shx3_start_cpu(unsigned int cpu, unsigned long entry_point)
|
||||
{
|
||||
if (__in_29bit_mode())
|
||||
__raw_writel(entry_point, RESET_REG(cpu));
|
||||
|
@ -93,12 +93,12 @@ void plat_start_cpu(unsigned int cpu, unsigned long entry_point)
|
|||
__raw_writel(STBCR_RESET | STBCR_LTSLP, STBCR_REG(cpu));
|
||||
}
|
||||
|
||||
int plat_smp_processor_id(void)
|
||||
static unsigned int shx3_smp_processor_id(void)
|
||||
{
|
||||
return __raw_readl(0xff000048); /* CPIDR */
|
||||
}
|
||||
|
||||
void plat_send_ipi(unsigned int cpu, unsigned int message)
|
||||
static void shx3_send_ipi(unsigned int cpu, unsigned int message)
|
||||
{
|
||||
unsigned long addr = 0xfe410070 + (cpu * 4);
|
||||
|
||||
|
@ -106,3 +106,11 @@ void plat_send_ipi(unsigned int cpu, unsigned int message)
|
|||
|
||||
__raw_writel(1 << (message << 2), addr); /* C0INTICI..CnINTICI */
|
||||
}
|
||||
|
||||
struct plat_smp_ops shx3_smp_ops = {
|
||||
.smp_setup = shx3_smp_setup,
|
||||
.prepare_cpus = shx3_prepare_cpus,
|
||||
.start_cpu = shx3_start_cpu,
|
||||
.smp_processor_id = shx3_smp_processor_id,
|
||||
.send_ipi = shx3_send_ipi,
|
||||
};
|
||||
|
|
|
@ -44,7 +44,7 @@ static void dummy_timer_set_mode(enum clock_event_mode mode,
|
|||
{
|
||||
}
|
||||
|
||||
void __cpuinit local_timer_setup(unsigned int cpu)
|
||||
void local_timer_setup(unsigned int cpu)
|
||||
{
|
||||
struct clock_event_device *clk = &per_cpu(local_clockevent, cpu);
|
||||
|
||||
|
|
|
@ -459,9 +459,7 @@ void __init setup_arch(char **cmdline_p)
|
|||
if (likely(sh_mv.mv_setup))
|
||||
sh_mv.mv_setup(cmdline_p);
|
||||
|
||||
#ifdef CONFIG_SMP
|
||||
plat_smp_setup();
|
||||
#endif
|
||||
}
|
||||
|
||||
/* processor boot mode configuration */
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
*
|
||||
* SMP support for the SuperH processors.
|
||||
*
|
||||
* Copyright (C) 2002 - 2008 Paul Mundt
|
||||
* Copyright (C) 2002 - 2010 Paul Mundt
|
||||
* Copyright (C) 2006 - 2007 Akio Idehara
|
||||
*
|
||||
* This file is subject to the terms and conditions of the GNU General Public
|
||||
|
@ -31,6 +31,16 @@
|
|||
int __cpu_number_map[NR_CPUS]; /* Map physical to logical */
|
||||
int __cpu_logical_map[NR_CPUS]; /* Map logical to physical */
|
||||
|
||||
struct plat_smp_ops *mp_ops = NULL;
|
||||
|
||||
void __cpuinit register_smp_ops(struct plat_smp_ops *ops)
|
||||
{
|
||||
if (mp_ops)
|
||||
printk(KERN_WARNING "Overriding previously set SMP ops\n");
|
||||
|
||||
mp_ops = ops;
|
||||
}
|
||||
|
||||
static inline void __init smp_store_cpu_info(unsigned int cpu)
|
||||
{
|
||||
struct sh_cpuinfo *c = cpu_data + cpu;
|
||||
|
@ -46,7 +56,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
|
|||
|
||||
init_new_context(current, &init_mm);
|
||||
current_thread_info()->cpu = cpu;
|
||||
plat_prepare_cpus(max_cpus);
|
||||
mp_ops->prepare_cpus(max_cpus);
|
||||
|
||||
#ifndef CONFIG_HOTPLUG_CPU
|
||||
init_cpu_present(&cpu_possible_map);
|
||||
|
@ -127,7 +137,7 @@ int __cpuinit __cpu_up(unsigned int cpu)
|
|||
(unsigned long)&stack_start + sizeof(stack_start));
|
||||
wmb();
|
||||
|
||||
plat_start_cpu(cpu, (unsigned long)_stext);
|
||||
mp_ops->start_cpu(cpu, (unsigned long)_stext);
|
||||
|
||||
timeout = jiffies + HZ;
|
||||
while (time_before(jiffies, timeout)) {
|
||||
|
@ -159,7 +169,7 @@ void __init smp_cpus_done(unsigned int max_cpus)
|
|||
|
||||
void smp_send_reschedule(int cpu)
|
||||
{
|
||||
plat_send_ipi(cpu, SMP_MSG_RESCHEDULE);
|
||||
mp_ops->send_ipi(cpu, SMP_MSG_RESCHEDULE);
|
||||
}
|
||||
|
||||
void smp_send_stop(void)
|
||||
|
@ -172,12 +182,12 @@ void arch_send_call_function_ipi_mask(const struct cpumask *mask)
|
|||
int cpu;
|
||||
|
||||
for_each_cpu(cpu, mask)
|
||||
plat_send_ipi(cpu, SMP_MSG_FUNCTION);
|
||||
mp_ops->send_ipi(cpu, SMP_MSG_FUNCTION);
|
||||
}
|
||||
|
||||
void arch_send_call_function_single_ipi(int cpu)
|
||||
{
|
||||
plat_send_ipi(cpu, SMP_MSG_FUNCTION_SINGLE);
|
||||
mp_ops->send_ipi(cpu, SMP_MSG_FUNCTION_SINGLE);
|
||||
}
|
||||
|
||||
void smp_timer_broadcast(const struct cpumask *mask)
|
||||
|
@ -185,7 +195,7 @@ void smp_timer_broadcast(const struct cpumask *mask)
|
|||
int cpu;
|
||||
|
||||
for_each_cpu(cpu, mask)
|
||||
plat_send_ipi(cpu, SMP_MSG_TIMER);
|
||||
mp_ops->send_ipi(cpu, SMP_MSG_TIMER);
|
||||
}
|
||||
|
||||
static void ipi_timer(void)
|
||||
|
|
Загрузка…
Ссылка в новой задаче