From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Liu, Jinsong" Subject: [PATCH] X86: Fix a little mca bug Date: Thu, 19 May 2011 20:03:33 +0800 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="_002_BC00F5384FCFC9499AF06F92E8B78A9E2083B2EDEAshsmsx502ccrc_" Return-path: Content-Language: en-US List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Keir Fraser , "xen-devel@lists.xensource.com" Cc: "Jiang, Yunhong" , "Dong, Eddie" , "Li, Xin" List-Id: xen-devel@lists.xenproject.org --_002_BC00F5384FCFC9499AF06F92E8B78A9E2083B2EDEAshsmsx502ccrc_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X86: Fix a little mca bug At x86_mcinfo_dump(), a little bug at printk information, illusively=20 indicate an CMCI/POLLED error to a MCE error, this will make debug confusin= g. Signed-off-by: Liu, Jinsong diff -r 2fe45768d2c1 xen/arch/x86/cpu/mcheck/mce.c --- a/xen/arch/x86/cpu/mcheck/mce.c Tue May 10 13:58:21 2011 +0800 +++ b/xen/arch/x86/cpu/mcheck/mce.c Thu May 19 15:10:07 2011 +0800 @@ -944,10 +944,11 @@ void x86_mcinfo_dump(struct mc_info *mi) printk(XENLOG_WARNING "CPU%d: Machine Check Exception: %16"PRIx64"\n", mc_global->mc_coreid, mc_global->mc_gstatus); - } else { - printk(XENLOG_WARNING "MCE: The hardware reports a non " - "fatal, correctable incident occurred on " - "CPU %d.\n", + } else if (mc_global->mc_flags & MC_FLAG_CMCI) { + printk(XENLOG_WARNING "CMCI occurred on CPU %d.\n",=20 + mc_global->mc_coreid); + } else if (mc_global->mc_flags & MC_FLAG_POLLED) { + printk(XENLOG_WARNING "POLLED occurred on CPU %d.\n", mc_global->mc_coreid); } = --_002_BC00F5384FCFC9499AF06F92E8B78A9E2083B2EDEAshsmsx502ccrc_ Content-Type: application/octet-stream; name="mca-cleanup.patch" Content-Description: mca-cleanup.patch Content-Disposition: attachment; filename="mca-cleanup.patch"; size=1120; creation-date="Thu, 19 May 2011 15:24:01 GMT"; modification-date="Thu, 19 May 2011 15:13:18 GMT" Content-Transfer-Encoding: base64 Rml4IGEgbGl0dGxlIG1jYSBidWcKCkF0IHg4Nl9tY2luZm9fZHVtcCgpLCBhIGxpdHRsZSBidWcg YXQgcHJpbnRrIGluZm9ybWF0aW9uLCBpbGx1c2l2ZWx5IAppbmRpY2F0ZSBhbiBDTUNJL1BPTExF RCBlcnJvciB0byBhIE1DRSBlcnJvciwgdGhpcyB3aWxsIG1ha2UgZGVidWcgY29uZnVzaW5nLgoK U2lnbmVkLW9mZi1ieTogTGl1LCBKaW5zb25nIDxqaW5zb25nLmxpdUBpbnRlbC5jb20+CgpkaWZm IC1yIDJmZTQ1NzY4ZDJjMSB4ZW4vYXJjaC94ODYvY3B1L21jaGVjay9tY2UuYwotLS0gYS94ZW4v YXJjaC94ODYvY3B1L21jaGVjay9tY2UuYwlUdWUgTWF5IDEwIDEzOjU4OjIxIDIwMTEgKzA4MDAK KysrIGIveGVuL2FyY2gveDg2L2NwdS9tY2hlY2svbWNlLmMJVGh1IE1heSAxOSAxNToxMDowNyAy MDExICswODAwCkBAIC05NDQsMTAgKzk0NCwxMSBAQCB2b2lkIHg4Nl9tY2luZm9fZHVtcChzdHJ1 Y3QgbWNfaW5mbyAqbWkpCiAgICAgICAgIHByaW50ayhYRU5MT0dfV0FSTklORwogICAgICAgICAg ICAgICAgIkNQVSVkOiBNYWNoaW5lIENoZWNrIEV4Y2VwdGlvbjogJTE2IlBSSXg2NCJcbiIsCiAg ICAgICAgICAgICAgICBtY19nbG9iYWwtPm1jX2NvcmVpZCwgbWNfZ2xvYmFsLT5tY19nc3RhdHVz KTsKLSAgICB9IGVsc2UgewotICAgICAgICBwcmludGsoWEVOTE9HX1dBUk5JTkcgIk1DRTogVGhl IGhhcmR3YXJlIHJlcG9ydHMgYSBub24gIgotICAgICAgICAgICAgICAgImZhdGFsLCBjb3JyZWN0 YWJsZSBpbmNpZGVudCBvY2N1cnJlZCBvbiAiCi0gICAgICAgICAgICAgICAiQ1BVICVkLlxuIiwK KyAgICB9IGVsc2UgaWYgKG1jX2dsb2JhbC0+bWNfZmxhZ3MgJiBNQ19GTEFHX0NNQ0kpIHsKKyAg ICAgICAgcHJpbnRrKFhFTkxPR19XQVJOSU5HICJDTUNJIG9jY3VycmVkIG9uIENQVSAlZC5cbiIs IAorICAgICAgICAgICAgICAgbWNfZ2xvYmFsLT5tY19jb3JlaWQpOworICAgIH0gZWxzZSBpZiAo bWNfZ2xvYmFsLT5tY19mbGFncyAmIE1DX0ZMQUdfUE9MTEVEKSB7CisgICAgICAgIHByaW50ayhY RU5MT0dfV0FSTklORyAiUE9MTEVEIG9jY3VycmVkIG9uIENQVSAlZC5cbiIsCiAgICAgICAgICAg ICAgICBtY19nbG9iYWwtPm1jX2NvcmVpZCk7CiAgICAgfQogCg== --_002_BC00F5384FCFC9499AF06F92E8B78A9E2083B2EDEAshsmsx502ccrc_ Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --_002_BC00F5384FCFC9499AF06F92E8B78A9E2083B2EDEAshsmsx502ccrc_--