Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1be85a6d authored by Hans Rosenfeld's avatar Hans Rosenfeld Committed by H. Peter Anvin
Browse files

x86, cpu: Use AMD errata checking framework for erratum 383 



Use the AMD errata checking framework instead of open-coding the test.

Signed-off-by: default avatarHans Rosenfeld <hans.rosenfeld@amd.com>
LKML-Reference: <1280336972-865982-3-git-send-email-hans.rosenfeld@amd.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 9d8888c2

arch/x86/include/asm/processor.h

+1 −0
Original line number Diff line number Diff line
@@ -1029,6 +1029,7 @@ unsigned long calc_aperfmperf_ratio(struct aperfmperf *old, 
 * AMD errata checking

 */

#ifdef CONFIG_CPU_SUP_AMD

extern const int amd_erratum_383[];

extern const int amd_erratum_400[];

extern bool cpu_has_amd_erratum(const int *);

arch/x86/kernel/cpu/amd.c

+2 −0
Original line number Diff line number Diff line
@@ -632,6 +632,8 @@ const int amd_erratum_400[] = 
	AMD_OSVW_ERRATUM(1, AMD_MODEL_RANGE(0xf, 0x41, 0x2, 0xff, 0xf),

			    AMD_MODEL_RANGE(0x10, 0x2, 0x1, 0xff, 0xf));



const int amd_erratum_383[] =

	AMD_OSVW_ERRATUM(3, AMD_MODEL_RANGE(0x10, 0, 0, 0xff, 0xf));



bool cpu_has_amd_erratum(const int *erratum)

{

arch/x86/kvm/svm.c

+1 −2
Original line number Diff line number Diff line
@@ -383,8 +383,7 @@ static void svm_init_erratum_383(void) 
	int err;

	u64 val;



	/* Only Fam10h is affected */

	if (boot_cpu_data.x86 != 0x10)

	if (!cpu_has_amd_erratum(amd_erratum_383))

		return;



	/* Use _safe variants to not break nested virtualization */