diff options
| author | Hans Rosenfeld <hans.rosenfeld@amd.com> | 2010-08-18 16:19:50 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-22 08:50:05 -0700 |
| commit | 7f71a72a1d46765036172b8e450fc000ddd4cb56 (patch) | |
| tree | eb7f9e72e3da3e69cf0b5eb2f2131d8c5e94d166 | |
| parent | 0c199d55f03759e32b8a6877bfbe9c9307995f6c (diff) | |
| download | lwn-7f71a72a1d46765036172b8e450fc000ddd4cb56.tar.gz lwn-7f71a72a1d46765036172b8e450fc000ddd4cb56.zip | |
x86, cpu: Fix regression in AMD errata checking code
commit 07a7795ca2e6e66d00b184efb46bd0e23d90d3fe upstream.
A bug in the family-model-stepping matching code caused the presence of
errata to go undetected when OSVW was not used. This causes hangs on
some K8 systems because the E400 workaround is not enabled.
Signed-off-by: Hans Rosenfeld <hans.rosenfeld@amd.com>
LKML-Reference: <1282141190-930137-1-git-send-email-hans.rosenfeld@amd.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | arch/x86/kernel/cpu/amd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index f98bb34916a9..b203d0dbfc04 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -687,7 +687,7 @@ bool cpu_has_amd_erratum(const int *erratum) } /* OSVW unavailable or ID unknown, match family-model-stepping range */ - ms = (cpu->x86_model << 8) | cpu->x86_mask; + ms = (cpu->x86_model << 4) | cpu->x86_mask; while ((range = *erratum++)) if ((cpu->x86 == AMD_MODEL_RANGE_FAMILY(range)) && (ms >= AMD_MODEL_RANGE_START(range)) && |