Commit b11483ef authored by Marc Zyngier's avatar Marc Zyngier Committed by Will Deacon

arm64: Make use of ARCH_WORKAROUND_1 even when KVM is not enabled

We seem to be pretending that we don't have any firmware mitigation
when KVM is not compiled in, which is not quite expected.

Bring back the mitigation in this case.

Fixes: 4db61fef ("arm64: kvm: Modernize __smccc_workaround_1_smc_start annotations")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent f75aef39
...@@ -234,14 +234,17 @@ static int detect_harden_bp_fw(void) ...@@ -234,14 +234,17 @@ static int detect_harden_bp_fw(void)
smccc_end = NULL; smccc_end = NULL;
break; break;
#if IS_ENABLED(CONFIG_KVM)
case SMCCC_CONDUIT_SMC: case SMCCC_CONDUIT_SMC:
cb = call_smc_arch_workaround_1; cb = call_smc_arch_workaround_1;
#if IS_ENABLED(CONFIG_KVM)
smccc_start = __smccc_workaround_1_smc; smccc_start = __smccc_workaround_1_smc;
smccc_end = __smccc_workaround_1_smc + smccc_end = __smccc_workaround_1_smc +
__SMCCC_WORKAROUND_1_SMC_SZ; __SMCCC_WORKAROUND_1_SMC_SZ;
break; #else
smccc_start = NULL;
smccc_end = NULL;
#endif #endif
break;
default: default:
return -1; return -1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment