arm64: Add missing Falkor part number for branch predictor hardening
PATCH 1/1 arm64: Add missing Falkor part number for branch predictor hardening
References to CPU part number MIDR_QCOM_FALKOR were dropped from the mailing list patch due to mainline/arm64 branch dependency. So this patch adds the missing part number.
--- arch/arm64/kernel/cpu_errata.c | 9 +++++++++ arch/arm64/kvm/hyp/switch.c | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-)
arch/arm64/kernel/cpu_errata.c +9 -0
@@ -408,6 +408,15 @@ static int qcom_enable_link_stack_sanitization(void *data) }, { .capability = ARM64_HARDEN_BRANCH_PREDICTOR, +MIDR_ALL_VERSIONS (MIDR_QCOM_FALKOR ), + .enable = qcom_enable_link_stack_sanitization, + }, + { + .capability =ARM64_HARDEN_BP_POST_GUEST_EXIT , + MIDR_ALL_VERSIONS(MIDR_QCOM_FALKOR), + }, + { + .capability =ARM64_HARDEN_BRANCH_PREDICTOR ,MIDR_ALL_VERSIONS (MIDR_BRCM_VULCAN ), .enable = enable_smccc_arch_workaround_1, },
arch/arm64/kvm/hyp/switch.c +3 -1
@@ -407,8 +407,10 @@ int __hyp_text __kvm_vcpu_run(struct kvm_vcpu *vcpu)u32 midr =read_cpuid_id ();/* Apply BTAC predictors mitigation to all Falkor chips */ -if ((midr &MIDR_CPU_MODEL_MASK ) ==MIDR_QCOM_FALKOR_V1 ) +if (((midr &MIDR_CPU_MODEL_MASK ) ==MIDR_QCOM_FALKOR ) || + ((midr &MIDR_CPU_MODEL_MASK ) ==MIDR_QCOM_FALKOR_V1 )) {__qcom_hyp_sanitize_btac_predictors (); + } } fp_enabled =__fpsimd_enabled ();
Signature · 2 lines
Qualcomm Datacenter Technologies, Inc. on behalf of the Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.
Quoted 38 lines · Shanker Donthineni
References to CPU part number
MIDR_QCOM_FALKORwere dropped from the mailing list patch due to mainline/arm64 branch dependency. So this patch adds the missing part number.Fixes ec82b567a74f ("arm64: Implement branch predictor hardening for Falkor")Signed-off-by Shanker Donthineni <[email protected]>--- arch/arm64/kernel/cpu_errata.c | 9 +++++++++ arch/arm64/kvm/hyp/switch.c | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-)arch/arm64/kernel/cpu_errata.c +9
-0@@ -408,6 +408,15 @@ static int qcom_enable_link_stack_sanitization(void *data) }, { .capability = ARM64_HARDEN_BRANCH_PREDICTOR, +MIDR_ALL_VERSIONS (MIDR_QCOM_FALKOR ), + .enable = qcom_enable_link_stack_sanitization, + }, + { + .capability =ARM64_HARDEN_BP_POST_GUEST_EXIT , + MIDR_ALL_VERSIONS(MIDR_QCOM_FALKOR), + }, + { + .capability =ARM64_HARDEN_BRANCH_PREDICTOR ,MIDR_ALL_VERSIONS (MIDR_BRCM_VULCAN ), .enable = enable_smccc_arch_workaround_1, },arch/arm64/kvm/hyp/switch.c +0
-0@@ -407,8 +407,10 @@ int __hyp_text __kvm_vcpu_run(struct kvm_vcpu *vcpu)u32 midr =read_cpuid_id ();
arch/arm64/kvm/hyp/switch.c int __hyp_text __kvm_vcpu_run(struct kvm_vcpu *vcpu) · line 416
Quoted 10 lines
arch/arm64/kvm/hyp/switch.c +3
-1/* Apply BTAC predictors mitigation to all Falkor chips */ -if ((midr &MIDR_CPU_MODEL_MASK ) ==MIDR_QCOM_FALKOR_V1 ) +if (((midr &MIDR_CPU_MODEL_MASK ) ==MIDR_QCOM_FALKOR ) || + ((midr &MIDR_CPU_MODEL_MASK ) ==MIDR_QCOM_FALKOR_V1 )) {__qcom_hyp_sanitize_btac_predictors (); + } } fp_enabled =__fpsimd_enabled ();
I'd suggest this goes via the arm64 tree as a matter of consistency with the rest of the variant-2 series.
Thanks,
M.
Signature · 1 line
Jazz is not dead, it just smell funny.
Quoted 9 lines · Marc Zyngier
Quoted 7 lines · Shanker Donthineni
References to CPU part number
MIDR_QCOM_FALKORwere dropped from the mailing list patch due to mainline/arm64 branch dependency. So this patch adds the missing part number.Fixes ec82b567a74f ("arm64: Implement branch predictor hardening for Falkor")Signed-off-by Shanker Donthineni <[email protected]>
[...]
Quoted 4 lines
Acked-by Marc Zyngier <[email protected]>I'd suggest this goes via the arm64 tree as a matter of consistency with the rest of the variant-2 series.
Queued for -rc2. Thanks.
Signature · 1 line
Catalin