Commit 9f8d92a1 authored by Borislav Petkov (AMD)'s avatar Borislav Petkov (AMD)
Browse files

x86/sev: Zap snp_abort() 



It is a silly oneliner anyway. Replace it with its equivalent.

No functional changes.

Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
parent ce39a6aa

arch/x86/boot/startup/sev-startup.c

+1 −6
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static struct cc_blob_sev_info *__init find_cc_blob(struct boot_params *bp) 


found_cc_info:

	if (cc_info->magic != CC_BLOB_SEV_HDR_MAGIC)

		snp_abort();

		sev_es_terminate(SEV_TERM_SET_GEN, GHCB_SNP_UNSUPPORTED);



	return cc_info;

}
@@ -218,8 +218,3 @@ bool __init snp_init(struct boot_params *bp) 


	return true;

}
 


void __init __noreturn snp_abort(void)

{

	sev_es_terminate(SEV_TERM_SET_GEN, GHCB_SNP_UNSUPPORTED);

}

arch/x86/boot/startup/sme.c

+1 −1
Original line number Diff line number Diff line
@@ -532,7 +532,7 @@ void __init sme_enable(struct boot_params *bp) 
	 * enablement abort the guest.

	 */

	if (snp_en ^ !!(msr & MSR_AMD64_SEV_SNP_ENABLED))

		snp_abort();

		sev_es_terminate(SEV_TERM_SET_GEN, GHCB_SNP_UNSUPPORTED);



	/* Check if memory encryption is enabled */

	if (feature_mask == AMD_SME_BIT) {

arch/x86/include/asm/sev.h

+0 −2
Original line number Diff line number Diff line
@@ -512,7 +512,6 @@ void snp_set_memory_shared(unsigned long vaddr, unsigned long npages); 
void snp_set_memory_private(unsigned long vaddr, unsigned long npages);

void snp_set_wakeup_secondary_cpu(void);

bool snp_init(struct boot_params *bp);

void __noreturn snp_abort(void);

void snp_dmi_setup(void);

int snp_issue_svsm_attest_req(u64 call_id, struct svsm_call *call, struct svsm_attest_call *input);

void snp_accept_memory(phys_addr_t start, phys_addr_t end);
@@ -597,7 +596,6 @@ static inline void snp_set_memory_shared(unsigned long vaddr, unsigned long npag 
static inline void snp_set_memory_private(unsigned long vaddr, unsigned long npages) { }

static inline void snp_set_wakeup_secondary_cpu(void) { }

static inline bool snp_init(struct boot_params *bp) { return false; }

static inline void snp_abort(void) { }

static inline void snp_dmi_setup(void) { }

static inline int snp_issue_svsm_attest_req(u64 call_id, struct svsm_call *call, struct svsm_attest_call *input)

{

tools/objtool/noreturns.h

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ NORETURN(rewind_stack_and_make_dead) 
NORETURN(rust_begin_unwind)

NORETURN(rust_helper_BUG)

NORETURN(sev_es_terminate)

NORETURN(snp_abort)

NORETURN(start_kernel)

NORETURN(stop_this_cpu)

NORETURN(usercopy_abort)