evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

x86, cpu: Convert Cyrix coma bug detection

Browse source 
... to the new facility.

Signed-off-by: Borislav Petkov <bp@suse.de>
Link: http://lkml.kernel.org/r/1363788448-31325-5-git-send-email-bp@alien8.de
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
Borislav Petkov 2013-03-20 15:07:26 +01:00 • committed by H. Peter Anvin
parent 93a829e8e2
commit c5b41a6750
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/x86/include/asm/cpufeature.h
View file

@ -224,6 +224,7 @@
#define X86_BUG_F00F X86_BUG(0) /* Intel F00F */ #define X86_BUG_F00F X86_BUG(0) /* Intel F00F */
#define X86_BUG_FDIV X86_BUG(1) /* FPU FDIV */ #define X86_BUG_FDIV X86_BUG(1) /* FPU FDIV */
#define X86_BUG_COMA X86_BUG(2) /* Cyrix 6x86 coma */
#if defined(__KERNEL__) && !defined(__ASSEMBLY__) #if defined(__KERNEL__) && !defined(__ASSEMBLY__)

1
arch/x86/include/asm/processor.h
View file

@ -91,7 +91,6 @@ struct cpuinfo_x86 {
/* Problems on some 486Dx4's and old 386's: */ /* Problems on some 486Dx4's and old 386's: */
char hard_math; char hard_math;
char rfu; char rfu;
char coma_bug;
char pad0; char pad0;
#else #else
/* Number of 4K pages in DTLB/ITLB combined(in pages): */ /* Number of 4K pages in DTLB/ITLB combined(in pages): */

5
arch/x86/kernel/cpu/cyrix.c
View file

@ -249,7 +249,7 @@ static void __cpuinit init_cyrix(struct cpuinfo_x86 *c)
/* Emulate MTRRs using Cyrix's ARRs. */ /* Emulate MTRRs using Cyrix's ARRs. */
set_cpu_cap(c, X86_FEATURE_CYRIX_ARR); set_cpu_cap(c, X86_FEATURE_CYRIX_ARR);
/* 6x86's contain this bug */ /* 6x86's contain this bug */
c->coma_bug = 1; set_cpu_bug(c, X86_BUG_COMA);
break; break;
case 4: /* MediaGX/GXm or Geode GXM/GXLV/GX1 */ case 4: /* MediaGX/GXm or Geode GXM/GXLV/GX1 */
@ -317,7 +317,8 @@ static void __cpuinit init_cyrix(struct cpuinfo_x86 *c)
/* Enable MMX extensions (App note 108) */ /* Enable MMX extensions (App note 108) */
setCx86_old(CX86_CCR7, getCx86_old(CX86_CCR7)|1); setCx86_old(CX86_CCR7, getCx86_old(CX86_CCR7)|1);
} else { } else {
c->coma_bug = 1; /* 6x86MX, it has the bug. */ /* A 6x86MX - it has the bug. */
set_cpu_bug(c, X86_BUG_COMA);
} }
tmp = (!(dir0_lsn & 7) || dir0_lsn & 1) ? 2 : 0; tmp = (!(dir0_lsn & 7) || dir0_lsn & 1) ? 2 : 0;
Cx86_cb[tmp] = cyrix_model_mult2[dir0_lsn & 7]; Cx86_cb[tmp] = cyrix_model_mult2[dir0_lsn & 7];

2
arch/x86/kernel/cpu/proc.c
View file

@ -36,7 +36,7 @@ static void show_cpuinfo_misc(struct seq_file *m, struct cpuinfo_x86 *c)
"wp\t\t: %s\n", "wp\t\t: %s\n",
static_cpu_has_bug(X86_BUG_FDIV) ? "yes" : "no", static_cpu_has_bug(X86_BUG_FDIV) ? "yes" : "no",
static_cpu_has_bug(X86_BUG_F00F) ? "yes" : "no", static_cpu_has_bug(X86_BUG_F00F) ? "yes" : "no",
c->coma_bug ? "yes" : "no", static_cpu_has_bug(X86_BUG_COMA) ? "yes" : "no",
c->hard_math ? "yes" : "no", c->hard_math ? "yes" : "no",
c->hard_math ? "yes" : "no", c->hard_math ? "yes" : "no",
c->cpuid_level, c->cpuid_level,