Commit e759959f authored by Brijesh Singh's avatar Brijesh Singh Committed by Borislav Petkov
Browse files

x86/sev-es: Rename sev-es.{ch} to sev.{ch} 



SEV-SNP builds upon the SEV-ES functionality while adding new hardware
protection. Version 2 of the GHCB specification adds new NAE events that
are SEV-SNP specific. Rename the sev-es.{ch} to sev.{ch} so that all
SEV* functionality can be consolidated in one place.

Signed-off-by: default avatarBrijesh Singh <brijesh.singh@amd.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Acked-by: default avatarJoerg Roedel <jroedel@suse.de>
Link: https://lkml.kernel.org/r/20210427111636.1207-2-brijesh.singh@amd.com
parent 6efb943b

arch/x86/boot/compressed/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -48,10 +48,10 @@ KBUILD_CFLAGS += $(call as-option,-Wa$(comma)-mrelax-relocations=no) 
KBUILD_CFLAGS += -include $(srctree)/include/linux/hidden.h

KBUILD_CFLAGS += $(CLANG_FLAGS)



# sev-es.c indirectly inludes inat-table.h which is generated during

# sev.c indirectly inludes inat-table.h which is generated during

# compilation and stored in $(objtree). Add the directory to the includes so

# that the compiler finds it even with out-of-tree builds (make O=/some/path).

CFLAGS_sev-es.o += -I$(objtree)/arch/x86/lib/

CFLAGS_sev.o += -I$(objtree)/arch/x86/lib/



KBUILD_AFLAGS  := $(KBUILD_CFLAGS) -D__ASSEMBLY__

GCOV_PROFILE := n
@@ -93,7 +93,7 @@ ifdef CONFIG_X86_64 
	vmlinux-objs-y += $(obj)/idt_64.o $(obj)/idt_handlers_64.o

	vmlinux-objs-y += $(obj)/mem_encrypt.o

	vmlinux-objs-y += $(obj)/pgtable_64.o

	vmlinux-objs-$(CONFIG_AMD_MEM_ENCRYPT) += $(obj)/sev-es.o

	vmlinux-objs-$(CONFIG_AMD_MEM_ENCRYPT) += $(obj)/sev.o

endif



vmlinux-objs-$(CONFIG_ACPI) += $(obj)/acpi.o

arch/x86/boot/compressed/sev-es.c→arch/x86/boot/compressed/sev.c

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include "misc.h"



#include <asm/pgtable_types.h>

#include <asm/sev-es.h>

#include <asm/sev.h>

#include <asm/trapnr.h>

#include <asm/trap_pf.h>

#include <asm/msr-index.h>
@@ -117,7 +117,7 @@ static enum es_result vc_read_mem(struct es_em_ctxt *ctxt, 
#include "../../lib/insn.c"



/* Include code for early handlers */

#include "../../kernel/sev-es-shared.c"

#include "../../kernel/sev-shared.c"



static bool early_setup_sev_es(void)

{

arch/x86/kernel/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ CFLAGS_REMOVE_kvmclock.o = -pg 
CFLAGS_REMOVE_ftrace.o = -pg

CFLAGS_REMOVE_early_printk.o = -pg

CFLAGS_REMOVE_head64.o = -pg

CFLAGS_REMOVE_sev-es.o = -pg

CFLAGS_REMOVE_sev.o = -pg

endif



KASAN_SANITIZE_head$(BITS).o				:= n
@@ -28,7 +28,7 @@ KASAN_SANITIZE_dumpstack.o := n 
KASAN_SANITIZE_dumpstack_$(BITS).o			:= n

KASAN_SANITIZE_stacktrace.o				:= n

KASAN_SANITIZE_paravirt.o				:= n

KASAN_SANITIZE_sev-es.o					:= n

KASAN_SANITIZE_sev.o					:= n



# With some compiler versions the generated code results in boot hangs, caused

# by several compilation units. To be safe, disable all instrumentation.
@@ -148,7 +148,7 @@ obj-$(CONFIG_UNWINDER_ORC) += unwind_orc.o 
obj-$(CONFIG_UNWINDER_FRAME_POINTER)	+= unwind_frame.o

obj-$(CONFIG_UNWINDER_GUESS)		+= unwind_guess.o



obj-$(CONFIG_AMD_MEM_ENCRYPT)		+= sev-es.o

obj-$(CONFIG_AMD_MEM_ENCRYPT)		+= sev.o

###

# 64 bit specific files

ifeq ($(CONFIG_X86_64),y)

arch/x86/kernel/head64.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#include <asm/realmode.h>

#include <asm/extable.h>

#include <asm/trapnr.h>

#include <asm/sev-es.h>

#include <asm/sev.h>



/*

 * Manage page tables very early on.