x86/sev: Shorten GHCB terminate macro names

Shorten macro names for improved readability.

Suggested-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Brijesh Singh <brijesh.singh@amd.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Venu Busireddy <venu.busireddy@oracle.com>
Link: https://lkml.kernel.org/r/20211110220731.2396491-5-brijesh.singh@amd.com

diff --git a/arch/x86/boot/compressed/sev.c b/arch/x86/boot/compressed/sev.c
index 670e998fe93062e5dd2aaf97e97bf0554c7a8fa9..28bcf04c022eaf4e87f92cdfb7f8fd74343750eb 100644 (file)
--- a/arch/x86/boot/compressed/sev.c
+++ b/arch/x86/boot/compressed/sev.c
@@ -122,7 +122,7 @@ static enum es_result vc_read_mem(struct es_em_ctxt *ctxt,
 static bool early_setup_sev_es(void)
 {
        if (!sev_es_negotiate_protocol())
-               sev_es_terminate(GHCB_SEV_ES_REASON_PROTOCOL_UNSUPPORTED);
+               sev_es_terminate(GHCB_SEV_ES_PROT_UNSUPPORTED);
 
        if (set_page_decrypted((unsigned long)&boot_ghcb_page))
                return false;
@@ -175,7 +175,7 @@ void do_boot_stage2_vc(struct pt_regs *regs, unsigned long exit_code)
        enum es_result result;
 
        if (!boot_ghcb && !early_setup_sev_es())
-               sev_es_terminate(GHCB_SEV_ES_REASON_GENERAL_REQUEST);
+               sev_es_terminate(GHCB_SEV_ES_GEN_REQ);
 
        vc_ghcb_invalidate(boot_ghcb);
        result = vc_init_em_ctxt(&ctxt, regs, exit_code);
@@ -202,5 +202,5 @@ finish:
        if (result == ES_OK)
                vc_finish_insn(&ctxt);
        else if (result != ES_RETRY)
-               sev_es_terminate(GHCB_SEV_ES_REASON_GENERAL_REQUEST);
+               sev_es_terminate(GHCB_SEV_ES_GEN_REQ);
 }

diff --git a/arch/x86/include/asm/sev-common.h b/arch/x86/include/asm/sev-common.h
index 2cef6c5a52c2a71a550393c78111dfd3242f47d1..855b0ec9c4e82de4901842b48424df70516c9a7b 100644 (file)
--- a/arch/x86/include/asm/sev-common.h
+++ b/arch/x86/include/asm/sev-common.h
@@ -68,8 +68,8 @@
        (((((u64)reason_set) &  GHCB_MSR_TERM_REASON_SET_MASK) << GHCB_MSR_TERM_REASON_SET_POS) | \
        ((((u64)reason_val) & GHCB_MSR_TERM_REASON_MASK) << GHCB_MSR_TERM_REASON_POS))
 
-#define GHCB_SEV_ES_REASON_GENERAL_REQUEST     0
-#define GHCB_SEV_ES_REASON_PROTOCOL_UNSUPPORTED        1
+#define GHCB_SEV_ES_GEN_REQ            0
+#define GHCB_SEV_ES_PROT_UNSUPPORTED   1
 
 #define GHCB_RESP_CODE(v)              ((v) & GHCB_MSR_INFO_MASK)
 

diff --git a/arch/x86/kernel/sev-shared.c b/arch/x86/kernel/sev-shared.c
index 787dc5f568b5db7f33734c7143b625034fb20206..ce987688bbc0520382fb0e2a8cc6db100be35c49 100644 (file)
--- a/arch/x86/kernel/sev-shared.c
+++ b/arch/x86/kernel/sev-shared.c
@@ -221,7 +221,7 @@ void __init do_vc_no_ghcb(struct pt_regs *regs, unsigned long exit_code)
 
 fail:
        /* Terminate the guest */
-       sev_es_terminate(GHCB_SEV_ES_REASON_GENERAL_REQUEST);
+       sev_es_terminate(GHCB_SEV_ES_GEN_REQ);
 }
 
 static enum es_result vc_insn_string_read(struct es_em_ctxt *ctxt,

diff --git a/arch/x86/kernel/sev.c b/arch/x86/kernel/sev.c
index 74f0ec95538486a8dba1d4fab55866ed1b646afd..0a6c82e060e005d7e4095c7f0c62b173ce822f3a 100644 (file)
--- a/arch/x86/kernel/sev.c
+++ b/arch/x86/kernel/sev.c
@@ -1411,7 +1411,7 @@ DEFINE_IDTENTRY_VC_KERNEL(exc_vmm_communication)
                show_regs(regs);
 
                /* Ask hypervisor to sev_es_terminate */
-               sev_es_terminate(GHCB_SEV_ES_REASON_GENERAL_REQUEST);
+               sev_es_terminate(GHCB_SEV_ES_GEN_REQ);
 
                /* If that fails and we get here - just panic */
                panic("Returned from Terminate-Request to Hypervisor\n");
@@ -1459,7 +1459,7 @@ bool __init handle_vc_boot_ghcb(struct pt_regs *regs)
 
        /* Do initial setup or terminate the guest */
        if (unlikely(boot_ghcb == NULL && !sev_es_setup_ghcb()))
-               sev_es_terminate(GHCB_SEV_ES_REASON_GENERAL_REQUEST);
+               sev_es_terminate(GHCB_SEV_ES_GEN_REQ);
 
        vc_ghcb_invalidate(boot_ghcb);