Commit 57a2050c authored by Ralf Baechle's avatar Ralf Baechle

[MIPS] SMTC: De-obscure Malta hooks.

Should now be understandable why the thing works ...
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent b3920590
...@@ -21,4 +21,4 @@ ...@@ -21,4 +21,4 @@
obj-y := malta_int.o malta_setup.o obj-y := malta_int.o malta_setup.o
obj-$(CONFIG_MTD) += malta_mtd.o obj-$(CONFIG_MTD) += malta_mtd.o
obj-$(CONFIG_SMP) += malta_smp.o obj-$(CONFIG_MIPS_MT_SMTC) += malta_smtc.o
/* /*
* Malta Platform-specific hooks for SMP operation * Malta Platform-specific hooks for SMP operation
*/ */
#include <linux/init.h>
#include <linux/kernel.h> #include <asm/mipsregs.h>
#include <linux/sched.h> #include <asm/mipsmtregs.h>
#include <linux/cpumask.h> #include <asm/smtc.h>
#include <linux/interrupt.h>
#include <asm/atomic.h>
#include <asm/cpu.h>
#include <asm/processor.h>
#include <asm/system.h>
#include <asm/hardirq.h>
#include <asm/mmu_context.h>
#include <asm/smp.h>
#ifdef CONFIG_MIPS_MT_SMTC
#include <asm/smtc_ipi.h> #include <asm/smtc_ipi.h>
#endif /* CONFIG_MIPS_MT_SMTC */
/* VPE/SMP Prototype implements platform interfaces directly */ /* VPE/SMP Prototype implements platform interfaces directly */
#if !defined(CONFIG_MIPS_MT_SMP)
/* /*
* Cause the specified action to be performed on a targeted "CPU" * Cause the specified action to be performed on a targeted "CPU"
...@@ -27,10 +16,8 @@ ...@@ -27,10 +16,8 @@
void core_send_ipi(int cpu, unsigned int action) void core_send_ipi(int cpu, unsigned int action)
{ {
/* "CPU" may be TC of same VPE, VPE of same CPU, or different CPU */ /* "CPU" may be TC of same VPE, VPE of same CPU, or different CPU */
#ifdef CONFIG_MIPS_MT_SMTC
smtc_send_ipi(cpu, LINUX_SMP_IPI, action); smtc_send_ipi(cpu, LINUX_SMP_IPI, action);
#endif /* CONFIG_MIPS_MT_SMTC */
} }
/* /*
...@@ -39,9 +26,7 @@ void core_send_ipi(int cpu, unsigned int action) ...@@ -39,9 +26,7 @@ void core_send_ipi(int cpu, unsigned int action)
void prom_boot_secondary(int cpu, struct task_struct *idle) void prom_boot_secondary(int cpu, struct task_struct *idle)
{ {
#ifdef CONFIG_MIPS_MT_SMTC
smtc_boot_secondary(cpu, idle); smtc_boot_secondary(cpu, idle);
#endif /* CONFIG_MIPS_MT_SMTC */
} }
/* /*
...@@ -50,7 +35,6 @@ void prom_boot_secondary(int cpu, struct task_struct *idle) ...@@ -50,7 +35,6 @@ void prom_boot_secondary(int cpu, struct task_struct *idle)
void prom_init_secondary(void) void prom_init_secondary(void)
{ {
#ifdef CONFIG_MIPS_MT_SMTC
void smtc_init_secondary(void); void smtc_init_secondary(void);
int myvpe; int myvpe;
...@@ -65,7 +49,6 @@ void prom_init_secondary(void) ...@@ -65,7 +49,6 @@ void prom_init_secondary(void)
} }
smtc_init_secondary(); smtc_init_secondary();
#endif /* CONFIG_MIPS_MT_SMTC */
} }
/* /*
...@@ -93,9 +76,7 @@ void __init plat_prepare_cpus(unsigned int max_cpus) ...@@ -93,9 +76,7 @@ void __init plat_prepare_cpus(unsigned int max_cpus)
void prom_smp_finish(void) void prom_smp_finish(void)
{ {
#ifdef CONFIG_MIPS_MT_SMTC
smtc_smp_finish(); smtc_smp_finish();
#endif /* CONFIG_MIPS_MT_SMTC */
} }
/* /*
...@@ -105,5 +86,3 @@ void prom_smp_finish(void) ...@@ -105,5 +86,3 @@ void prom_smp_finish(void)
void prom_cpus_done(void) void prom_cpus_done(void)
{ {
} }
#endif /* CONFIG_MIPS32R2_MT_SMP */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment