summaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2018-02-22 14:00:11 +0100
committerMichael Ellerman <mpe@ellerman.id.au>2018-02-23 06:55:42 +0100
commiteb0a2d2620ae431c543963c8c7f08f597366fc60 (patch)
tree3c6f22b1d5b888ddf3613cc660852e229b21e23f /arch/powerpc
parentpowerpc/pseries: Support firmware disable of RFI flush (diff)
downloadlinux-eb0a2d2620ae431c543963c8c7f08f597366fc60.tar.xz
linux-eb0a2d2620ae431c543963c8c7f08f597366fc60.zip
powerpc/powernv: Support firmware disable of RFI flush
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>
Diffstat (limited to 'arch/powerpc')
-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 4fb21e17504a..092715b9674b 100644
--- a/arch/powerpc/platforms/powernv/setup.c
+++ b/arch/powerpc/platforms/powernv/setup.c
@@ -80,6 +80,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);
}