This series is developed based on the feedbacks on SEV-SNP RFCv1. The SEV-SNP depends on SEV-ES functionality, so rename the sev-es.c to sev.c so that we can consolidate all the SEV support in one file. The series applies on top of commit (tip/master) eb4fae8d3b9e (origin/master, origin/HEAD, master) Merge tag 'v5.12' Brijesh Singh (3): x86/sev-es: Rename sev-es.{ch} to sev.{ch} x86/sev: Move GHCB MSR protocol and NAE definitions in a common header x86/msr: Rename MSR_K8_SYSCFG to MSR_AMD64_SYSCFG .../virt/kvm/amd-memory-encryption.rst | 2 +- Documentation/x86/amd-memory-encryption.rst | 6 +- arch/x86/boot/compressed/Makefile | 6 +- arch/x86/boot/compressed/{sev-es.c => sev.c} | 4 +- arch/x86/include/asm/msr-index.h | 6 +- arch/x86/include/asm/sev-common.h | 62 +++++++++++++++++++ arch/x86/include/asm/{sev-es.h => sev.h} | 30 ++------- arch/x86/kernel/Makefile | 6 +- arch/x86/kernel/cpu/amd.c | 4 +- arch/x86/kernel/cpu/mtrr/cleanup.c | 2 +- arch/x86/kernel/cpu/mtrr/generic.c | 4 +- arch/x86/kernel/head64.c | 2 +- arch/x86/kernel/mmconf-fam10h_64.c | 2 +- arch/x86/kernel/nmi.c | 2 +- .../kernel/{sev-es-shared.c => sev-shared.c} | 20 +++--- arch/x86/kernel/{sev-es.c => sev.c} | 4 +- arch/x86/kvm/svm/svm.c | 4 +- arch/x86/kvm/svm/svm.h | 38 ++---------- arch/x86/kvm/x86.c | 2 +- arch/x86/mm/extable.c | 2 +- arch/x86/mm/mem_encrypt_identity.c | 6 +- arch/x86/pci/amd_bus.c | 2 +- arch/x86/platform/efi/efi_64.c | 2 +- arch/x86/realmode/init.c | 2 +- arch/x86/realmode/rm/trampoline_64.S | 4 +- drivers/edac/amd64_edac.c | 2 +- tools/arch/x86/include/asm/msr-index.h | 6 +- 27 files changed, 121 insertions(+), 111 deletions(-) rename arch/x86/boot/compressed/{sev-es.c => sev.c} (98%) create mode 100644 arch/x86/include/asm/sev-common.h rename arch/x86/include/asm/{sev-es.h => sev.h} (70%) rename arch/x86/kernel/{sev-es-shared.c => sev-shared.c} (96%) rename arch/x86/kernel/{sev-es.c => sev.c} (99%) -- 2.17.1