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: [tip:ras/core] x86/MCE/AMD, EDAC/mce_amd: Add new error descriptions for some SMCA bank types From: tip-bot for Borislav Petkov Message-Id: Date: Mon, 4 Feb 2019 12:44:11 -0800 To: linux-tip-commits@vger.kernel.org Cc: x86@kernel.org, mingo@redhat.com, bp@suse.de, mchehab@kernel.org, tony.luck@intel.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, Shirish.S@amd.com, mingo@kernel.org, keescook@chromium.org, yazen.ghannam@amd.com, hpa@zytor.com, linux-edac@vger.kernel.org List-ID: Q29tbWl0LUlEOiAgOGE1ZGQyY2QyZjJlOTQ4NzhjYWNjOTY5NjU1YTY5Y2EyMTQ3OTVhYgpHaXR3 ZWI6ICAgICBodHRwczovL2dpdC5rZXJuZWwub3JnL3RpcC84YTVkZDJjZDJmMmU5NDg3OGNhY2M5 Njk2NTVhNjljYTIxNDc5NWFiCkF1dGhvcjogICAgIFlhemVuIEdoYW5uYW0gPHlhemVuLmdoYW5u YW1AYW1kLmNvbT4KQXV0aG9yRGF0ZTogRnJpLCAxIEZlYiAyMDE5IDIyOjU1OjUyICswMDAwCkNv bW1pdHRlcjogIEJvcmlzbGF2IFBldGtvdiA8YnBAc3VzZS5kZT4KQ29tbWl0RGF0ZTogU3VuLCAz IEZlYiAyMDE5IDEzOjA1OjE2ICswMTAwCgp4ODYvTUNFL0FNRCwgRURBQy9tY2VfYW1kOiBBZGQg bmV3IGVycm9yIGRlc2NyaXB0aW9ucyBmb3Igc29tZSBTTUNBIGJhbmsgdHlwZXMKClNvbWUgU01D QSBiYW5rIHR5cGVzIG9uIGZ1dHVyZSBzeXN0ZW1zIHdpbGwgcmVwb3J0IG5ldyBlcnJvciB0eXBl cyBldmVuCnRob3VnaCB0aGUgYmFuayB0eXBlIGlzIG5vdCB0cmVhdGVkIGFzIGEgbmV3IHZlcnNp b24uIFRoZXNlIG5ldyBlcnJvcgp0eXBlcyB3aWxsIHJlcG9ydGVkIGJ5IGJpdHMgdGhhdCBhcmUg cmVzZXJ2ZWQgaW4gcGFzdCBzeXN0ZW1zLgoKQWRkIHRoZSBuZXcgZXJyb3IgZGVzY3JpcHRpb25z IHRvIHRoZSBsaXN0cyBpbiBlZGFjX21jZV9hbWQuCgpTaWduZWQtb2ZmLWJ5OiBZYXplbiBHaGFu bmFtIDx5YXplbi5naGFubmFtQGFtZC5jb20+ClNpZ25lZC1vZmYtYnk6IEJvcmlzbGF2IFBldGtv diA8YnBAc3VzZS5kZT4KQ2M6ICJILiBQZXRlciBBbnZpbiIgPGhwYUB6eXRvci5jb20+CkNjOiBJ bmdvIE1vbG5hciA8bWluZ29AcmVkaGF0LmNvbT4KQ2M6IEtlZXMgQ29vayA8a2Vlc2Nvb2tAY2hy b21pdW0ub3JnPgpDYzogbGludXgtZWRhYyA8bGludXgtZWRhY0B2Z2VyLmtlcm5lbC5vcmc+CkNj OiBNYXVybyBDYXJ2YWxobyBDaGVoYWIgPG1jaGVoYWJAa2VybmVsLm9yZz4KQ2M6IFNoaXJpc2gg UyA8U2hpcmlzaC5TQGFtZC5jb20+CkNjOiBUaG9tYXMgR2xlaXhuZXIgPHRnbHhAbGludXRyb25p eC5kZT4KQ2M6IFRvbnkgTHVjayA8dG9ueS5sdWNrQGludGVsLmNvbT4KQ2M6IHg4Ni1tbCA8eDg2 QGtlcm5lbC5vcmc+Ckxpbms6IGh0dHBzOi8vbGttbC5rZXJuZWwub3JnL3IvMjAxOTAyMDEyMjU1 MzQuODE3Ny00LVlhemVuLkdoYW5uYW1AYW1kLmNvbQotLS0KIGFyY2gveDg2L2tlcm5lbC9jcHUv bWNlL2FtZC5jIHwgOCArKysrLS0tLQogZHJpdmVycy9lZGFjL21jZV9hbWQuYyAgICAgICAgfCA2 ICsrKysrLQogMiBmaWxlcyBjaGFuZ2VkLCA5IGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvYXJjaC94ODYva2VybmVsL2NwdS9tY2UvYW1kLmMgYi9hcmNoL3g4Ni9r ZXJuZWwvY3B1L21jZS9hbWQuYwppbmRleCBiZDEzMzFiMjQxY2EuLmU2NGRlNTE0OWU1MCAxMDA2 NDQKLS0tIGEvYXJjaC94ODYva2VybmVsL2NwdS9tY2UvYW1kLmMKKysrIGIvYXJjaC94ODYva2Vy bmVsL2NwdS9tY2UvYW1kLmMKQEAgLTE0NCwyMiArMTQ0LDIyIEBAIHN0YXRpYyBzdHJ1Y3Qgc21j YV9od2lkIHNtY2FfaHdpZF9tY2F0eXBlc1tdID0gewogCXsgU01DQV9SRVNFUlZFRCwgSFdJRF9N Q0FUWVBFKDB4MDAsIDB4MCksIDB4MCB9LAogCiAJLyogWk4gQ29yZSAoSFdJRD0weEIwKSBNQ0Eg dHlwZXMgKi8KLQl7IFNNQ0FfTFMsCSBIV0lEX01DQVRZUEUoMHhCMCwgMHgwKSwgMHgxRkZGRUYg fSwKKwl7IFNNQ0FfTFMsCSBIV0lEX01DQVRZUEUoMHhCMCwgMHgwKSwgMHgxRkZGRkYgfSwKIAl7 IFNNQ0FfSUYsCSBIV0lEX01DQVRZUEUoMHhCMCwgMHgxKSwgMHgzRkZGIH0sCiAJeyBTTUNBX0wy X0NBQ0hFLCBIV0lEX01DQVRZUEUoMHhCMCwgMHgyKSwgMHhGIH0sCiAJeyBTTUNBX0RFLAkgSFdJ RF9NQ0FUWVBFKDB4QjAsIDB4MyksIDB4MUZGIH0sCiAJLyogSFdJRCAweEIwIE1DQVRZUEUgMHg0 IGlzIFJlc2VydmVkICovCi0JeyBTTUNBX0VYLAkgSFdJRF9NQ0FUWVBFKDB4QjAsIDB4NSksIDB4 N0ZGIH0sCisJeyBTTUNBX0VYLAkgSFdJRF9NQ0FUWVBFKDB4QjAsIDB4NSksIDB4RkZGIH0sCiAJ eyBTTUNBX0ZQLAkgSFdJRF9NQ0FUWVBFKDB4QjAsIDB4NiksIDB4N0YgfSwKIAl7IFNNQ0FfTDNf Q0FDSEUsIEhXSURfTUNBVFlQRSgweEIwLCAweDcpLCAweEZGIH0sCiAKIAkvKiBEYXRhIEZhYnJp YyBNQ0EgdHlwZXMgKi8KIAl7IFNNQ0FfQ1MsCSBIV0lEX01DQVRZUEUoMHgyRSwgMHgwKSwgMHgx RkYgfSwKLQl7IFNNQ0FfUElFLAkgSFdJRF9NQ0FUWVBFKDB4MkUsIDB4MSksIDB4RiB9LAorCXsg U01DQV9QSUUsCSBIV0lEX01DQVRZUEUoMHgyRSwgMHgxKSwgMHgxRiB9LAogCXsgU01DQV9DU19W MiwJIEhXSURfTUNBVFlQRSgweDJFLCAweDIpLCAweDNGRkYgfSwKIAogCS8qIFVuaWZpZWQgTWVt b3J5IENvbnRyb2xsZXIgTUNBIHR5cGUgKi8KLQl7IFNNQ0FfVU1DLAkgSFdJRF9NQ0FUWVBFKDB4 OTYsIDB4MCksIDB4M0YgfSwKKwl7IFNNQ0FfVU1DLAkgSFdJRF9NQ0FUWVBFKDB4OTYsIDB4MCks IDB4RkYgfSwKIAogCS8qIFBhcmFtZXRlciBCbG9jayBNQ0EgdHlwZSAqLwogCXsgU01DQV9QQiwJ IEhXSURfTUNBVFlQRSgweDA1LCAweDApLCAweDEgfSwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZWRh Yy9tY2VfYW1kLmMgYi9kcml2ZXJzL2VkYWMvbWNlX2FtZC5jCmluZGV4IDE4NGM5MDE3MmQxNy4u Yzc5ZTY1MGFhNjA2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2VkYWMvbWNlX2FtZC5jCisrKyBiL2Ry aXZlcnMvZWRhYy9tY2VfYW1kLmMKQEAgLTE1NSw3ICsxNTUsNyBAQCBzdGF0aWMgY29uc3QgY2hh ciAqIGNvbnN0IHNtY2FfbHNfbWNlX2Rlc2NbXSA9IHsKIAkiU3RvcmUgcXVldWUgcGFyaXR5IiwK IAkiTWlzcyBhZGRyZXNzIGJ1ZmZlciBwYXlsb2FkIHBhcml0eSIsCiAJIkwxIFRMQiBwYXJpdHki LAotCSJSZXNlcnZlZCIsCisJIkRDIFRhZyBlcnJvciB0eXBlIDUiLAogCSJEQyB0YWcgZXJyb3Ig dHlwZSA2IiwKIAkiREMgdGFnIGVycm9yIHR5cGUgMSIsCiAJIkludGVybmFsIGVycm9yIHR5cGUg MSIsCkBAIC0yMjIsNiArMjIyLDcgQEAgc3RhdGljIGNvbnN0IGNoYXIgKiBjb25zdCBzbWNhX2V4 X21jZV9kZXNjW10gPSB7CiAJIlJldGlyZSBzdGF0dXMgcXVldWUgcGFyaXR5IGVycm9yIiwKIAki U2NoZWR1bGluZyBxdWV1ZSBwYXJpdHkgZXJyb3IiLAogCSJCcmFuY2ggYnVmZmVyIHF1ZXVlIHBh cml0eSBlcnJvciIsCisJIkhhcmR3YXJlIEFzc2VydGlvbiBlcnJvciIsCiB9OwogCiBzdGF0aWMg Y29uc3QgY2hhciAqIGNvbnN0IHNtY2FfZnBfbWNlX2Rlc2NbXSA9IHsKQEAgLTI3OSw2ICsyODAs NyBAQCBzdGF0aWMgY29uc3QgY2hhciAqIGNvbnN0IHNtY2FfcGllX21jZV9kZXNjW10gPSB7CiAJ IkludGVybmFsIFBJRSByZWdpc3RlciBzZWN1cml0eSB2aW9sYXRpb24iLAogCSJFcnJvciBvbiBH TUkgbGluayIsCiAJIlBvaXNvbiBkYXRhIHdyaXR0ZW4gdG8gaW50ZXJuYWwgUElFIHJlZ2lzdGVy IiwKKwkiQSBkZWZlcnJlZCBlcnJvciB3YXMgZGV0ZWN0ZWQgaW4gdGhlIERGIgogfTsKIAogc3Rh dGljIGNvbnN0IGNoYXIgKiBjb25zdCBzbWNhX3VtY19tY2VfZGVzY1tdID0gewpAQCAtMjg4LDYg KzI5MCw4IEBAIHN0YXRpYyBjb25zdCBjaGFyICogY29uc3Qgc21jYV91bWNfbWNlX2Rlc2NbXSA9 IHsKIAkiQWR2YW5jZWQgcGVyaXBoZXJhbCBidXMgZXJyb3IiLAogCSJDb21tYW5kL2FkZHJlc3Mg cGFyaXR5IGVycm9yIiwKIAkiV3JpdGUgZGF0YSBDUkMgZXJyb3IiLAorCSJEQ1EgU1JBTSBFQ0Mg ZXJyb3IiLAorCSJBRVMgU1JBTSBFQ0MgZXJyb3IiLAogfTsKIAogc3RhdGljIGNvbnN0IGNoYXIg KiBjb25zdCBzbWNhX3BiX21jZV9kZXNjW10gPSB7Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6B6DFC282C4 for ; Mon, 4 Feb 2019 20:44:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 40DCD2073D for ; Mon, 4 Feb 2019 20:44:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730015AbfBDUoc (ORCPT ); Mon, 4 Feb 2019 15:44:32 -0500 Received: from terminus.zytor.com ([198.137.202.136]:34451 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728268AbfBDUoc (ORCPT ); Mon, 4 Feb 2019 15:44:32 -0500 Received: from terminus.zytor.com (localhost [127.0.0.1]) by terminus.zytor.com (8.15.2/8.15.2) with ESMTPS id x14KiBYB564952 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Mon, 4 Feb 2019 12:44:11 -0800 Received: (from tipbot@localhost) by terminus.zytor.com (8.15.2/8.15.2/Submit) id x14KiB2C564949; Mon, 4 Feb 2019 12:44:11 -0800 Date: Mon, 4 Feb 2019 12:44:11 -0800 X-Authentication-Warning: terminus.zytor.com: tipbot set sender to tipbot@zytor.com using -f From: tip-bot for Yazen Ghannam Message-ID: Cc: x86@kernel.org, mingo@redhat.com, bp@suse.de, mchehab@kernel.org, tony.luck@intel.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, Shirish.S@amd.com, mingo@kernel.org, keescook@chromium.org, yazen.ghannam@amd.com, hpa@zytor.com, linux-edac@vger.kernel.org Reply-To: x86@kernel.org, bp@suse.de, mingo@redhat.com, mchehab@kernel.org, tony.luck@intel.com, mingo@kernel.org, linux-kernel@vger.kernel.org, Shirish.S@amd.com, tglx@linutronix.de, hpa@zytor.com, linux-edac@vger.kernel.org, yazen.ghannam@amd.com, keescook@chromium.org In-Reply-To: <20190201225534.8177-4-Yazen.Ghannam@amd.com> References: <20190201225534.8177-4-Yazen.Ghannam@amd.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:ras/core] x86/MCE/AMD, EDAC/mce_amd: Add new error descriptions for some SMCA bank types Git-Commit-ID: 8a5dd2cd2f2e94878cacc969655a69ca214795ab X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 8a5dd2cd2f2e94878cacc969655a69ca214795ab Gitweb: https://git.kernel.org/tip/8a5dd2cd2f2e94878cacc969655a69ca214795ab Author: Yazen Ghannam AuthorDate: Fri, 1 Feb 2019 22:55:52 +0000 Committer: Borislav Petkov CommitDate: Sun, 3 Feb 2019 13:05:16 +0100 x86/MCE/AMD, EDAC/mce_amd: Add new error descriptions for some SMCA bank types Some SMCA bank types on future systems will report new error types even though the bank type is not treated as a new version. These new error types will reported by bits that are reserved in past systems. Add the new error descriptions to the lists in edac_mce_amd. Signed-off-by: Yazen Ghannam Signed-off-by: Borislav Petkov Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: Kees Cook Cc: linux-edac Cc: Mauro Carvalho Chehab Cc: Shirish S Cc: Thomas Gleixner Cc: Tony Luck Cc: x86-ml Link: https://lkml.kernel.org/r/20190201225534.8177-4-Yazen.Ghannam@amd.com --- arch/x86/kernel/cpu/mce/amd.c | 8 ++++---- drivers/edac/mce_amd.c | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c index bd1331b241ca..e64de5149e50 100644 --- a/arch/x86/kernel/cpu/mce/amd.c +++ b/arch/x86/kernel/cpu/mce/amd.c @@ -144,22 +144,22 @@ static struct smca_hwid smca_hwid_mcatypes[] = { { SMCA_RESERVED, HWID_MCATYPE(0x00, 0x0), 0x0 }, /* ZN Core (HWID=0xB0) MCA types */ - { SMCA_LS, HWID_MCATYPE(0xB0, 0x0), 0x1FFFEF }, + { SMCA_LS, HWID_MCATYPE(0xB0, 0x0), 0x1FFFFF }, { SMCA_IF, HWID_MCATYPE(0xB0, 0x1), 0x3FFF }, { SMCA_L2_CACHE, HWID_MCATYPE(0xB0, 0x2), 0xF }, { SMCA_DE, HWID_MCATYPE(0xB0, 0x3), 0x1FF }, /* HWID 0xB0 MCATYPE 0x4 is Reserved */ - { SMCA_EX, HWID_MCATYPE(0xB0, 0x5), 0x7FF }, + { SMCA_EX, HWID_MCATYPE(0xB0, 0x5), 0xFFF }, { SMCA_FP, HWID_MCATYPE(0xB0, 0x6), 0x7F }, { SMCA_L3_CACHE, HWID_MCATYPE(0xB0, 0x7), 0xFF }, /* Data Fabric MCA types */ { SMCA_CS, HWID_MCATYPE(0x2E, 0x0), 0x1FF }, - { SMCA_PIE, HWID_MCATYPE(0x2E, 0x1), 0xF }, + { SMCA_PIE, HWID_MCATYPE(0x2E, 0x1), 0x1F }, { SMCA_CS_V2, HWID_MCATYPE(0x2E, 0x2), 0x3FFF }, /* Unified Memory Controller MCA type */ - { SMCA_UMC, HWID_MCATYPE(0x96, 0x0), 0x3F }, + { SMCA_UMC, HWID_MCATYPE(0x96, 0x0), 0xFF }, /* Parameter Block MCA type */ { SMCA_PB, HWID_MCATYPE(0x05, 0x0), 0x1 }, diff --git a/drivers/edac/mce_amd.c b/drivers/edac/mce_amd.c index 184c90172d17..c79e650aa606 100644 --- a/drivers/edac/mce_amd.c +++ b/drivers/edac/mce_amd.c @@ -155,7 +155,7 @@ static const char * const smca_ls_mce_desc[] = { "Store queue parity", "Miss address buffer payload parity", "L1 TLB parity", - "Reserved", + "DC Tag error type 5", "DC tag error type 6", "DC tag error type 1", "Internal error type 1", @@ -222,6 +222,7 @@ static const char * const smca_ex_mce_desc[] = { "Retire status queue parity error", "Scheduling queue parity error", "Branch buffer queue parity error", + "Hardware Assertion error", }; static const char * const smca_fp_mce_desc[] = { @@ -279,6 +280,7 @@ static const char * const smca_pie_mce_desc[] = { "Internal PIE register security violation", "Error on GMI link", "Poison data written to internal PIE register", + "A deferred error was detected in the DF" }; static const char * const smca_umc_mce_desc[] = { @@ -288,6 +290,8 @@ static const char * const smca_umc_mce_desc[] = { "Advanced peripheral bus error", "Command/address parity error", "Write data CRC error", + "DCQ SRAM ECC error", + "AES SRAM ECC error", }; static const char * const smca_pb_mce_desc[] = {