diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2023-03-30 15:07:05 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2023-03-30 15:07:05 +0300 |
| commit | 87efe384109f7938c94e74b1ce9c613136f50fd9 (patch) | |
| tree | d4106d027f747717399001f6f7a8c1622936144d /arch/x86/coco/core.c | |
| parent | 812b0597fb4043240724e4c7bed7ba1fe15c0e3f (diff) | |
| parent | 3d91c537296794d5d0773f61abbe7b63f2f132d8 (diff) | |
| download | linux-87efe384109f7938c94e74b1ce9c613136f50fd9.tar.xz | |
Merge branch 'x86/cc' into x86/sev
Pick up the cc_vendor changes.
Diffstat (limited to 'arch/x86/coco/core.c')
| -rw-r--r-- | arch/x86/coco/core.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/arch/x86/coco/core.c b/arch/x86/coco/core.c index f4f0625691fd..73f83233d25d 100644 --- a/arch/x86/coco/core.c +++ b/arch/x86/coco/core.c @@ -13,7 +13,7 @@ #include <asm/coco.h> #include <asm/processor.h> -static enum cc_vendor vendor __ro_after_init; +enum cc_vendor cc_vendor __ro_after_init; static u64 cc_mask __ro_after_init; static bool intel_cc_platform_has(enum cc_attr attr) @@ -99,7 +99,7 @@ static bool amd_cc_platform_has(enum cc_attr attr) bool cc_platform_has(enum cc_attr attr) { - switch (vendor) { + switch (cc_vendor) { case CC_VENDOR_AMD: return amd_cc_platform_has(attr); case CC_VENDOR_INTEL: @@ -119,7 +119,7 @@ u64 cc_mkenc(u64 val) * - for AMD, bit *set* means the page is encrypted * - for AMD with vTOM and for Intel, *clear* means encrypted */ - switch (vendor) { + switch (cc_vendor) { case CC_VENDOR_AMD: if (sev_status & MSR_AMD64_SNP_VTOM) return val & ~cc_mask; @@ -135,7 +135,7 @@ u64 cc_mkenc(u64 val) u64 cc_mkdec(u64 val) { /* See comment in cc_mkenc() */ - switch (vendor) { + switch (cc_vendor) { case CC_VENDOR_AMD: if (sev_status & MSR_AMD64_SNP_VTOM) return val | cc_mask; @@ -149,11 +149,6 @@ u64 cc_mkdec(u64 val) } EXPORT_SYMBOL_GPL(cc_mkdec); -__init void cc_set_vendor(enum cc_vendor v) -{ - vendor = v; -} - __init void cc_set_mask(u64 mask) { cc_mask = mask; |