]>
Commit | Line | Data |
---|---|---|
4fa5b95e GKH |
1 | From foo@baz Mon 29 Apr 2019 11:38:37 AM CEST |
2 | From: Michael Ellerman <mpe@ellerman.id.au> | |
3 | Date: Mon, 22 Apr 2019 00:19:49 +1000 | |
4 | Subject: powerpc/powernv: Support firmware disable of RFI flush | |
5 | To: stable@vger.kernel.org, gregkh@linuxfoundation.org | |
6 | Cc: linuxppc-dev@ozlabs.org, diana.craciun@nxp.com, msuchanek@suse.de, npiggin@gmail.com, christophe.leroy@c-s.fr | |
7 | Message-ID: <20190421142037.21881-5-mpe@ellerman.id.au> | |
8 | ||
9 | From: Michael Ellerman <mpe@ellerman.id.au> | |
10 | ||
11 | commit eb0a2d2620ae431c543963c8c7f08f597366fc60 upstream. | |
12 | ||
13 | Some versions of firmware will have a setting that can be configured | |
14 | to disable the RFI flush, add support for it. | |
15 | ||
16 | Fixes: 6e032b350cd1 ("powerpc/powernv: Check device-tree for RFI flush settings") | |
17 | Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> | |
18 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
19 | --- | |
20 | arch/powerpc/platforms/powernv/setup.c | 4 ++++ | |
21 | 1 file changed, 4 insertions(+) | |
22 | ||
23 | --- a/arch/powerpc/platforms/powernv/setup.c | |
24 | +++ b/arch/powerpc/platforms/powernv/setup.c | |
25 | @@ -79,6 +79,10 @@ static void pnv_setup_rfi_flush(void) | |
26 | if (np && of_property_read_bool(np, "disabled")) | |
27 | enable--; | |
28 | ||
29 | + np = of_get_child_by_name(fw_features, "speculation-policy-favor-security"); | |
30 | + if (np && of_property_read_bool(np, "disabled")) | |
31 | + enable = 0; | |
32 | + | |
33 | of_node_put(np); | |
34 | of_node_put(fw_features); | |
35 | } |