diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-09-19 12:30:55 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-09-19 12:30:55 +0800 |
| commit | fe522b1745154e8889a04b87e76d53ccece41d4a (patch) | |
| tree | a3936cc8a12b60bcb2f5d7dd73ae48d7dbf55f81 /arch/x86/kernel/cpu/amd.c | |
| parent | 3b5fdc0c9bc5279975f1c775a2d7dd4ccbf2f40f (diff) | |
| parent | a8e202812b52b88e2a33d52687b3b0260706231a (diff) | |
Merge tag 'v3.18.42' into linux-linaro-lsk-v3.18lsk-v3.18-16.09
This is the 3.18.42 stable release
Diffstat (limited to 'arch/x86/kernel/cpu/amd.c')
| -rw-r--r-- | arch/x86/kernel/cpu/amd.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 813d29d00a17..a86afc3741dc 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -603,6 +603,17 @@ static void init_amd_gh(struct cpuinfo_x86 *c) set_cpu_bug(c, X86_BUG_AMD_TLB_MMATCH); } +#define MSR_AMD64_DE_CFG 0xC0011029 + +static void init_amd_ln(struct cpuinfo_x86 *c) +{ + /* + * Apply erratum 665 fix unconditionally so machines without a BIOS + * fix work. + */ + msr_set_bit(MSR_AMD64_DE_CFG, 31); +} + static void init_amd_bd(struct cpuinfo_x86 *c) { u64 value; @@ -672,6 +683,7 @@ static void init_amd(struct cpuinfo_x86 *c) case 6: init_amd_k7(c); break; case 0xf: init_amd_k8(c); break; case 0x10: init_amd_gh(c); break; + case 0x12: init_amd_ln(c); break; case 0x15: init_amd_bd(c); break; } |