soc/intel/skl,cpu/intel: copy AES-NI locking to common cpu code

Copy the AES-NI locking function to common cpu code to be able to reuse
it.

This change only copies the code and adds the MSR header file. Any
further rework and later deduplication on the platforms code is done in
the follow-up changes.

Change-Id: I81ad5c0d4797b139435c57d3af0a95db94a5c15e
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46272
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Michael Niewöhner 2020-10-11 13:00:27 +02:00 committed by Nico Huber
parent e92c84050b
commit 8b4a9380b5
3 changed files with 37 additions and 0 deletions

View File

@ -27,4 +27,10 @@ bool intel_ht_supported(void);
*/ */
bool intel_ht_sibling(void); bool intel_ht_sibling(void);
/*
* Lock AES-NI feature (MSR_FEATURE_CONFIG) to prevent unintended disabling
* as suggested in Intel document 325384-070US.
*/
void set_aesni_lock(void);
#endif #endif

View File

@ -3,6 +3,7 @@
#include <acpi/acpigen.h> #include <acpi/acpigen.h>
#include <arch/cpu.h> #include <arch/cpu.h>
#include <console/console.h> #include <console/console.h>
#include <cpu/intel/msr.h>
#include <cpu/x86/msr.h> #include <cpu/x86/msr.h>
#include "common.h" #include "common.h"
@ -264,3 +265,22 @@ void cpu_init_cppc_config(struct cppc_config *config, u32 version)
config->regs[CPPC_AUTO_SELECT] = msr; config->regs[CPPC_AUTO_SELECT] = msr;
} }
} }
/*
* Lock AES-NI feature (MSR_FEATURE_CONFIG) to prevent unintended disabling
* as suggested in Intel document 325384-070US.
*/
void set_aesni_lock(void)
{
msr_t msr;
/* Only run once per core as specified in the MSR datasheet */
if (intel_ht_sibling())
return;
msr = rdmsr(MSR_FEATURE_CONFIG);
if ((msr.lo & 1) == 0) {
msr.lo |= 1;
wrmsr(MSR_FEATURE_CONFIG, msr);
}
}

View File

@ -0,0 +1,11 @@
#ifndef CPU_INTEL_MSR_H
#define CPU_INTEL_MSR_H
/*
* Common MSRs for Intel CPUs
*/
#define MSR_FEATURE_CONFIG 0x13c
#define AESNI_LOCK_BIT 0
#endif /* CPU_INTEL_MSR_H */