[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 16/32] Adjust min CPUID level to 0x12 when SGX is enabled
From: |
Yang Zhong |
Subject: |
[PATCH 16/32] Adjust min CPUID level to 0x12 when SGX is enabled |
Date: |
Mon, 19 Apr 2021 18:01:40 +0800 |
From: Sean Christopherson <sean.j.christopherson@intel.com>
SGX capabilities are enumerated through CPUID_0x12.
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
---
target/i386/cpu.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 63253bf606..41050960c5 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -6741,6 +6741,11 @@ static void x86_cpu_expand_features(X86CPU *cpu, Error
**errp)
if (sev_enabled()) {
x86_cpu_adjust_level(cpu, &env->cpuid_min_xlevel, 0x8000001F);
}
+
+ /* SGX requires CPUID[0x12] for EPC enumeration */
+ if (env->features[FEAT_7_0_EBX] & CPUID_7_0_EBX_SGX) {
+ x86_cpu_adjust_level(cpu, &env->cpuid_min_level, 0x12);
+ }
}
/* Set cpuid_*level* based on cpuid_min_*level, if not explicitly set */
--
2.29.2.334.gfaefdd61ec
- [PATCH 06/32] i386: Add primary SGX CPUID and MSR defines, (continued)
- [PATCH 06/32] i386: Add primary SGX CPUID and MSR defines, Yang Zhong, 2021/04/19
- [PATCH 05/32] vl: Add "sgx-epc" option to expose SGX EPC sections to guest, Yang Zhong, 2021/04/19
- [PATCH 09/32] i386: Add SGX CPUID leaf FEAT_SGX_12_1_EAX, Yang Zhong, 2021/04/19
- [PATCH 10/32] i386: Add get/set/migrate support for SGX_LEPUBKEYHASH MSRs, Yang Zhong, 2021/04/19
- [PATCH 07/32] i386: Add SGX CPUID leaf FEAT_SGX_12_0_EAX, Yang Zhong, 2021/04/19
- [PATCH 12/32] i386: Update SGX CPUID info according to hardware/KVM/user input, Yang Zhong, 2021/04/19
- [PATCH 11/32] i386: Add feature control MSR dependency when SGX is enabled, Yang Zhong, 2021/04/19
- [PATCH 13/32] linux-headers: Add placeholder for KVM_CAP_SGX_ATTRIBUTE, Yang Zhong, 2021/04/19
- [PATCH 15/32] i386: Propagate SGX CPUID sub-leafs to KVM, Yang Zhong, 2021/04/19
- [PATCH 14/32] i386: kvm: Add support for exposing PROVISIONKEY to guest, Yang Zhong, 2021/04/19
- [PATCH 16/32] Adjust min CPUID level to 0x12 when SGX is enabled,
Yang Zhong <=
- [PATCH 17/32] hw/i386/fw_cfg: Set SGX bits in feature control fw_cfg accordingly, Yang Zhong, 2021/04/19
- [PATCH 18/32] hw/i386/pc: Account for SGX EPC sections when calculating device memory, Yang Zhong, 2021/04/19
- [PATCH 19/32] i386/pc: Add e820 entry for SGX EPC section(s), Yang Zhong, 2021/04/19
- [PATCH 20/32] i386: acpi: Add SGX EPC entry to ACPI tables, Yang Zhong, 2021/04/19
- [PATCH 21/32] q35: Add support for SGX EPC, Yang Zhong, 2021/04/19
- [PATCH 22/32] i440fx: Add support for SGX EPC, Yang Zhong, 2021/04/19
- [PATCH 23/32] hostmem: Add the reset interface for EPC backend reset, Yang Zhong, 2021/04/19
- [PATCH 24/32] sgx-epc: Add the reset interface for sgx-epc virt device, Yang Zhong, 2021/04/19
- [PATCH 25/32] qmp: Add query-sgx command, Yang Zhong, 2021/04/19
- [PATCH 26/32] hmp: Add 'info sgx' command, Yang Zhong, 2021/04/19