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

Commit ff2c8252 authored by Matt Redfearn's avatar Matt Redfearn Committed by Ralf Baechle
Browse files

MIPS: SMP: Constify smp ops 



smp_ops providers do not modify their ops structures, so they should be
made const for robustness. Since currently the MIPS kernel is not mapped
with memory protection, this does not in itself provide any security
benefit, but it still makes sense to make this change.

There are also slight code size efficincies from the structure being
made read-only, saving 128 bytes of kernel text on a
pistachio_defconfig.
Before:
   text	   data	    bss	    dec	    hex	filename
7187239	1772752	 470224	9430215	 8fe4c7	vmlinux
After:
   text	   data	    bss	    dec	    hex	filename
7187111	1772752	 470224	9430087	 8fe447	vmlinux

Signed-off-by: default avatarMatt Redfearn <matt.redfearn@imgtec.com>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
Cc: Bart Van Assche <bart.vanassche@sandisk.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Huacai Chen <chenhc@lemote.com>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Kevin Cernekee <cernekee@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Doug Ledford <dledford@redhat.com>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: Joe Perches <joe@perches.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Steven J. Hill <steven.hill@cavium.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/16784/


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

arch/mips/cavium-octeon/smp.c

+3 −3
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ late_initcall(register_cavium_notifier); 


#endif	/* CONFIG_HOTPLUG_CPU */



struct plat_smp_ops octeon_smp_ops = {

const struct plat_smp_ops octeon_smp_ops = {

	.send_ipi_single	= octeon_send_ipi_single,

	.send_ipi_mask		= octeon_send_ipi_mask,

	.init_secondary		= octeon_init_secondary,
@@ -485,7 +485,7 @@ static void octeon_78xx_send_ipi_mask(const struct cpumask *mask, 
		octeon_78xx_send_ipi_single(cpu, action);

}



static struct plat_smp_ops octeon_78xx_smp_ops = {

static const struct plat_smp_ops octeon_78xx_smp_ops = {

	.send_ipi_single	= octeon_78xx_send_ipi_single,

	.send_ipi_mask		= octeon_78xx_send_ipi_mask,

	.init_secondary		= octeon_init_secondary,
@@ -501,7 +501,7 @@ static struct plat_smp_ops octeon_78xx_smp_ops = { 


void __init octeon_setup_smp(void)

{

	struct plat_smp_ops *ops;

	const struct plat_smp_ops *ops;



	if (octeon_has_feature(OCTEON_FEATURE_CIU3))

		ops = &octeon_78xx_smp_ops;

arch/mips/fw/arc/init.c

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

#ifdef CONFIG_SGI_IP27

	{

		extern struct plat_smp_ops ip27_smp_ops;

		extern const struct plat_smp_ops ip27_smp_ops;



		register_smp_ops(&ip27_smp_ops);

	}

arch/mips/include/asm/bmips.h

+2 −2
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ 
#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;

extern const struct plat_smp_ops bmips43xx_smp_ops;

extern const struct plat_smp_ops bmips5000_smp_ops;



static inline int register_bmips_smp_ops(void)

{

arch/mips/include/asm/mach-loongson64/loongson.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ extern void mach_prepare_shutdown(void); 
/* environment arguments from bootloader */

extern u32 cpu_clock_freq;

extern u32 memsize, highmemsize;

extern struct plat_smp_ops loongson3_smp_ops;

extern const struct plat_smp_ops loongson3_smp_ops;



/* loongson-specific command line, env and memory initialization */

extern void __init prom_init_memory(void);

arch/mips/include/asm/netlogic/common.h

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ nlm_set_nmi_handler(void *handler) 
 */

void nlm_init_boot_cpu(void);

unsigned int nlm_get_cpu_frequency(void);

extern struct plat_smp_ops nlm_smp_ops;

extern const struct plat_smp_ops nlm_smp_ops;

extern char nlm_reset_entry[], nlm_reset_entry_end[];



/* SWIOTLB */