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

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

MIPS: BCM63xx: Remove !RUNTIME_DETECT code for bcmcpu_get_id 



Use the same pattern as with get_*_cpu_type() to allow the compiler
to remove code for non enabled SoC types.

Signed-off-by: default avatarJonas Gorski <jogo@openwrt.org>
Cc: linux-mips@linux-mips.org
Cc: John Crispin <blogic@openwrt.org>
Cc: Maxime Bizon <mbizon@freebox.fr>
Cc: Florian Fainelli <florian@openwrt.org>
Cc: Kevin Cernekee <cernekee@gmail.com>
Patchwork: https://patchwork.linux-mips.org/patch/7273/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 436f302f

arch/mips/bcm63xx/cpu.c

+3 −8
Original line number Diff line number Diff line
@@ -24,7 +24,9 @@ EXPORT_SYMBOL(bcm63xx_regs_base); 
const int *bcm63xx_irqs;

EXPORT_SYMBOL(bcm63xx_irqs);



static u16 bcm63xx_cpu_id;

u16 bcm63xx_cpu_id __read_mostly;

EXPORT_SYMBOL(bcm63xx_cpu_id);



static u8 bcm63xx_cpu_rev;

static unsigned int bcm63xx_cpu_freq;

static unsigned int bcm63xx_memory_size;
@@ -97,13 +99,6 @@ static const int bcm6368_irqs[] = { 


};



u16 __bcm63xx_get_cpu_id(void)

{

	return bcm63xx_cpu_id;

}



EXPORT_SYMBOL(__bcm63xx_get_cpu_id);



u8 bcm63xx_get_cpu_rev(void)

{

	return bcm63xx_cpu_rev;

arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h

+35 −85
Original line number Diff line number Diff line
@@ -19,118 +19,68 @@ 
#define BCM6368_CPU_ID		0x6368



void __init bcm63xx_cpu_init(void);

u16 __bcm63xx_get_cpu_id(void);

u8 bcm63xx_get_cpu_rev(void);

unsigned int bcm63xx_get_cpu_freq(void);



static inline u16 __pure __bcm63xx_get_cpu_id(const u16 cpu_id)

{

	switch (cpu_id) {

#ifdef CONFIG_BCM63XX_CPU_3368

# ifdef bcm63xx_get_cpu_id

#  undef bcm63xx_get_cpu_id

#  define bcm63xx_get_cpu_id()	__bcm63xx_get_cpu_id()

#  define BCMCPU_RUNTIME_DETECT

# else

#  define bcm63xx_get_cpu_id()	BCM3368_CPU_ID

# endif

# define BCMCPU_IS_3368()	(bcm63xx_get_cpu_id() == BCM3368_CPU_ID)

#else

# define BCMCPU_IS_3368()	(0)

		case BCM3368_CPU_ID:

#endif



#ifdef CONFIG_BCM63XX_CPU_6328

# ifdef bcm63xx_get_cpu_id

#  undef bcm63xx_get_cpu_id

#  define bcm63xx_get_cpu_id()	__bcm63xx_get_cpu_id()

#  define BCMCPU_RUNTIME_DETECT

# else

#  define bcm63xx_get_cpu_id()	BCM6328_CPU_ID

# endif

# define BCMCPU_IS_6328()	(bcm63xx_get_cpu_id() == BCM6328_CPU_ID)

#else

# define BCMCPU_IS_6328()	(0)

		case BCM6328_CPU_ID:

#endif



#ifdef CONFIG_BCM63XX_CPU_6338

# ifdef bcm63xx_get_cpu_id

#  undef bcm63xx_get_cpu_id

#  define bcm63xx_get_cpu_id()	__bcm63xx_get_cpu_id()

#  define BCMCPU_RUNTIME_DETECT

# else

#  define bcm63xx_get_cpu_id()	BCM6338_CPU_ID

# endif

# define BCMCPU_IS_6338()	(bcm63xx_get_cpu_id() == BCM6338_CPU_ID)

#else

# define BCMCPU_IS_6338()	(0)

		case BCM6338_CPU_ID:

#endif



#ifdef CONFIG_BCM63XX_CPU_6345

# ifdef bcm63xx_get_cpu_id

#  undef bcm63xx_get_cpu_id

#  define bcm63xx_get_cpu_id()	__bcm63xx_get_cpu_id()

#  define BCMCPU_RUNTIME_DETECT

# else

#  define bcm63xx_get_cpu_id()	BCM6345_CPU_ID

# endif

# define BCMCPU_IS_6345()	(bcm63xx_get_cpu_id() == BCM6345_CPU_ID)

#else

# define BCMCPU_IS_6345()	(0)

		case BCM6345_CPU_ID:

#endif



#ifdef CONFIG_BCM63XX_CPU_6348

# ifdef bcm63xx_get_cpu_id

#  undef bcm63xx_get_cpu_id

#  define bcm63xx_get_cpu_id()	__bcm63xx_get_cpu_id()

#  define BCMCPU_RUNTIME_DETECT

# else

#  define bcm63xx_get_cpu_id()	BCM6348_CPU_ID

# endif

# define BCMCPU_IS_6348()	(bcm63xx_get_cpu_id() == BCM6348_CPU_ID)

#else

# define BCMCPU_IS_6348()	(0)

		case BCM6348_CPU_ID:

#endif



#ifdef CONFIG_BCM63XX_CPU_6358

# ifdef bcm63xx_get_cpu_id

#  undef bcm63xx_get_cpu_id

#  define bcm63xx_get_cpu_id()	__bcm63xx_get_cpu_id()

#  define BCMCPU_RUNTIME_DETECT

# else

#  define bcm63xx_get_cpu_id()	BCM6358_CPU_ID

# endif

# define BCMCPU_IS_6358()	(bcm63xx_get_cpu_id() == BCM6358_CPU_ID)

#else

# define BCMCPU_IS_6358()	(0)

		case BCM6358_CPU_ID:

#endif



#ifdef CONFIG_BCM63XX_CPU_6362

# ifdef bcm63xx_get_cpu_id

#  undef bcm63xx_get_cpu_id

#  define bcm63xx_get_cpu_id()	__bcm63xx_get_cpu_id()

#  define BCMCPU_RUNTIME_DETECT

# else

#  define bcm63xx_get_cpu_id()	BCM6362_CPU_ID

		case BCM6362_CPU_ID:

#endif

# define BCMCPU_IS_6362()	(bcm63xx_get_cpu_id() == BCM6362_CPU_ID)

#else

# define BCMCPU_IS_6362()	(0)

#endif





#ifdef CONFIG_BCM63XX_CPU_6368

# ifdef bcm63xx_get_cpu_id

#  undef bcm63xx_get_cpu_id

#  define bcm63xx_get_cpu_id()	__bcm63xx_get_cpu_id()

#  define BCMCPU_RUNTIME_DETECT

# else

#  define bcm63xx_get_cpu_id()	BCM6368_CPU_ID

# endif

# define BCMCPU_IS_6368()	(bcm63xx_get_cpu_id() == BCM6368_CPU_ID)

#else

# define BCMCPU_IS_6368()	(0)

		case BCM6368_CPU_ID:

#endif

		break;

	default:

		unreachable();

	}



#ifndef bcm63xx_get_cpu_id

#error "No CPU support configured"

#endif

	return cpu_id;

}



extern u16 bcm63xx_cpu_id;



static inline u16 __pure bcm63xx_get_cpu_id(void)

{

	const u16 cpu_id = bcm63xx_cpu_id;



	return __bcm63xx_get_cpu_id(cpu_id);

}



#define BCMCPU_IS_3368()	(bcm63xx_get_cpu_id() == BCM3368_CPU_ID)

#define BCMCPU_IS_6328()	(bcm63xx_get_cpu_id() == BCM6328_CPU_ID)

#define BCMCPU_IS_6338()	(bcm63xx_get_cpu_id() == BCM6338_CPU_ID)

#define BCMCPU_IS_6345()	(bcm63xx_get_cpu_id() == BCM6345_CPU_ID)

#define BCMCPU_IS_6348()	(bcm63xx_get_cpu_id() == BCM6348_CPU_ID)

#define BCMCPU_IS_6358()	(bcm63xx_get_cpu_id() == BCM6358_CPU_ID)

#define BCMCPU_IS_6362()	(bcm63xx_get_cpu_id() == BCM6362_CPU_ID)

#define BCMCPU_IS_6368()	(bcm63xx_get_cpu_id() == BCM6368_CPU_ID)



/*

 * While registers sets are (mostly) the same across 63xx CPU, base