diff options
| author | Borislav Petkov (AMD) <bp@alien8.de> | 2025-12-04 15:48:06 +0300 |
|---|---|---|
| committer | Borislav Petkov (AMD) <bp@alien8.de> | 2025-12-31 15:05:40 +0300 |
| commit | c1e8980fabf5d0106992a430284fac28bba053a6 (patch) | |
| tree | 64a0d48a226deb7ce717c29fa73595e00b5770b3 | |
| parent | f8f9c1f4d0c7a64600e2ca312dec824a0bc2f1da (diff) | |
| download | linux-c1e8980fabf5d0106992a430284fac28bba053a6.tar.xz | |
x86/sev: Move the internal header
Move the internal header out of the usual include/asm/ include path
because having an "internal" header there doesn't really make it
internal - quite the opposite - that's the normal arch include path.
So move where it belongs and make it really internal.
No functional changes.
Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20251204145716.GDaTGhTEHNOtSdTkEe@fat_crate.local
| -rw-r--r-- | arch/x86/boot/startup/sev-startup.c | 3 | ||||
| -rw-r--r-- | arch/x86/coco/sev/core.c | 3 | ||||
| -rw-r--r-- | arch/x86/coco/sev/internal.h (renamed from arch/x86/include/asm/sev-internal.h) | 0 | ||||
| -rw-r--r-- | arch/x86/coco/sev/noinstr.c | 3 | ||||
| -rw-r--r-- | arch/x86/coco/sev/vc-handle.c | 3 |
5 files changed, 8 insertions, 4 deletions
diff --git a/arch/x86/boot/startup/sev-startup.c b/arch/x86/boot/startup/sev-startup.c index 09725428d3e6..789e99d38d17 100644 --- a/arch/x86/boot/startup/sev-startup.c +++ b/arch/x86/boot/startup/sev-startup.c @@ -27,7 +27,6 @@ #include <asm/cpu_entry_area.h> #include <asm/stacktrace.h> #include <asm/sev.h> -#include <asm/sev-internal.h> #include <asm/insn-eval.h> #include <asm/fpu/xcr.h> #include <asm/processor.h> @@ -41,6 +40,8 @@ #include <asm/cpuid/api.h> #include <asm/cmdline.h> +#include "../../coco/sev/internal.h" + /* Include code shared with pre-decompression boot stage */ #include "sev-shared.c" diff --git a/arch/x86/coco/sev/core.c b/arch/x86/coco/sev/core.c index 9ae3b11754e6..4e618e596267 100644 --- a/arch/x86/coco/sev/core.c +++ b/arch/x86/coco/sev/core.c @@ -31,7 +31,6 @@ #include <asm/cpu_entry_area.h> #include <asm/stacktrace.h> #include <asm/sev.h> -#include <asm/sev-internal.h> #include <asm/insn-eval.h> #include <asm/fpu/xcr.h> #include <asm/processor.h> @@ -46,6 +45,8 @@ #include <asm/cmdline.h> #include <asm/msr.h> +#include "internal.h" + /* Bitmap of SEV features supported by the hypervisor */ u64 sev_hv_features __ro_after_init; SYM_PIC_ALIAS(sev_hv_features); diff --git a/arch/x86/include/asm/sev-internal.h b/arch/x86/coco/sev/internal.h index c58c47c68ab6..c58c47c68ab6 100644 --- a/arch/x86/include/asm/sev-internal.h +++ b/arch/x86/coco/sev/internal.h diff --git a/arch/x86/coco/sev/noinstr.c b/arch/x86/coco/sev/noinstr.c index b527eafb6312..9d94aca4a698 100644 --- a/arch/x86/coco/sev/noinstr.c +++ b/arch/x86/coco/sev/noinstr.c @@ -16,7 +16,8 @@ #include <asm/msr.h> #include <asm/ptrace.h> #include <asm/sev.h> -#include <asm/sev-internal.h> + +#include "internal.h" static __always_inline bool on_vc_stack(struct pt_regs *regs) { diff --git a/arch/x86/coco/sev/vc-handle.c b/arch/x86/coco/sev/vc-handle.c index f08c7505ed82..43f264afd590 100644 --- a/arch/x86/coco/sev/vc-handle.c +++ b/arch/x86/coco/sev/vc-handle.c @@ -23,7 +23,6 @@ #include <asm/init.h> #include <asm/stacktrace.h> #include <asm/sev.h> -#include <asm/sev-internal.h> #include <asm/insn-eval.h> #include <asm/fpu/xcr.h> #include <asm/processor.h> @@ -35,6 +34,8 @@ #include <asm/apic.h> #include <asm/cpuid/api.h> +#include "internal.h" + static enum es_result vc_slow_virt_to_phys(struct ghcb *ghcb, struct es_em_ctxt *ctxt, unsigned long vaddr, phys_addr_t *paddr) { |