Commit 5e6bef08 authored by James Morse's avatar James Morse Committed by Zheng Zengkai
Browse files

arm64: spectre: Rename spectre_v4_patch_fw_mitigation_conduit 

stable inclusion
from stable-v5.10.105
commit 7048a21086fb16ec67287a25b62e88b0cd17c8c3
category: bugfix
bugzilla: 186460 https://gitee.com/src-openeuler/kernel/issues/I53MHA
CVE: CVE-2022-23960

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=7048a21086fb



--------------------------------

commit 1b33d486 upstream.

The spectre-v4 sequence includes an SMC from the assembly entry code.
spectre_v4_patch_fw_mitigation_conduit is the patching callback that
generates an HVC or SMC depending on the SMCCC conduit type.

As this isn't specific to spectre-v4, rename it
smccc_patch_fw_mitigation_conduit so it can be re-used.

Reviewed-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarJames Morse <james.morse@arm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarChen Jiahao <chenjiahao16@huawei.com>
Reviewed-by: default avatarLiao Chang <liaochang1@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 4b1b238c

arch/arm64/kernel/entry.S

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ alternative_cb_end 
	tbnz	\tmp2, #TIF_SSBD, .L__asm_ssbd_skip\@

	mov	w0, #ARM_SMCCC_ARCH_WORKAROUND_2

	mov	w1, #\state

alternative_cb	spectre_v4_patch_fw_mitigation_conduit

alternative_cb	smccc_patch_fw_mitigation_conduit

	nop					// Patched to SMC/HVC #0

alternative_cb_end

.L__asm_ssbd_skip\@:

arch/arm64/kernel/proton-pack.c

+3 −3
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ void __init spectre_v4_patch_fw_mitigation_enable(struct alt_instr *alt, 
 * Patch a NOP in the Spectre-v4 mitigation code with an SMC/HVC instruction

 * to call into firmware to adjust the mitigation state.

 */

void __init spectre_v4_patch_fw_mitigation_conduit(struct alt_instr *alt,

void __init smccc_patch_fw_mitigation_conduit(struct alt_instr *alt,

					       __le32 *origptr,

					       __le32 *updptr, int nr_inst)

{