[PATCH v2 2/4] KVM: SVM: Use cc_platform_has instead of CPU feature flags

From: Mario Limonciello
Date: Fri Feb 11 2022 - 16:06:22 EST


The CPU feature flags may have been cleared earlier by the kernel
if the BIOS didn't activate features. Instead use `cc_platform_has`
to determine that SEV was enabled.

Signed-off-by: Mario Limonciello <mario.limonciello@xxxxxxx>
---
arch/x86/kvm/svm/sev.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c
index 17b53457d866..d3d1ec78d927 100644
--- a/arch/x86/kvm/svm/sev.c
+++ b/arch/x86/kvm/svm/sev.c
@@ -2105,7 +2105,7 @@ void __init sev_hardware_setup(void)
* CPU supports decode assists, which is mandatory for SEV guests to
* support instruction emulation.
*/
- if (!boot_cpu_has(X86_FEATURE_SEV) ||
+ if (!cc_platform_has(CC_ATTR_GUEST_MEM_ENCRYPT) ||
WARN_ON_ONCE(!boot_cpu_has(X86_FEATURE_DECODEASSISTS)))
goto out;

@@ -2153,7 +2153,7 @@ void __init sev_hardware_setup(void)
goto out;

/* Does the CPU support SEV-ES? */
- if (!boot_cpu_has(X86_FEATURE_SEV_ES))
+ if (!cc_platform_has(CC_ATTR_GUEST_STATE_ENCRYPT))
goto out;

/* Has the system been allocated ASIDs for SEV-ES? */
--
2.34.1