summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2018-05-26 14:27:29 +1000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-05-30 07:51:51 +0200
commitbf434b31bad640ef4ec34e5f92c5dc95b9e4ed44 (patch)
treea7d09643077d7555e12c7c8a808af7a46645d487 /arch/powerpc/platforms
parentdff1a7e6c3ae2b79cdc23503d732a2b8c19a0296 (diff)
downloadlinux-stable-bf434b31bad640ef4ec34e5f92c5dc95b9e4ed44.tar.gz
linux-stable-bf434b31bad640ef4ec34e5f92c5dc95b9e4ed44.tar.bz2
linux-stable-bf434b31bad640ef4ec34e5f92c5dc95b9e4ed44.zip
powerpc/powernv: Support firmware disable of RFI flush
commit eb0a2d2620ae431c543963c8c7f08f597366fc60 upstream. Some versions of firmware will have a setting that can be configured to disable the RFI flush, add support for it. Fixes: 6e032b350cd1 ("powerpc/powernv: Check device-tree for RFI flush settings") Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r--arch/powerpc/platforms/powernv/setup.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/powernv/setup.c b/arch/powerpc/platforms/powernv/setup.c
index 7966a314d93a..37a7f5ef00b7 100644
--- a/arch/powerpc/platforms/powernv/setup.c
+++ b/arch/powerpc/platforms/powernv/setup.c
@@ -79,6 +79,10 @@ static void pnv_setup_rfi_flush(void)
if (np && of_property_read_bool(np, "disabled"))
enable--;
+ np = of_get_child_by_name(fw_features, "speculation-policy-favor-security");
+ if (np && of_property_read_bool(np, "disabled"))
+ enable = 0;
+
of_node_put(np);
of_node_put(fw_features);
}