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

Commit 6f81254e authored by Michael Ellerman's avatar Michael Ellerman Committed by Greg Kroah-Hartman
Browse files

powerpc/64s: Move cpu_show_meltdown() 



commit 8ad33041563a10b34988800c682ada14b2612533 upstream.

This landed in setup_64.c for no good reason other than we had nowhere
else to put it. Now that we have a security-related file, that is a
better place for it so move it.

[mpe: Add extern for rfi_flush to fix bisection break]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bdcfeadf

arch/powerpc/include/asm/security_features.h

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 




extern unsigned long powerpc_security_features;

extern bool rfi_flush;



static inline void security_ftr_set(unsigned long feature)

{

arch/powerpc/kernel/security.c

+11 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
// Copyright 2018, Michael Ellerman, IBM Corporation.



#include <linux/kernel.h>

#include <linux/device.h>



#include <asm/security_features.h>
@@ -13,3 +15,12 @@ unsigned long powerpc_security_features __read_mostly = \ 
	SEC_FTR_L1D_FLUSH_PR | \

	SEC_FTR_BNDS_CHK_SPEC_BAR | \

	SEC_FTR_FAVOUR_SECURITY;





ssize_t cpu_show_meltdown(struct device *dev, struct device_attribute *attr, char *buf)

{

	if (rfi_flush)

		return sprintf(buf, "Mitigation: RFI Flush\n");



	return sprintf(buf, "Vulnerable\n");

}

arch/powerpc/kernel/setup_64.c

+0 −8
Original line number Diff line number Diff line
@@ -805,12 +805,4 @@ static __init int rfi_flush_debugfs_init(void) 
}

device_initcall(rfi_flush_debugfs_init);

#endif



ssize_t cpu_show_meltdown(struct device *dev, struct device_attribute *attr, char *buf)

{

	if (rfi_flush)

		return sprintf(buf, "Mitigation: RFI Flush\n");



	return sprintf(buf, "Vulnerable\n");

}

#endif /* CONFIG_PPC_BOOK3S_64 */