diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-02-26 11:06:48 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-02-26 11:10:35 +0100 |
| commit | 2e5fc4786b7ad311393a70894c773aa106c6dbb3 (patch) | |
| tree | 5eb9d382795a6739f1c556eaf69fdcfa6b265b7e /arch/x86/include/asm/coco.h | |
| parent | 29cd85557d8b8b3d068b5c29fdd9a0fa9ca7ef7a (diff) | |
| parent | ee8ff8768735edc3e013837c4416f819543ddc17 (diff) | |
Merge branch 'x86/sev' into x86/boot, to resolve conflicts and to pick up dependent tree
We are going to queue up a number of patches that depend
on fresh changes in x86/sev - merge in that branch to
reduce the number of conflicts going forward.
Also resolve a current conflict with x86/sev.
Conflicts:
arch/x86/include/asm/coco.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/coco.h')
| -rw-r--r-- | arch/x86/include/asm/coco.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/x86/include/asm/coco.h b/arch/x86/include/asm/coco.h index 76c310b19b11..8a1cd359248f 100644 --- a/arch/x86/include/asm/coco.h +++ b/arch/x86/include/asm/coco.h @@ -2,6 +2,7 @@ #ifndef _ASM_X86_COCO_H #define _ASM_X86_COCO_H +#include <asm/asm.h> #include <asm/types.h> enum cc_vendor { @@ -10,9 +11,14 @@ enum cc_vendor { CC_VENDOR_INTEL, }; +extern u64 cc_mask; #ifdef CONFIG_ARCH_HAS_CC_PLATFORM extern enum cc_vendor cc_vendor; -void cc_set_mask(u64 mask); +static inline void cc_set_mask(u64 mask) +{ + RIP_REL_REF(cc_mask) = mask; +} + u64 cc_mkenc(u64 val); u64 cc_mkdec(u64 val); #else |