| From fb3cdc427a3a887909f36b797d51867f9553dfaa Mon Sep 17 00:00:00 2001 |
| From: Tom Lendacky <thomas.lendacky@amd.com> |
| Date: Wed, 15 Jan 2020 16:05:16 -0600 |
| Subject: [PATCH] x86/CPU/AMD: Ensure clearing of SME/SEV features is |
| maintained |
| |
| commit a006483b2f97af685f0e60f3a547c9ad4c9b9e94 upstream. |
| |
| If the SME and SEV features are present via CPUID, but memory encryption |
| support is not enabled (MSR 0xC001_0010[23]), the feature flags are cleared |
| using clear_cpu_cap(). However, if get_cpu_cap() is later called, these |
| feature flags will be reset back to present, which is not desired. |
| |
| Change from using clear_cpu_cap() to setup_clear_cpu_cap() so that the |
| clearing of the flags is maintained. |
| |
| Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com> |
| Signed-off-by: Borislav Petkov <bp@suse.de> |
| Cc: <stable@vger.kernel.org> # 4.16.x- |
| Link: https://lkml.kernel.org/r/226de90a703c3c0be5a49565047905ac4e94e8f3.1579125915.git.thomas.lendacky@amd.com |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c |
| index 68c363c341bf..363fc23fcd98 100644 |
| --- a/arch/x86/kernel/cpu/amd.c |
| +++ b/arch/x86/kernel/cpu/amd.c |
| @@ -614,9 +614,9 @@ static void early_detect_mem_encrypt(struct cpuinfo_x86 *c) |
| return; |
| |
| clear_all: |
| - clear_cpu_cap(c, X86_FEATURE_SME); |
| + setup_clear_cpu_cap(X86_FEATURE_SME); |
| clear_sev: |
| - clear_cpu_cap(c, X86_FEATURE_SEV); |
| + setup_clear_cpu_cap(X86_FEATURE_SEV); |
| } |
| } |
| |
| -- |
| 2.7.4 |
| |
