Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffb173e6 authored by Tony Luck's avatar Tony Luck Committed by Thomas Gleixner
Browse files

x86/mce: Drop X86_FEATURE_MCE_RECOVERY and the related model string test 



We now have a better way to determine if we are running on a cpu that
supports machine check recovery. Free up this feature bit.

Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
Acked-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Boris Petkov <bp@suse.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/d5db39e08d46cf1012d94d3902275d08ba931926.1472754712.git.tony.luck@intel.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 9a6fb28a

arch/x86/include/asm/cpufeatures.h

+0 −1
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ 
#define X86_FEATURE_APERFMPERF	( 3*32+28) /* APERFMPERF */

#define X86_FEATURE_EAGER_FPU	( 3*32+29) /* "eagerfpu" Non lazy FPU restore */

#define X86_FEATURE_NONSTOP_TSC_S3 ( 3*32+30) /* TSC doesn't stop in S3 state */

#define X86_FEATURE_MCE_RECOVERY ( 3*32+31) /* cpu has recoverable machine checks */



/* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */

#define X86_FEATURE_XMM3	( 4*32+ 0) /* "pni" SSE-3 */

arch/x86/kernel/cpu/mcheck/mce.c

+0 −11
Original line number Diff line number Diff line
@@ -1634,17 +1634,6 @@ static int __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c) 


		if (c->x86 == 6 && c->x86_model == 45)

			quirk_no_way_out = quirk_sandybridge_ifu;

		/*

		 * MCG_CAP.MCG_SER_P is necessary but not sufficient to know

		 * whether this processor will actually generate recoverable

		 * machine checks. Check to see if this is an E7 model Xeon.

		 * We can't do a model number check because E5 and E7 use the

		 * same model number. E5 doesn't support recovery, E7 does.

		 */

		if (mca_cfg.recovery || (mca_cfg.ser &&

			!strncmp(c->x86_model_id,

				 "Intel(R) Xeon(R) CPU E7-", 24)))

			set_cpu_cap(c, X86_FEATURE_MCE_RECOVERY);

	}

	if (cfg->monarch_timeout < 0)

		cfg->monarch_timeout = 0;