Commit 64ca6cd4 authored by Diana Craciun's avatar Diana Craciun Committed by Greg Kroah-Hartman

powerpc/64: Disable the speculation barrier from the command line

commit cf175dc3 upstream.

The speculation barrier can be disabled from the command line
with the parameter: "nospectre_v1".
Signed-off-by: default avatarDiana Craciun <diana.craciun@nxp.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5159e244
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
unsigned long powerpc_security_features __read_mostly = SEC_FTR_DEFAULT; unsigned long powerpc_security_features __read_mostly = SEC_FTR_DEFAULT;
bool barrier_nospec_enabled; bool barrier_nospec_enabled;
static bool no_nospec;
static void enable_barrier_nospec(bool enable) static void enable_barrier_nospec(bool enable)
{ {
...@@ -42,9 +43,18 @@ void setup_barrier_nospec(void) ...@@ -42,9 +43,18 @@ void setup_barrier_nospec(void)
enable = security_ftr_enabled(SEC_FTR_FAVOUR_SECURITY) && enable = security_ftr_enabled(SEC_FTR_FAVOUR_SECURITY) &&
security_ftr_enabled(SEC_FTR_BNDS_CHK_SPEC_BAR); security_ftr_enabled(SEC_FTR_BNDS_CHK_SPEC_BAR);
if (!no_nospec)
enable_barrier_nospec(enable); enable_barrier_nospec(enable);
} }
static int __init handle_nospectre_v1(char *p)
{
no_nospec = true;
return 0;
}
early_param("nospectre_v1", handle_nospectre_v1);
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
static int barrier_nospec_set(void *data, u64 val) static int barrier_nospec_set(void *data, u64 val)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment