diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2018-05-26 14:27:28 +1000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-05-30 07:51:51 +0200 |
| commit | dff1a7e6c3ae2b79cdc23503d732a2b8c19a0296 (patch) | |
| tree | c8fda9d1820650f8405c5dc808f615593515b4df /arch/powerpc/platforms | |
| parent | 2245d95d9f7a2746af23962e212ea556dc4ea653 (diff) | |
| download | linux-stable-dff1a7e6c3ae2b79cdc23503d732a2b8c19a0296.tar.gz linux-stable-dff1a7e6c3ae2b79cdc23503d732a2b8c19a0296.tar.bz2 linux-stable-dff1a7e6c3ae2b79cdc23503d732a2b8c19a0296.zip | |
powerpc/pseries: Support firmware disable of RFI flush
commit 582605a429e20ae68fd0b041b2e840af296edd08 upstream.
Some versions of firmware will have a setting that can be configured
to disable the RFI flush, add support for it.
Fixes: 8989d56878a7 ("powerpc/pseries: Query hypervisor for RFI flush settings")
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/pseries/setup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index ae4f596273b5..8bbbb4e753b5 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c @@ -482,7 +482,8 @@ static void pseries_setup_rfi_flush(void) if (types == L1D_FLUSH_NONE) types = L1D_FLUSH_FALLBACK; - if (!(result.behaviour & H_CPU_BEHAV_L1D_FLUSH_PR)) + if ((!(result.behaviour & H_CPU_BEHAV_L1D_FLUSH_PR)) || + (!(result.behaviour & H_CPU_BEHAV_FAVOUR_SECURITY))) enable = false; } else { /* Default to fallback if case hcall is not available */ |