Currently when deciding if we need to save FFR when in streaming mode prior
to EFI calls we check if FA64 is supported by the system. Since KVM guest
support will mean that FA64 might be enabled and disabled at runtime switch
to checking if traps for FA64 are enabled in SMCR_EL1 instead.
Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
---
arch/arm64/kernel/fpsimd.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c
index 7c66ed6e43c34d1b5e1cc00595c12244d13d3d0d..a6f9a102fadb0547b4988cb5b0c239ca90a262a0 100644
--- a/arch/arm64/kernel/fpsimd.c
+++ b/arch/arm64/kernel/fpsimd.c
@@ -1980,6 +1980,11 @@ static DEFINE_PER_CPU(bool, efi_sm_state);
* either doing something wrong or you need to propose some refactoring.
*/
+static bool fa64_enabled(void)
+{
+ return read_sysreg_s(SYS_SMCR_EL1) & SMCR_ELx_FA64;
+}
+
/*
* __efi_fpsimd_begin(): prepare FPSIMD for making an EFI runtime services call
*/
@@ -2014,7 +2019,7 @@ void __efi_fpsimd_begin(void)
* Unless we have FA64 FFR does not
* exist in streaming mode.
*/
- if (!system_supports_fa64())
+ if (!fa64_enabled())
ffr = !(svcr & SVCR_SM_MASK);
}
@@ -2065,7 +2070,7 @@ void __efi_fpsimd_end(void)
* Unless we have FA64 FFR does not
* exist in streaming mode.
*/
- if (!system_supports_fa64())
+ if (!fa64_enabled())
ffr = false;
}
}
--
2.39.5
