Commit c44d1ac0 authored by Linus Torvalds's avatar Linus Torvalds

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 addressing the missing CP8 feature bit in CPUID for a
  range of AMD ZEN models/mask revisions"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/cpu/AMD: Fix erratum 1076 (CPB bit)
parents 2bd6bf03 f7f3dc00
...@@ -763,6 +763,16 @@ static void init_amd_bd(struct cpuinfo_x86 *c) ...@@ -763,6 +763,16 @@ static void init_amd_bd(struct cpuinfo_x86 *c)
} }
} }
static void init_amd_zn(struct cpuinfo_x86 *c)
{
/*
* Fix erratum 1076: CPB feature bit not being set in CPUID. It affects
* all up to and including B1.
*/
if (c->x86_model <= 1 && c->x86_mask <= 1)
set_cpu_cap(c, X86_FEATURE_CPB);
}
static void init_amd(struct cpuinfo_x86 *c) static void init_amd(struct cpuinfo_x86 *c)
{ {
early_init_amd(c); early_init_amd(c);
...@@ -791,6 +801,7 @@ static void init_amd(struct cpuinfo_x86 *c) ...@@ -791,6 +801,7 @@ static void init_amd(struct cpuinfo_x86 *c)
case 0x10: init_amd_gh(c); break; case 0x10: init_amd_gh(c); break;
case 0x12: init_amd_ln(c); break; case 0x12: init_amd_ln(c); break;
case 0x15: init_amd_bd(c); break; case 0x15: init_amd_bd(c); break;
case 0x17: init_amd_zn(c); break;
} }
/* Enable workaround for FXSAVE leak */ /* Enable workaround for FXSAVE leak */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment