]>
Commit | Line | Data |
---|---|---|
342554a7 GKH |
1 | From foo@baz Tue 30 Apr 2019 12:38:50 PM CEST |
2 | From: Diana Craciun <diana.craciun@nxp.com> | |
3 | Date: Mon, 29 Apr 2019 18:49:01 +0300 | |
4 | Subject: powerpc/fsl: Enable runtime patching if nospectre_v2 boot arg is used | |
5 | To: stable@vger.kernel.org, gregkh@linuxfoundation.org | |
6 | Cc: linuxppc-dev@ozlabs.org, mpe@ellerman.id.au, Diana Craciun <diana.craciun@nxp.com> | |
7 | Message-ID: <1556552948-24957-2-git-send-email-diana.craciun@nxp.com> | |
8 | ||
9 | From: Diana Craciun <diana.craciun@nxp.com> | |
10 | ||
11 | commit 3bc8ea8603ae4c1e09aca8de229ad38b8091fcb3 upstream. | |
12 | ||
13 | If the user choses not to use the mitigations, replace | |
14 | the code sequence with nops. | |
15 | ||
16 | Signed-off-by: Diana Craciun <diana.craciun@nxp.com> | |
17 | Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> | |
18 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
19 | --- | |
20 | arch/powerpc/kernel/setup_32.c | 1 + | |
21 | arch/powerpc/kernel/setup_64.c | 1 + | |
22 | 2 files changed, 2 insertions(+) | |
23 | ||
24 | --- a/arch/powerpc/kernel/setup_32.c | |
25 | +++ b/arch/powerpc/kernel/setup_32.c | |
26 | @@ -323,6 +323,7 @@ void __init setup_arch(char **cmdline_p) | |
27 | if ( ppc_md.progress ) ppc_md.progress("arch: exit", 0x3eab); | |
28 | ||
29 | setup_barrier_nospec(); | |
30 | + setup_spectre_v2(); | |
31 | ||
32 | paging_init(); | |
33 | ||
34 | --- a/arch/powerpc/kernel/setup_64.c | |
35 | +++ b/arch/powerpc/kernel/setup_64.c | |
36 | @@ -737,6 +737,7 @@ void __init setup_arch(char **cmdline_p) | |
37 | ppc_md.setup_arch(); | |
38 | ||
39 | setup_barrier_nospec(); | |
40 | + setup_spectre_v2(); | |
41 | ||
42 | paging_init(); | |
43 |