hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

powerpc/pseries: Use the security flags in pseries_setup_rfi_flush() 

Now that we have the security flags we can simplify the code in
pseries_setup_rfi_flush() because the security flags have pessimistic
defaults.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Michael Ellerman 2018-03-27 23:01:51 +11:00
parent 37c0bdd00d
commit 2e4a16161f
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
arch/powerpc/platforms/pseries/setup.c
View File

@ -501,30 +501,27 @@ void pseries_setup_rfi_flush(void)
bool enable; bool enable;
long rc; long rc;
/* Enable by default */
enable = true;
types = L1D_FLUSH_FALLBACK;
rc = plpar_get_cpu_characteristics(&result); rc = plpar_get_cpu_characteristics(&result);
if (rc == H_SUCCESS) { if (rc == H_SUCCESS)
init_cpu_char_feature_flags(&result); init_cpu_char_feature_flags(&result);
if (result.character & H_CPU_CHAR_L1D_FLUSH_TRIG2)
types |= L1D_FLUSH_MTTRIG;
if (result.character & H_CPU_CHAR_L1D_FLUSH_ORI30)
types |= L1D_FLUSH_ORI;
if ((!(result.behaviour & H_CPU_BEHAV_L1D_FLUSH_PR)) ||
(!(result.behaviour & H_CPU_BEHAV_FAVOUR_SECURITY)))
enable = false;
}
/* /*
* We're the guest so this doesn't apply to us, clear it to simplify * We're the guest so this doesn't apply to us, clear it to simplify
* handling of it elsewhere. * handling of it elsewhere.
*/ */
security_ftr_clear(SEC_FTR_L1D_FLUSH_HV); security_ftr_clear(SEC_FTR_L1D_FLUSH_HV);
types = L1D_FLUSH_FALLBACK;
if (security_ftr_enabled(SEC_FTR_L1D_FLUSH_TRIG2))
types |= L1D_FLUSH_MTTRIG;
if (security_ftr_enabled(SEC_FTR_L1D_FLUSH_ORI30))
types |= L1D_FLUSH_ORI;
enable = security_ftr_enabled(SEC_FTR_FAVOUR_SECURITY) && \
security_ftr_enabled(SEC_FTR_L1D_FLUSH_PR);
setup_rfi_flush(types, enable); setup_rfi_flush(types, enable);
} }