Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04fa8bf7 authored by Jonas Gorski's avatar Jonas Gorski Committed by Ralf Baechle
Browse files

MIPS: BMIPS: add a smp ops registration helper 



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: default avatarJonas Gorski <jogo@openwrt.org>
Signed-off-by: default avatarJohn Crispin <blogic@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/6248/
parent fe7f62c0

arch/mips/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -1479,6 +1479,7 @@ config CPU_LOONGSON1 
	select CPU_SUPPORTS_HIGHMEM

	select CPU_SUPPORTS_HIGHMEM





config CPU_BMIPS32_3300

config CPU_BMIPS32_3300

	select SMP_UP if SMP

	bool

	bool





config CPU_BMIPS4350

config CPU_BMIPS4350

arch/mips/bcm63xx/prom.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -61,7 +61,7 @@ void __init prom_init(void) 




	if (IS_ENABLED(CONFIG_CPU_BMIPS4350) && IS_ENABLED(CONFIG_SMP)) {

	if (IS_ENABLED(CONFIG_CPU_BMIPS4350) && IS_ENABLED(CONFIG_SMP)) {

		/* set up SMP */

		/* set up SMP */

		register_smp_ops(&bmips43xx_smp_ops);

		register_bmips_smp_ops();





		/*

		/*

		 * BCM6328 might not have its second CPU enabled, while BCM3368

		 * BCM6328 might not have its second CPU enabled, while BCM3368

arch/mips/include/asm/bmips.h

+26 −0
Original line number Original line Diff line number Diff line
@@ -46,9 +46,35 @@ 




#include <linux/cpumask.h>

#include <linux/cpumask.h>

#include <asm/r4kcache.h>

#include <asm/r4kcache.h>

#include <asm/smp-ops.h>





extern struct plat_smp_ops bmips43xx_smp_ops;

extern struct plat_smp_ops bmips43xx_smp_ops;

extern struct plat_smp_ops bmips5000_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;

extern char bmips_reset_nmi_vec_end;

extern char bmips_reset_nmi_vec_end;

extern char bmips_smp_movevec;

extern char bmips_smp_movevec;