| From foo@baz Fri Mar 29 15:53:50 CET 2019 |
| From: Michael Ellerman <mpe@ellerman.id.au> |
| Date: Fri, 29 Mar 2019 22:25:57 +1100 |
| Subject: powerpc/64: Make stf barrier PPC_BOOK3S_64 specific. |
| To: stable@vger.kernel.org, gregkh@linuxfoundation.org |
| Cc: linuxppc-dev@ozlabs.org, diana.craciun@nxp.com, msuchanek@suse.de, christophe.leroy@c-s.fr |
| Message-ID: <20190329112620.14489-10-mpe@ellerman.id.au> |
| |
| From: Diana Craciun <diana.craciun@nxp.com> |
| |
| commit 6453b532f2c8856a80381e6b9a1f5ea2f12294df upstream. |
| |
| NXP Book3E platforms are not vulnerable to speculative store |
| bypass, so make the mitigations PPC_BOOK3S_64 specific. |
| |
| Signed-off-by: Diana Craciun <diana.craciun@nxp.com> |
| Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| arch/powerpc/kernel/security.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- a/arch/powerpc/kernel/security.c |
| +++ b/arch/powerpc/kernel/security.c |
| @@ -176,6 +176,7 @@ ssize_t cpu_show_spectre_v2(struct devic |
| return s.len; |
| } |
| |
| +#ifdef CONFIG_PPC_BOOK3S_64 |
| /* |
| * Store-forwarding barrier support. |
| */ |
| @@ -323,3 +324,4 @@ static __init int stf_barrier_debugfs_in |
| } |
| device_initcall(stf_barrier_debugfs_init); |
| #endif /* CONFIG_DEBUG_FS */ |
| +#endif /* CONFIG_PPC_BOOK3S_64 */ |
