From: Borislav Petkov <bp@amd64.org>
To: <linux-edac@vger.kernel.org>
Cc: <linux-kernel@vger.kernel.org>, <x86@kernel.org>,
Borislav Petkov <borislav.petkov@amd.com>
Subject: [PATCH 03/12] EDAC, MCE: Add F15h IC MCE decoder
Date: Wed, 10 Nov 2010 20:02:12 +0100 [thread overview]
Message-ID: <1289415741-15000-4-git-send-email-bp@amd64.org> (raw)
In-Reply-To: <1289415741-15000-1-git-send-email-bp@amd64.org>
From: Borislav Petkov <borislav.petkov@amd.com>
Add support for decoding F15h IC MCEs.
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
---
drivers/edac/mce_amd.c | 53 +++++++++++++++++++++++++++++++++++++++++++++--
drivers/edac/mce_amd.h | 2 +-
2 files changed, 51 insertions(+), 4 deletions(-)
diff --git a/drivers/edac/mce_amd.c b/drivers/edac/mce_amd.c
index 12bae3b..158cd5f 100644
--- a/drivers/edac/mce_amd.c
+++ b/drivers/edac/mce_amd.c
@@ -75,6 +75,26 @@ static const char *f10h_nb_mce_desc[] = {
"ECC Error in the Probe Filter directory"
};
+static const char * const f15h_ic_mce_desc[] = {
+ "UC during a demand linefill from L2",
+ "Parity error during data load from IC",
+ "Parity error for IC valid bit",
+ "Main tag parity error",
+ "Parity error in prediction queue",
+ "PFB data/address parity error",
+ "Parity error in the branch status reg",
+ "PFB promotion address error",
+ "Tag error during probe/victimization",
+ "Parity error for IC probe tag valid bit",
+ "PFB non-cacheable bit parity error",
+ "PFB valid bit parity error", /* xec = 0xd */
+ "patch RAM", /* xec = 010 */
+ "uop queue",
+ "insn buffer",
+ "predecode buffer",
+ "fetch address FIFO"
+};
+
static bool f12h_dc_mce(u16 ec, u8 xec)
{
bool ret = false;
@@ -241,7 +261,7 @@ static void amd_decode_dc_mce(struct mce *m)
pr_emerg(HW_ERR "Corrupted DC MCE info?\n");
}
-static bool k8_ic_mce(u16 ec)
+static bool k8_ic_mce(u16 ec, u8 xec)
{
u8 ll = ec & 0x3;
u8 r4 = (ec >> 4) & 0xf;
@@ -276,7 +296,7 @@ static bool k8_ic_mce(u16 ec)
return ret;
}
-static bool f14h_ic_mce(u16 ec)
+static bool f14h_ic_mce(u16 ec, u8 xec)
{
u8 ll = ec & 0x3;
u8 tt = (ec >> 2) & 0x3;
@@ -297,6 +317,32 @@ static bool f14h_ic_mce(u16 ec)
return ret;
}
+static bool f15h_ic_mce(u16 ec, u8 xec)
+{
+ bool ret = true;
+
+ if (!MEM_ERROR(ec))
+ return false;
+
+ switch (xec) {
+ case 0x0 ... 0xa:
+ pr_cont("%s.\n", f15h_ic_mce_desc[xec]);
+ break;
+
+ case 0xd:
+ pr_cont("%s.\n", f15h_ic_mce_desc[xec-2]);
+ break;
+
+ case 0x10 ... 0x14:
+ pr_cont("Decoder %s parity error.\n", f15h_ic_mce_desc[xec-4]);
+ break;
+
+ default:
+ ret = false;
+ }
+ return ret;
+}
+
static void amd_decode_ic_mce(struct mce *m)
{
u16 ec = m->status & 0xffff;
@@ -311,7 +357,7 @@ static void amd_decode_ic_mce(struct mce *m)
bool k8 = (boot_cpu_data.x86 == 0xf && (m->status & BIT_64(58)));
pr_cont("during %s.\n", (k8 ? "system linefill" : "NB data read"));
- } else if (fam_ops->ic_mce(ec))
+ } else if (fam_ops->ic_mce(ec, xec))
;
else
pr_emerg(HW_ERR "Corrupted IC MCE info?\n");
@@ -697,6 +743,7 @@ static int __init mce_amd_init(void)
case 0x15:
xec_mask = 0x1f;
fam_ops->dc_mce = f15h_dc_mce;
+ fam_ops->ic_mce = f15h_ic_mce;
break;
default:
diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
index c12394d..8398847 100644
--- a/drivers/edac/mce_amd.h
+++ b/drivers/edac/mce_amd.h
@@ -101,7 +101,7 @@ struct err_regs {
*/
struct amd_decoder_ops {
bool (*dc_mce)(u16, u8);
- bool (*ic_mce)(u16);
+ bool (*ic_mce)(u16, u8);
bool (*nb_mce)(u16, u8);
};
--
1.7.3.1.50.g1e633
next prev parent reply other threads:[~2010-11-10 19:03 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-10 19:02 [PATCH 00/12] EDAC, MCE: F15h MCE decoding Borislav Petkov
2010-11-10 19:02 ` [PATCH 01/12] EDAC, MCE: Select extended error code mask Borislav Petkov
2010-11-10 19:12 ` Luck, Tony
2010-11-10 19:15 ` Luck, Tony
2010-11-10 19:23 ` Borislav Petkov
2010-11-10 19:02 ` [PATCH 02/12] EDAC, MCE: Add F15h DC MCE decoder Borislav Petkov
2010-11-10 19:02 ` Borislav Petkov [this message]
2010-11-10 19:02 ` [PATCH 04/12] EDAC, MCE: Add F15h CU " Borislav Petkov
2010-11-10 19:02 ` [PATCH 05/12] EDAC, MCE: No F15h LS " Borislav Petkov
2010-11-10 19:02 ` [PATCH 06/12] EDAC, MCE: Add an F15h NB " Borislav Petkov
2010-11-10 19:02 ` [PATCH 07/12] EDAC, MCE: Add F15 EX " Borislav Petkov
2010-11-10 19:02 ` [PATCH 08/12] EDAC, MCE: Add F15h FP " Borislav Petkov
2010-11-10 19:02 ` [PATCH 09/12] EDAC, MCE: Overhaul error fields extraction macros Borislav Petkov
2010-11-10 19:02 ` [PATCH 10/12] EDAC, MCE: Shorten error report formatting Borislav Petkov
2010-11-10 19:02 ` [PATCH 11/12] EDAC, MCE: Allow F15h bank 6 MCE injection Borislav Petkov
2010-11-10 19:02 ` [PATCH 12/12] EDAC, MCE: Enable MCE decoding on F15h Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1289415741-15000-4-git-send-email-bp@amd64.org \
--to=bp@amd64.org \
--cc=borislav.petkov@amd.com \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome