Skip to content

Commit

Permalink
MIPS: BMIPS: add a smp ops registration helper
Browse files Browse the repository at this point in the history
Add a helper similar to the generic register_XXX_smp_ops() for bmips.
Register SMP UP ops in case of BMIPS32/3300.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>
Signed-off-by: John Crispin <blogic@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/6248/
  • Loading branch information
Jonas Gorski authored and Ralf Baechle committed Jan 22, 2014
1 parent fe7f62c commit 04fa8bf
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 1 deletion.
1 change: 1 addition & 0 deletions arch/mips/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1479,6 +1479,7 @@ config CPU_LOONGSON1
select CPU_SUPPORTS_HIGHMEM

config CPU_BMIPS32_3300
select SMP_UP if SMP
bool

config CPU_BMIPS4350
Expand Down
2 changes: 1 addition & 1 deletion arch/mips/bcm63xx/prom.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ void __init prom_init(void)

if (IS_ENABLED(CONFIG_CPU_BMIPS4350) && IS_ENABLED(CONFIG_SMP)) {
/* set up SMP */
register_smp_ops(&bmips43xx_smp_ops);
register_bmips_smp_ops();

/*
* BCM6328 might not have its second CPU enabled, while BCM3368
Expand Down
26 changes: 26 additions & 0 deletions arch/mips/include/asm/bmips.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,35 @@

#include <linux/cpumask.h>
#include <asm/r4kcache.h>
#include <asm/smp-ops.h>

extern struct plat_smp_ops bmips43xx_smp_ops;
extern struct plat_smp_ops bmips5000_smp_ops;

static inline int register_bmips_smp_ops(void)
{
#if IS_ENABLED(CONFIG_CPU_BMIPS) && IS_ENABLED(CONFIG_SMP)
switch (current_cpu_type()) {
case CPU_BMIPS32:
case CPU_BMIPS3300:
return register_up_smp_ops();
case CPU_BMIPS4350:
case CPU_BMIPS4380:
register_smp_ops(&bmips43xx_smp_ops);
break;
case CPU_BMIPS5000:
register_smp_ops(&bmips5000_smp_ops);
break;
default:
return -ENODEV;
}

return 0;
#else
return -ENODEV;
#endif
}

extern char bmips_reset_nmi_vec;
extern char bmips_reset_nmi_vec_end;
extern char bmips_smp_movevec;
Expand Down

0 comments on commit 04fa8bf

Please sign in to comment.