niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

x86/coco: Get rid of accessor functions

Browse source 
cc_vendor is __ro_after_init and thus can be used directly.

No functional changes.

Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20230508121957.32341-1-bp@alien8.de
This commit is contained in:
Borislav Petkov (AMD) 2023-05-08 12:44:28 +02:00
parent f710ac5442
commit da86eb9611
5 changed files with 5 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/x86/coco/core.c
View file

@ -13,7 +13,7 @@
#include <asm/coco.h> #include <asm/coco.h>
#include <asm/processor.h> #include <asm/processor.h>
enum cc_vendor cc_vendor __ro_after_init; enum cc_vendor cc_vendor __ro_after_init = CC_VENDOR_NONE;
static u64 cc_mask __ro_after_init; static u64 cc_mask __ro_after_init;
static bool noinstr intel_cc_platform_has(enum cc_attr attr) static bool noinstr intel_cc_platform_has(enum cc_attr attr)

2
arch/x86/coco/tdx/tdx.c
View file

@ -852,7 +852,7 @@ void __init tdx_early_init(void)
setup_force_cpu_cap(X86_FEATURE_TDX_GUEST); setup_force_cpu_cap(X86_FEATURE_TDX_GUEST);
cc_set_vendor(CC_VENDOR_INTEL); cc_vendor = CC_VENDOR_INTEL;
tdx_parse_tdinfo(&cc_mask); tdx_parse_tdinfo(&cc_mask);
cc_set_mask(cc_mask); cc_set_mask(cc_mask);

2
arch/x86/hyperv/ivm.c
View file

@ -364,7 +364,7 @@ void __init hv_vtom_init(void)
* Set it here to indicate a vTOM VM. * Set it here to indicate a vTOM VM.
*/ */
sev_status = MSR_AMD64_SNP_VTOM; sev_status = MSR_AMD64_SNP_VTOM;
cc_set_vendor(CC_VENDOR_AMD); cc_vendor = CC_VENDOR_AMD;
cc_set_mask(ms_hyperv.shared_gpa_boundary); cc_set_mask(ms_hyperv.shared_gpa_boundary);
physical_mask &= ms_hyperv.shared_gpa_boundary - 1; physical_mask &= ms_hyperv.shared_gpa_boundary - 1;

19
arch/x86/include/asm/coco.h
View file

@ -10,30 +10,13 @@ enum cc_vendor {
CC_VENDOR_INTEL, CC_VENDOR_INTEL,
}; };
#ifdef CONFIG_ARCH_HAS_CC_PLATFORM
extern enum cc_vendor cc_vendor; extern enum cc_vendor cc_vendor;
static inline enum cc_vendor cc_get_vendor(void) #ifdef CONFIG_ARCH_HAS_CC_PLATFORM
{
return cc_vendor;
}
static inline void cc_set_vendor(enum cc_vendor vendor)
{
cc_vendor = vendor;
}
void cc_set_mask(u64 mask); void cc_set_mask(u64 mask);
u64 cc_mkenc(u64 val); u64 cc_mkenc(u64 val);
u64 cc_mkdec(u64 val); u64 cc_mkdec(u64 val);
#else #else
static inline enum cc_vendor cc_get_vendor(void)
{
return CC_VENDOR_NONE;
}
static inline void cc_set_vendor(enum cc_vendor vendor) { }
static inline u64 cc_mkenc(u64 val) static inline u64 cc_mkenc(u64 val)
{ {
return val; return val;

2
arch/x86/mm/mem_encrypt_identity.c
View file

@ -612,7 +612,7 @@ void __init sme_enable(struct boot_params *bp)
out: out:
if (sme_me_mask) { if (sme_me_mask) {
physical_mask &= ~sme_me_mask; physical_mask &= ~sme_me_mask;
cc_set_vendor(CC_VENDOR_AMD); cc_vendor = CC_VENDOR_AMD;
cc_set_mask(sme_me_mask); cc_set_mask(sme_me_mask);
} }
} }