From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [4.9,49/51] EDAC, mce_amd: Print IPID and Syndrome on a separate line From: Greg Kroah-Hartman Message-Id: <20171019134844.372385933@linuxfoundation.org> Date: Thu, 19 Oct 2017 15:49:10 +0200 To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yazen Ghannam , linux-edac , Borislav Petkov , Sasha Levin List-ID: NC45LXN0YWJsZSByZXZpZXcgcGF0Y2guICBJZiBhbnlvbmUgaGFzIGFueSBvYmplY3Rpb25zLCBw bGVhc2UgbGV0IG1lIGtub3cuCgotLS0tLS0tLS0tLS0tLS0tLS0KCkZyb206IFlhemVuIEdoYW5u YW0gPFlhemVuLkdoYW5uYW1AYW1kLmNvbT4KCgpbIFVwc3RyZWFtIGNvbW1pdCA3NWJmMmY2NDc4 Y2FiOWIwYzFkN2Y1ZjY3NGE3NjVkMWUyYWQ1MzBlIF0KCkN1cnJlbnRseSwgdGhlIElQSUQgYW5k IFN5bmRyb21lIGFyZSBwcmludGVkIG9uIHRoZSBzYW1lIGxpbmUgYXMgdGhlCkFkZHJlc3MuIFRo ZXJlIGFyZSBjYXNlcyB3aGVuIHdlIGNhbiBoYXZlIGEgdmFsaWQgU3luZHJvbWUgYnV0IG5vdCBh CnZhbGlkIEFkZHJlc3MuCgpGb3IgZXhhbXBsZSwgdGhlIE1DQV9TWU5EIHJlZ2lzdGVyIGNhbiBi ZSB1c2VkIHRvIGhvbGQgbW9yZSBkZXRhaWxlZAplcnJvciBpbmZvIHRoYXQgdGhlIGhhcmR3YXJl IGZvbGtzIGNhbiB1c2UuIEl0J3Mgbm90IGp1c3QgRFJBTSBFQ0MKc3luZHJvbWVzLiBUaGVyZSBh cmUgc29tZSBlcnJvciB0eXBlcyB0aGF0IGFyZW4ndCByZWxhdGVkIHRvIG1lbW9yeSB0aGF0Cm1h eSBoYXZlIHZhbGlkIHN5bmRyb21lcywgbGlrZSBzb21lIGVycm9ycyByZWxhdGVkIHRvIGxpbmtz IGluIHRoZSBEYXRhCkZhYnJpYywgZXRjLgoKSW4gdGhlc2UgY2FzZXMsIHRoZSBJUElEIGFuZCBT eW5kcm9tZSBhcmUgbm90IHByaW50ZWQgYXQgdGhlIHNhbWUgbG9nCmxldmVsIGFzIHRoZSByZXN0 IG9mIHRoZSBzdGFuemEsIHNvIHVzZXJzIHdvbid0IHNlZSB0aGVtIG9uIHRoZSBjb25zb2xlLgoK Q29uc29sZToKICBbSGFyZHdhcmUgRXJyb3JdOiBDUFU6MTYgKDE3OjE6MCkgTUMyMl9TVEFUVVNb T3ZlcnxDRXxNaXNjVnwtfC18LXwtfFN5bmRWfC1dOiAweGQ4MjAwMDAwMDAwMjA4MGIKICBbSGFy ZHdhcmUgRXJyb3JdOiBQb3dlciwgSW50ZXJydXB0cywgZXRjLiBFeHRlbmRlZCBFcnJvciBDb2Rl OiAyCgpEbWVzZzoKICBbSGFyZHdhcmUgRXJyb3JdOiBDUFU6MTYgKDE3OjE6MCkgTUMyMl9TVEFU VVNbT3ZlcnxDRXxNaXNjVnwtfC18LXwtfFN5bmRWfC1dOiAweGQ4MjAwMDAwMDAwMjA4MGIKICAs IFN5bmRyb21lOiAweDAwMDAwMDAxMGI0MDQwMDAsIElQSUQ6IDB4MDAwMTAwMmUwMDAwMDAwMgog IFtIYXJkd2FyZSBFcnJvcl06IFBvd2VyLCBJbnRlcnJ1cHRzLCBldGMuIEV4dGVuZGVkIEVycm9y IENvZGU6IDIKClByaW50IHRoZSBJUElEIGZpcnN0IGFuZCBvbiBhIG5ldyBsaW5lLiBUaGUgSVBJ RCBzaG91bGQgYWx3YXlzIGJlCnByaW50ZWQgb24gU01DQSBzeXN0ZW1zLiBUaGUgU3luZHJvbWUg d2lsbCB0aGVuIGJlIHByaW50ZWQgd2l0aCB0aGUgSVBJRAphbmQgYXQgdGhlIHNhbWUgbG9nIGxl dmVsIHdoZW4gdmFsaWQ6CgogIFtIYXJkd2FyZSBFcnJvcl06IENQVToxNiAoMTc6MTowKSBNQzIy X1NUQVRVU1tPdmVyfENFfE1pc2NWfC18LXwtfC18U3luZFZ8LV06IDB4ZDgyMDAwMDAwMDAyMDgw YgogIFtIYXJkd2FyZSBFcnJvcl06IElQSUQ6IDB4MDAwMTAwMmUwMDAwMDAwMiwgU3luZHJvbWU6 IDB4MDAwMDAwMDEwYjQwNDAwMAogIFtIYXJkd2FyZSBFcnJvcl06IFBvd2VyLCBJbnRlcnJ1cHRz LCBldGMuIEV4dGVuZGVkIEVycm9yIENvZGU6IDIKClNpZ25lZC1vZmYtYnk6IFlhemVuIEdoYW5u YW0gPFlhemVuLkdoYW5uYW1AYW1kLmNvbT4KQ2M6IGxpbnV4LWVkYWMgPGxpbnV4LWVkYWNAdmdl ci5rZXJuZWwub3JnPgpMaW5rOiBodHRwOi8vbGttbC5rZXJuZWwub3JnL3IvMTQ4NzE5MjE4Mi0y NDc0LTEtZ2l0LXNlbmQtZW1haWwtWWF6ZW4uR2hhbm5hbUBhbWQuY29tClNpZ25lZC1vZmYtYnk6 IEJvcmlzbGF2IFBldGtvdiA8YnBAc3VzZS5kZT4KU2lnbmVkLW9mZi1ieTogU2FzaGEgTGV2aW4g PGFsZXhhbmRlci5sZXZpbkB2ZXJpem9uLmNvbT4KU2lnbmVkLW9mZi1ieTogR3JlZyBLcm9haC1I YXJ0bWFuIDxncmVna2hAbGludXhmb3VuZGF0aW9uLm9yZz4KLS0tCiBkcml2ZXJzL2VkYWMvbWNl X2FtZC5jIHwgICAgOSArKysrLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyks IDUgZGVsZXRpb25zKC0pCgoKCi0tClRvIHVuc3Vic2NyaWJlIGZyb20gdGhpcyBsaXN0OiBzZW5k IHRoZSBsaW5lICJ1bnN1YnNjcmliZSBsaW51eC1lZGFjIiBpbgp0aGUgYm9keSBvZiBhIG1lc3Nh Z2UgdG8gbWFqb3Jkb21vQHZnZXIua2VybmVsLm9yZwpNb3JlIG1ham9yZG9tbyBpbmZvIGF0ICBo dHRwOi8vdmdlci5rZXJuZWwub3JnL21ham9yZG9tby1pbmZvLmh0bWwKCi0tLSBhL2RyaXZlcnMv ZWRhYy9tY2VfYW1kLmMKKysrIGIvZHJpdmVycy9lZGFjL21jZV9hbWQuYwpAQCAtOTgxLDIwICs5 ODEsMTkgQEAgaW50IGFtZF9kZWNvZGVfbWNlKHN0cnVjdCBub3RpZmllcl9ibG9jawogCXByX2Nv bnQoIl06IDB4JTAxNmxseFxuIiwgbS0+c3RhdHVzKTsKIAogCWlmIChtLT5zdGF0dXMgJiBNQ0lf U1RBVFVTX0FERFJWKQotCQlwcl9lbWVyZyhIV19FUlIgIkVycm9yIEFkZHI6IDB4JTAxNmxseCIs IG0tPmFkZHIpOworCQlwcl9lbWVyZyhIV19FUlIgIkVycm9yIEFkZHI6IDB4JTAxNmxseFxuIiwg bS0+YWRkcik7CiAKIAlpZiAoYm9vdF9jcHVfaGFzKFg4Nl9GRUFUVVJFX1NNQ0EpKSB7CisJCXBy X2VtZXJnKEhXX0VSUiAiSVBJRDogMHglMDE2bGx4IiwgbS0+aXBpZCk7CisKIAkJaWYgKG0tPnN0 YXR1cyAmIE1DSV9TVEFUVVNfU1lORFYpCiAJCQlwcl9jb250KCIsIFN5bmRyb21lOiAweCUwMTZs bHgiLCBtLT5zeW5kKTsKIAotCQlwcl9jb250KCIsIElQSUQ6IDB4JTAxNmxseCIsIG0tPmlwaWQp OwotCiAJCXByX2NvbnQoIlxuIik7CiAKIAkJZGVjb2RlX3NtY2FfZXJyb3JzKG0pOwogCQlnb3Rv IGVycl9jb2RlOwotCX0gZWxzZQotCQlwcl9jb250KCJcbiIpOworCX0KIAogCWlmICghZmFtX29w cykKIAkJZ290byBlcnJfY29kZTsK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753945AbdJSNvi (ORCPT ); Thu, 19 Oct 2017 09:51:38 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:47092 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753931AbdJSNvg (ORCPT ); Thu, 19 Oct 2017 09:51:36 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yazen Ghannam , linux-edac , Borislav Petkov , Sasha Levin Subject: [PATCH 4.9 49/51] EDAC, mce_amd: Print IPID and Syndrome on a separate line Date: Thu, 19 Oct 2017 15:49:10 +0200 Message-Id: <20171019134844.372385933@linuxfoundation.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171019134841.383925150@linuxfoundation.org> References: <20171019134841.383925150@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yazen Ghannam [ Upstream commit 75bf2f6478cab9b0c1d7f5f674a765d1e2ad530e ] Currently, the IPID and Syndrome are printed on the same line as the Address. There are cases when we can have a valid Syndrome but not a valid Address. For example, the MCA_SYND register can be used to hold more detailed error info that the hardware folks can use. It's not just DRAM ECC syndromes. There are some error types that aren't related to memory that may have valid syndromes, like some errors related to links in the Data Fabric, etc. In these cases, the IPID and Syndrome are not printed at the same log level as the rest of the stanza, so users won't see them on the console. Console: [Hardware Error]: CPU:16 (17:1:0) MC22_STATUS[Over|CE|MiscV|-|-|-|-|SyndV|-]: 0xd82000000002080b [Hardware Error]: Power, Interrupts, etc. Extended Error Code: 2 Dmesg: [Hardware Error]: CPU:16 (17:1:0) MC22_STATUS[Over|CE|MiscV|-|-|-|-|SyndV|-]: 0xd82000000002080b , Syndrome: 0x000000010b404000, IPID: 0x0001002e00000002 [Hardware Error]: Power, Interrupts, etc. Extended Error Code: 2 Print the IPID first and on a new line. The IPID should always be printed on SMCA systems. The Syndrome will then be printed with the IPID and at the same log level when valid: [Hardware Error]: CPU:16 (17:1:0) MC22_STATUS[Over|CE|MiscV|-|-|-|-|SyndV|-]: 0xd82000000002080b [Hardware Error]: IPID: 0x0001002e00000002, Syndrome: 0x000000010b404000 [Hardware Error]: Power, Interrupts, etc. Extended Error Code: 2 Signed-off-by: Yazen Ghannam Cc: linux-edac Link: http://lkml.kernel.org/r/1487192182-2474-1-git-send-email-Yazen.Ghannam@amd.com Signed-off-by: Borislav Petkov Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/edac/mce_amd.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) --- a/drivers/edac/mce_amd.c +++ b/drivers/edac/mce_amd.c @@ -981,20 +981,19 @@ int amd_decode_mce(struct notifier_block pr_cont("]: 0x%016llx\n", m->status); if (m->status & MCI_STATUS_ADDRV) - pr_emerg(HW_ERR "Error Addr: 0x%016llx", m->addr); + pr_emerg(HW_ERR "Error Addr: 0x%016llx\n", m->addr); if (boot_cpu_has(X86_FEATURE_SMCA)) { + pr_emerg(HW_ERR "IPID: 0x%016llx", m->ipid); + if (m->status & MCI_STATUS_SYNDV) pr_cont(", Syndrome: 0x%016llx", m->synd); - pr_cont(", IPID: 0x%016llx", m->ipid); - pr_cont("\n"); decode_smca_errors(m); goto err_code; - } else - pr_cont("\n"); + } if (!fam_ops) goto err_code;