queue-4.14/powerpc-64-make-stf-barrier-ppc_book3s_64-specific.patch

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