[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 17/32] hw/i386/fw_cfg: Set SGX bits in feature control fw_cfg
From: |
Yang Zhong |
Subject: |
[PATCH v2 17/32] hw/i386/fw_cfg: Set SGX bits in feature control fw_cfg accordingly |
Date: |
Tue, 11 May 2021 14:20:36 +0800 |
From: Sean Christopherson <sean.j.christopherson@intel.com>
Request SGX an SGX Launch Control to be enabled in FEATURE_CONTROL
when the features are exposed to the guest. Our design is the SGX
Launch Control bit will be unconditionally set in FEATURE_CONTROL,
which is unlike host bios.
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
---
hw/i386/fw_cfg.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/hw/i386/fw_cfg.c b/hw/i386/fw_cfg.c
index e48a54fa36..ec99743c22 100644
--- a/hw/i386/fw_cfg.c
+++ b/hw/i386/fw_cfg.c
@@ -157,7 +157,7 @@ void fw_cfg_build_feature_control(MachineState *ms,
FWCfgState *fw_cfg)
{
X86CPU *cpu = X86_CPU(ms->possible_cpus->cpus[0].cpu);
CPUX86State *env = &cpu->env;
- uint32_t unused, ecx, edx;
+ uint32_t unused, ebx, ecx, edx;
uint64_t feature_control_bits = 0;
uint64_t *val;
@@ -172,6 +172,14 @@ void fw_cfg_build_feature_control(MachineState *ms,
FWCfgState *fw_cfg)
feature_control_bits |= FEATURE_CONTROL_LMCE;
}
+ cpu_x86_cpuid(env, 0x7, 0, &unused, &ebx, &ecx, &unused);
+ if (ebx & CPUID_7_0_EBX_SGX) {
+ feature_control_bits |= FEATURE_CONTROL_SGX;
+ }
+ if (ecx & CPUID_7_0_ECX_SGX_LC) {
+ feature_control_bits |= FEATURE_CONTROL_SGX_LC;
+ }
+
if (!feature_control_bits) {
return;
}
--
2.29.2.334.gfaefdd61ec
- [PATCH v2 08/32] i386: Add SGX CPUID leaf FEAT_SGX_12_0_EBX, (continued)
- [PATCH v2 08/32] i386: Add SGX CPUID leaf FEAT_SGX_12_0_EBX, Yang Zhong, 2021/05/11
- [PATCH v2 07/32] i386: Add SGX CPUID leaf FEAT_SGX_12_0_EAX, Yang Zhong, 2021/05/11
- [PATCH v2 11/32] i386: Add feature control MSR dependency when SGX is enabled, Yang Zhong, 2021/05/11
- [PATCH v2 09/32] i386: Add SGX CPUID leaf FEAT_SGX_12_1_EAX, Yang Zhong, 2021/05/11
- [PATCH v2 10/32] i386: Add get/set/migrate support for SGX_LEPUBKEYHASH MSRs, Yang Zhong, 2021/05/11
- [PATCH v2 12/32] i386: Update SGX CPUID info according to hardware/KVM/user input, Yang Zhong, 2021/05/11
- [PATCH v2 13/32] linux-headers: Add placeholder for KVM_CAP_SGX_ATTRIBUTE, Yang Zhong, 2021/05/11
- [PATCH v2 14/32] i386: kvm: Add support for exposing PROVISIONKEY to guest, Yang Zhong, 2021/05/11
- [PATCH v2 15/32] i386: Propagate SGX CPUID sub-leafs to KVM, Yang Zhong, 2021/05/11
- [PATCH v2 16/32] Adjust min CPUID level to 0x12 when SGX is enabled, Yang Zhong, 2021/05/11
- [PATCH v2 17/32] hw/i386/fw_cfg: Set SGX bits in feature control fw_cfg accordingly,
Yang Zhong <=
- [PATCH v2 18/32] hw/i386/pc: Account for SGX EPC sections when calculating device memory, Yang Zhong, 2021/05/11
- [PATCH v2 19/32] i386/pc: Add e820 entry for SGX EPC section(s), Yang Zhong, 2021/05/11
- [PATCH v2 20/32] i386: acpi: Add SGX EPC entry to ACPI tables, Yang Zhong, 2021/05/11
- [PATCH v2 21/32] q35: Add support for SGX EPC, Yang Zhong, 2021/05/11
- [PATCH v2 24/32] sgx-epc: Add the reset interface for sgx-epc virt device, Yang Zhong, 2021/05/11
- [PATCH v2 22/32] i440fx: Add support for SGX EPC, Yang Zhong, 2021/05/11
- [PATCH v2 23/32] hostmem: Add the reset interface for EPC backend reset, Yang Zhong, 2021/05/11
- [PATCH v2 25/32] qmp: Add query-sgx command, Yang Zhong, 2021/05/11
- [PATCH v2 26/32] hmp: Add 'info sgx' command, Yang Zhong, 2021/05/11
- [PATCH v2 27/32] i386: Add sgx_get_info() interface, Yang Zhong, 2021/05/11