diff options
author | Liu, Jinsong <jinsong.liu@intel.com> | 2012-06-07 07:56:51 -0400 |
---|---|---|
committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-07-19 15:51:36 -0400 |
commit | cef12ee52b054282461a6d5fe7742755fa6e3bd3 (patch) | |
tree | 01f7c85832beaee257e99c8fb57cf8294774afb6 /arch/x86/xen/enlighten.c | |
parent | 485802a6c524e62b5924849dd727ddbb1497cc71 (diff) |
xen/mce: Add mcelog support for Xen platform
When MCA error occurs, it would be handled by Xen hypervisor first,
and then the error information would be sent to initial domain for logging.
This patch gets error information from Xen hypervisor and convert
Xen format error into Linux format mcelog. This logic is basically
self-contained, not touching other kernel components.
By using tools like mcelog tool users could read specific error information,
like what they did under native Linux.
To test follow directions outlined in Documentation/acpi/apei/einj.txt
Acked-and-tested-by: Borislav Petkov <borislav.petkov@amd.com>
Signed-off-by: Ke, Liping <liping.ke@intel.com>
Signed-off-by: Jiang, Yunhong <yunhong.jiang@intel.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Liu, Jinsong <jinsong.liu@intel.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'arch/x86/xen/enlighten.c')
-rw-r--r-- | arch/x86/xen/enlighten.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index ff962d4b821e..9a6346865c49 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c | |||
@@ -38,6 +38,7 @@ | |||
38 | #include <xen/interface/physdev.h> | 38 | #include <xen/interface/physdev.h> |
39 | #include <xen/interface/vcpu.h> | 39 | #include <xen/interface/vcpu.h> |
40 | #include <xen/interface/memory.h> | 40 | #include <xen/interface/memory.h> |
41 | #include <xen/interface/xen-mca.h> | ||
41 | #include <xen/features.h> | 42 | #include <xen/features.h> |
42 | #include <xen/page.h> | 43 | #include <xen/page.h> |
43 | #include <xen/hvm.h> | 44 | #include <xen/hvm.h> |
@@ -341,9 +342,7 @@ static void __init xen_init_cpuid_mask(void) | |||
341 | unsigned int xsave_mask; | 342 | unsigned int xsave_mask; |
342 | 343 | ||
343 | cpuid_leaf1_edx_mask = | 344 | cpuid_leaf1_edx_mask = |
344 | ~((1 << X86_FEATURE_MCE) | /* disable MCE */ | 345 | ~((1 << X86_FEATURE_MTRR) | /* disable MTRR */ |
345 | (1 << X86_FEATURE_MCA) | /* disable MCA */ | ||
346 | (1 << X86_FEATURE_MTRR) | /* disable MTRR */ | ||
347 | (1 << X86_FEATURE_ACC)); /* thermal monitoring */ | 346 | (1 << X86_FEATURE_ACC)); /* thermal monitoring */ |
348 | 347 | ||
349 | if (!xen_initial_domain()) | 348 | if (!xen_initial_domain()) |