Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fix from Thomas Gleixner:
"A single fix for an AMD erratum so machines without a BIOS fix work"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/AMD: Apply erratum 665 on machines without a BIOS fix
+12
+12
arch/x86/kernel/cpu/amd.c
+12
arch/x86/kernel/cpu/amd.c
···
669
669
set_cpu_bug(c, X86_BUG_AMD_TLB_MMATCH);
670
670
}
671
671
672
+
#define MSR_AMD64_DE_CFG 0xC0011029
673
+
674
+
static void init_amd_ln(struct cpuinfo_x86 *c)
675
+
{
676
+
/*
677
+
* Apply erratum 665 fix unconditionally so machines without a BIOS
678
+
* fix work.
679
+
*/
680
+
msr_set_bit(MSR_AMD64_DE_CFG, 31);
681
+
}
682
+
672
683
static void init_amd_bd(struct cpuinfo_x86 *c)
673
684
{
674
685
u64 value;
···
737
726
case 6: init_amd_k7(c); break;
738
727
case 0xf: init_amd_k8(c); break;
739
728
case 0x10: init_amd_gh(c); break;
729
+
case 0x12: init_amd_ln(c); break;
740
730
case 0x15: init_amd_bd(c); break;
741
731
}
742
732