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

Commit af375eef authored by Michael Ellerman's avatar Michael Ellerman
Browse files

powerpc/64: Call setup_barrier_nospec() from setup_arch() 



Currently we require platform code to call setup_barrier_nospec(). But
if we add an empty definition for the !CONFIG_PPC_BARRIER_NOSPEC case
then we can call it in setup_arch().

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

arch/powerpc/include/asm/setup.h

+4 −0
Original line number Diff line number Diff line
@@ -52,7 +52,11 @@ enum l1d_flush_type { 


void setup_rfi_flush(enum l1d_flush_type, bool enable);

void do_rfi_flush_fixups(enum l1d_flush_type types);

#ifdef CONFIG_PPC_BARRIER_NOSPEC

void setup_barrier_nospec(void);

#else

static inline void setup_barrier_nospec(void) { };

#endif

void do_barrier_nospec_fixups(bool enable);

extern bool barrier_nospec_enabled;

arch/powerpc/kernel/setup-common.c

+2 −0
Original line number Diff line number Diff line
@@ -972,6 +972,8 @@ void __init setup_arch(char **cmdline_p) 
	if (ppc_md.setup_arch)

		ppc_md.setup_arch();



	setup_barrier_nospec();



	paging_init();



	/* Initialize the MMU context management stuff. */

arch/powerpc/platforms/powernv/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ static void pnv_setup_rfi_flush(void) 
		  security_ftr_enabled(SEC_FTR_L1D_FLUSH_HV));



	setup_rfi_flush(type, enable);

	setup_barrier_nospec();

}



static void __init pnv_setup_arch(void)

arch/powerpc/platforms/pseries/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -551,7 +551,6 @@ void pseries_setup_rfi_flush(void) 
		 security_ftr_enabled(SEC_FTR_L1D_FLUSH_PR);



	setup_rfi_flush(types, enable);

	setup_barrier_nospec();

}



#ifdef CONFIG_PCI_IOV