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

Commit e6ee94d5 authored by Borislav Petkov's avatar Borislav Petkov Committed by H. Peter Anvin
Browse files

x86, cpu: Convert AMD Erratum 383 



Convert the AMD erratum 383 testing code to the bug infrastructure. This
allows keeping the AMD-specific erratum testing machinery private to
amd.c and not export symbols to modules needlessly.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: http://lkml.kernel.org/r/1363788448-31325-6-git-send-email-bp@alien8.de


Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent c5b41a67

arch/x86/include/asm/cpufeature.h

+1 −0
Original line number Diff line number Diff line
@@ -225,6 +225,7 @@ 
#define X86_BUG_F00F		X86_BUG(0) /* Intel F00F */

#define X86_BUG_FDIV		X86_BUG(1) /* FPU FDIV */

#define X86_BUG_COMA		X86_BUG(2) /* Cyrix 6x86 coma */

#define X86_BUG_AMD_TLB_MMATCH	X86_BUG(3) /* AMD Erratum 383 */



#if defined(__KERNEL__) && !defined(__ASSEMBLY__)

arch/x86/include/asm/processor.h

+0 −1
Original line number Diff line number Diff line
@@ -974,7 +974,6 @@ 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

+6 −2
Original line number Diff line number Diff line
@@ -513,6 +513,8 @@ static void __cpuinit early_init_amd(struct cpuinfo_x86 *c) 
#endif

}



static const int amd_erratum_383[];



static void __cpuinit init_amd(struct cpuinfo_x86 *c)

{

	u32 dummy;
@@ -727,6 +729,9 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c) 
		rdmsrl_safe(MSR_AMD64_BU_CFG2, &value);

		value &= ~(1ULL << 24);

		wrmsrl_safe(MSR_AMD64_BU_CFG2, value);



		if (cpu_has_amd_erratum(amd_erratum_383))

			set_cpu_bug(c, X86_BUG_AMD_TLB_MMATCH);

	}



	rdmsr_safe(MSR_AMD64_PATCH_LEVEL, &c->microcode, &dummy);
@@ -863,9 +868,8 @@ const int amd_erratum_400[] = 
			    AMD_MODEL_RANGE(0x10, 0x2, 0x1, 0xff, 0xf));

EXPORT_SYMBOL_GPL(amd_erratum_400);



const int amd_erratum_383[] =

static const int amd_erratum_383[] =

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

EXPORT_SYMBOL_GPL(amd_erratum_383);



bool cpu_has_amd_erratum(const int *erratum)

{

arch/x86/kvm/svm.c

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

	u64 val;



	if (!cpu_has_amd_erratum(amd_erratum_383))

	if (!static_cpu_has_bug(X86_BUG_AMD_TLB_MMATCH))

		return;



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