Commit d6952578 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'please-pull-eMCA-fix' of... 

Merge tag 'please-pull-eMCA-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/mce

Pull MCE updates from Tony Luck:

 "There is a enhanced error logging mechanism for Xeon processors.

  Full description is here:

    http://www.intel.com/content/www/us/en/architecture-and-technology/enhanced-mca-logging-xeon-paper.html



  This patch series provides a module (and support code) to
  check for an extended error log and print extra details about
  the error on the console.
  "

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 88829dfe 56507694

arch/ia64/kernel/setup.c

+1 −0
Original line number Diff line number Diff line
@@ -1063,6 +1063,7 @@ check_bugs (void) 
static int __init run_dmi_scan(void)

{

	dmi_scan_machine();

	dmi_memdev_walk();

	dmi_set_dump_stack_arch_desc();

	return 0;

}

arch/x86/include/asm/mce.h

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#define MCG_EXT_CNT_SHIFT	16

#define MCG_EXT_CNT(c)		(((c) & MCG_EXT_CNT_MASK) >> MCG_EXT_CNT_SHIFT)

#define MCG_SER_P		(1ULL<<24)   /* MCA recovery/new status bits */

#define MCG_ELOG_P		(1ULL<<26)   /* Extended error log supported */



/* MCG_STATUS register defines */

#define MCG_STATUS_RIPV  (1ULL<<0)   /* restart ip valid */

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

+1 −2
Original line number Diff line number Diff line
@@ -42,8 +42,7 @@ void apei_mce_report_mem_error(int corrected, struct cper_sec_mem_err *mem_err) 
	struct mce m;



	/* Only corrected MC is reported */

	if (!corrected || !(mem_err->validation_bits &

				CPER_MEM_VALID_PHYSICAL_ADDRESS))

	if (!corrected || !(mem_err->validation_bits & CPER_MEM_VALID_PA))

		return;



	mce_setup(&m);

arch/x86/kernel/setup.c

+1 −0
Original line number Diff line number Diff line
@@ -993,6 +993,7 @@ void __init setup_arch(char **cmdline_p) 
		efi_init();



	dmi_scan_machine();

	dmi_memdev_walk();

	dmi_set_dump_stack_arch_desc();



	/*

drivers/acpi/Kconfig

+19 −0
Original line number Diff line number Diff line
@@ -372,4 +372,23 @@ config ACPI_BGRT 


source "drivers/acpi/apei/Kconfig"



config ACPI_EXTLOG

	tristate "Extended Error Log support"

	depends on X86_MCE && ACPI_APEI

	default n

	help

	  Certain usages such as Predictive Failure Analysis (PFA) require

	  more information about the error than what can be described in

	  processor machine check banks. Most server processors log

	  additional information about the error in processor uncore

	  registers. Since the addresses and layout of these registers vary

	  widely from one processor to another, system software cannot

	  readily make use of them. To complicate matters further, some of

	  the additional error information cannot be constructed without

	  detailed knowledge about platform topology.



	  Enhanced MCA Logging allows firmware to provide additional error

	  information to system software, synchronous with MCE or CMCI. This

	  driver adds support for that functionality.



endif	# ACPI

CRA Git | Maintained and supported by SUSTech CRA and CCSE