diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2018-02-22 23:58:49 +1100 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-02-23 16:55:40 +1100 |
commit | 582605a429e20ae68fd0b041b2e840af296edd08 (patch) | |
tree | 79a6e8867876ce4336e9bd1376565c766fa52803 /arch | |
parent | 2f7d03e0511991f124455682cc94094eaa0981ea (diff) | |
download | op-kernel-dev-582605a429e20ae68fd0b041b2e840af296edd08.zip op-kernel-dev-582605a429e20ae68fd0b041b2e840af296edd08.tar.gz |
powerpc/pseries: Support firmware disable of RFI flush
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>
Diffstat (limited to 'arch')
-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 372d7ad..1a52762 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 */ |