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

Commit 179ab1cb authored by Michael Ellerman's avatar Michael Ellerman
Browse files

powerpc/64: Add CONFIG_PPC_BARRIER_NOSPEC 



Add a config symbol to encode which platforms support the
barrier_nospec speculation barrier. Currently this is just Book3S 64
but we will add Book3E in a future patch.

Signed-off-by: default avatarDiana Craciun <diana.craciun@nxp.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 6453b532

arch/powerpc/Kconfig

+6 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ config PPC 
	select GENERIC_CLOCKEVENTS_BROADCAST	if SMP

	select GENERIC_CMOS_UPDATE

	select GENERIC_CPU_AUTOPROBE

	select GENERIC_CPU_VULNERABILITIES	if PPC_BOOK3S_64

	select GENERIC_CPU_VULNERABILITIES	if PPC_BARRIER_NOSPEC

	select GENERIC_IRQ_SHOW

	select GENERIC_IRQ_SHOW_LEVEL

	select GENERIC_SMP_IDLE_THREAD
@@ -242,6 +242,11 @@ config PPC 
	# Please keep this list sorted alphabetically.

	#



config PPC_BARRIER_NOSPEC

    bool

    default y

    depends on PPC_BOOK3S_64



config GENERIC_CSUM

	def_bool n

arch/powerpc/include/asm/barrier.h

+3 −3
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ do { \ 
	___p1;								\

})



#ifdef CONFIG_PPC_BOOK3S_64

#ifdef CONFIG_PPC_BARRIER_NOSPEC

/*

 * Prevent execution of subsequent instructions until preceding branches have

 * been fully resolved and are no longer executing speculatively.
@@ -88,10 +88,10 @@ do { \ 
// This also acts as a compiler barrier due to the memory clobber.

#define barrier_nospec() asm (stringify_in_c(barrier_nospec_asm) ::: "memory")



#else /* !CONFIG_PPC_BOOK3S_64 */

#else /* !CONFIG_PPC_BARRIER_NOSPEC */

#define barrier_nospec_asm

#define barrier_nospec()

#endif

#endif /* CONFIG_PPC_BARRIER_NOSPEC */



#include <asm-generic/barrier.h>

arch/powerpc/include/asm/setup.h

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ void setup_barrier_nospec(void); 
void do_barrier_nospec_fixups(bool enable);

extern bool barrier_nospec_enabled;



#ifdef CONFIG_PPC_BOOK3S_64

#ifdef CONFIG_PPC_BARRIER_NOSPEC

void do_barrier_nospec_fixups_range(bool enable, void *start, void *end);

#else

static inline void do_barrier_nospec_fixups_range(bool enable, void *start, void *end) { };

arch/powerpc/kernel/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -42,9 +42,10 @@ obj-$(CONFIG_VDSO32) += vdso32/ 
obj-$(CONFIG_PPC_WATCHDOG)	+= watchdog.o

obj-$(CONFIG_HAVE_HW_BREAKPOINT)	+= hw_breakpoint.o

obj-$(CONFIG_PPC_BOOK3S_64)	+= cpu_setup_ppc970.o cpu_setup_pa6t.o

obj-$(CONFIG_PPC_BOOK3S_64)	+= cpu_setup_power.o security.o

obj-$(CONFIG_PPC_BOOK3S_64)	+= cpu_setup_power.o

obj-$(CONFIG_PPC_BOOK3S_64)	+= mce.o mce_power.o

obj-$(CONFIG_PPC_BOOK3E_64)	+= exceptions-64e.o idle_book3e.o

obj-$(CONFIG_PPC_BARRIER_NOSPEC) += security.o

obj-$(CONFIG_PPC64)		+= vdso64/

obj-$(CONFIG_ALTIVEC)		+= vecemu.o

obj-$(CONFIG_PPC_970_NAP)	+= idle_power4.o

arch/powerpc/kernel/module.c

+3 −1
Original line number Diff line number Diff line
@@ -72,13 +72,15 @@ int module_finalize(const Elf_Ehdr *hdr, 
		do_feature_fixups(powerpc_firmware_features,

				  (void *)sect->sh_addr,

				  (void *)sect->sh_addr + sect->sh_size);

#endif /* CONFIG_PPC64 */



#ifdef CONFIG_PPC_BARRIER_NOSPEC

	sect = find_section(hdr, sechdrs, "__spec_barrier_fixup");

	if (sect != NULL)

		do_barrier_nospec_fixups_range(barrier_nospec_enabled,

				  (void *)sect->sh_addr,

				  (void *)sect->sh_addr + sect->sh_size);

#endif

#endif /* CONFIG_PPC_BARRIER_NOSPEC */



	sect = find_section(hdr, sechdrs, "__lwsync_fixup");

	if (sect != NULL)