Skip to content

Commit ca8f421

Browse files
committed
Merge tag 'x86_sev_for_v7.0_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 SEV updates from Borislav Petkov: - Make the SEV internal header really internal and carve out the SVSM-specific code into a separate compilation unit, along with other cleanups and fixups [ TLA translation service: 'SEV' is AMD's 'Secure Encrypted Virtualization' and SVSM is an ETLA ('Enhanced TLA') for 'Secure VM Service Module'. Some of us have trouble keeping track of this all and need all the help we can get ] * tag 'x86_sev_for_v7.0_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/sev: Don't emit BSS_DECRYPTED section unless it is in use x86/sev: Use kfree_sensitive() when freeing a SNP message descriptor x86/sev: Rename sev_es_ghcb_handle_msr() to __vc_handle_msr() x86/sev: Carve out the SVSM code into a separate compilation unit x86/sev: Add internal header guards x86/sev: Move the internal header
2 parents 57cb845 + 8c89d3a commit ca8f421

8 files changed

Lines changed: 421 additions & 398 deletions

File tree

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include <asm/cpu_entry_area.h>
2828
#include <asm/stacktrace.h>
2929
#include <asm/sev.h>
30-
#include <asm/sev-internal.h>
3130
#include <asm/insn-eval.h>
3231
#include <asm/fpu/xcr.h>
3332
#include <asm/processor.h>
@@ -41,6 +40,8 @@
4140
#include <asm/cpuid/api.h>
4241
#include <asm/cmdline.h>
4342

43+
#include "../../coco/sev/internal.h"
44+
4445
/* Include code shared with pre-decompression boot stage */
4546
#include "sev-shared.c"
4647

arch/x86/coco/sev/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0
22

3-
obj-y += core.o noinstr.o vc-handle.o
3+
obj-y += core.o noinstr.o vc-handle.o svsm.o
44

55
# Clang 14 and older may fail to respect __no_sanitize_undefined when inlining
66
UBSAN_SANITIZE_noinstr.o := n

0 commit comments

Comments
 (0)