Skip to content

Commit 9183c97

Browse files
committed
x86/sev: Rename sev_es_ghcb_handle_msr() to __vc_handle_msr()
Forgot to do that during the Secure AVIC review. :-\ No functional changes. Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com> Link: https://patch.msgid.link/20260119141310.29605-1-bp@kernel.org
1 parent e21279b commit 9183c97

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

arch/x86/coco/sev/core.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -989,7 +989,7 @@ u64 savic_ghcb_msr_read(u32 reg)
989989
ghcb = __sev_get_ghcb(&state);
990990
vc_ghcb_invalidate(ghcb);
991991

992-
res = sev_es_ghcb_handle_msr(ghcb, &ctxt, false);
992+
res = __vc_handle_msr(ghcb, &ctxt, false);
993993
if (res != ES_OK) {
994994
pr_err("Secure AVIC MSR (0x%llx) read returned error (%d)\n", msr, res);
995995
/* MSR read failures are treated as fatal errors */
@@ -1019,7 +1019,7 @@ void savic_ghcb_msr_write(u32 reg, u64 value)
10191019
ghcb = __sev_get_ghcb(&state);
10201020
vc_ghcb_invalidate(ghcb);
10211021

1022-
res = sev_es_ghcb_handle_msr(ghcb, &ctxt, true);
1022+
res = __vc_handle_msr(ghcb, &ctxt, true);
10231023
if (res != ES_OK) {
10241024
pr_err("Secure AVIC MSR (0x%llx) write returned error (%d)\n", msr, res);
10251025
/* MSR writes should never fail. Any failure is fatal error for SNP guest */

arch/x86/coco/sev/internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ static __always_inline void sev_es_wr_ghcb_msr(u64 val)
8585
native_wrmsr(MSR_AMD64_SEV_ES_GHCB, low, high);
8686
}
8787

88-
enum es_result sev_es_ghcb_handle_msr(struct ghcb *ghcb, struct es_em_ctxt *ctxt, bool write);
88+
enum es_result __vc_handle_msr(struct ghcb *ghcb, struct es_em_ctxt *ctxt, bool write);
8989

9090
u64 get_hv_features(void);
9191

arch/x86/coco/sev/vc-handle.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ static enum es_result __vc_handle_secure_tsc_msrs(struct es_em_ctxt *ctxt, bool
404404
return ES_OK;
405405
}
406406

407-
enum es_result sev_es_ghcb_handle_msr(struct ghcb *ghcb, struct es_em_ctxt *ctxt, bool write)
407+
enum es_result __vc_handle_msr(struct ghcb *ghcb, struct es_em_ctxt *ctxt, bool write)
408408
{
409409
struct pt_regs *regs = ctxt->regs;
410410
enum es_result ret;
@@ -448,7 +448,7 @@ enum es_result sev_es_ghcb_handle_msr(struct ghcb *ghcb, struct es_em_ctxt *ctxt
448448

449449
static enum es_result vc_handle_msr(struct ghcb *ghcb, struct es_em_ctxt *ctxt)
450450
{
451-
return sev_es_ghcb_handle_msr(ghcb, ctxt, ctxt->insn.opcode.bytes[1] == 0x30);
451+
return __vc_handle_msr(ghcb, ctxt, ctxt->insn.opcode.bytes[1] == 0x30);
452452
}
453453

454454
static void __init vc_early_forward_exception(struct es_em_ctxt *ctxt)

0 commit comments

Comments
 (0)