| From bda110d185f3d87ed8fd9339e7c12e34a5381eb2 Mon Sep 17 00:00:00 2001 |
| From: Diana Craciun <diana.craciun@nxp.com> |
| Date: Thu, 11 Apr 2019 21:46:26 +1000 |
| Subject: powerpc/fsl: Enable runtime patching if nospectre_v2 boot arg is used |
| |
| commit 3bc8ea8603ae4c1e09aca8de229ad38b8091fcb3 upstream. |
| |
| If the user choses not to use the mitigations, replace |
| the code sequence with nops. |
| |
| Signed-off-by: Diana Craciun <diana.craciun@nxp.com> |
| Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/powerpc/kernel/setup-common.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c |
| index d5a128f54537..5e7d70c5d065 100644 |
| --- a/arch/powerpc/kernel/setup-common.c |
| +++ b/arch/powerpc/kernel/setup-common.c |
| @@ -919,6 +919,7 @@ void __init setup_arch(char **cmdline_p) |
| ppc_md.setup_arch(); |
| |
| setup_barrier_nospec(); |
| + setup_spectre_v2(); |
| |
| paging_init(); |
| |
| -- |
| 2.19.1 |
| |
