History

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

Linus Torvalds committed 10 years ago

Commit 9ca581b2 parents 1c33336 d1992991 file · +12 −0Browse files

Unified · Split

arch/x86/kernel/cpu/amd.c+12−0
@@ -669,6 +669,17 @@ static void init_amd_gh(struct cpuinfo_x86 *c) · 668 unmodified lines
669 set_cpu_bug(c, X86_BUG_AMD_TLB_MMATCH);669 set_cpu_bug(c, X86_BUG_AMD_TLB_MMATCH);
670}670}
671 671
672#define MSR_AMD64_DE_CFG 0xC0011029
673
674static 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
672static void init_amd_bd(struct cpuinfo_x86 *c)683static void init_amd_bd(struct cpuinfo_x86 *c)
673{684{
674 u64 value;685 u64 value;
@@ -726,6 +737,7 @@ static void init_amd(struct cpuinfo_x86 *c) · 51 unmodified lines
726 case 6: init_amd_k7(c); break;737 case 6: init_amd_k7(c); break;
727 case 0xf: init_amd_k8(c); break;738 case 0xf: init_amd_k8(c); break;
728 case 0x10: init_amd_gh(c); break;739 case 0x10: init_amd_gh(c); break;
740 case 0x12: init_amd_ln(c); break;
729 case 0x15: init_amd_bd(c); break;741 case 0x15: init_amd_bd(c); break;
730 }742 }
731 743

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t