Skip to content

L
linux
Commit 62452882 authored by Borislav Petkov's avatar Borislav Petkov
Browse files
Options

EDAC, MCE: Overhaul error fields extraction macros 

Make macro names shorter thus making code shorter and more clear.
Signed-off-by: default avatarBorislav Petkov <borislav.petkov@amd.com>
parent b8f85c47
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 54 deletions
drivers/edac/amd64_edac.c
View file @ 62452882
...@@ -2055,8 +2055,8 @@ static void amd64_handle_ue(struct mem_ctl_info *mci, ...@@ -2055,8 +2055,8 @@ static void amd64_handle_ue(struct mem_ctl_info *mci,
static inline void __amd64_decode_bus_error(struct mem_ctl_info *mci, static inline void __amd64_decode_bus_error(struct mem_ctl_info *mci,
struct err_regs *info) struct err_regs *info)
{ {
u32 ec = ERROR_CODE(info->nbsl); u16 ec = EC(info->nbsl);
u32 xec = EXT_ERROR_CODE(info->nbsl); u8 xec = XEC(info->nbsl, 0x1f);
int ecc_type = (info->nbsh >> 13) & 0x3; int ecc_type = (info->nbsh >> 13) & 0x3;
/* Bail early out if this was an 'observed' error */ /* Bail early out if this was an 'observed' error */
......
drivers/edac/mce_amd.c
View file @ 62452882
...@@ -133,13 +133,13 @@ static bool f12h_dc_mce(u16 ec, u8 xec) ...@@ -133,13 +133,13 @@ static bool f12h_dc_mce(u16 ec, u8 xec)
bool ret = false; bool ret = false;
if (MEM_ERROR(ec)) { if (MEM_ERROR(ec)) {
u8 ll = ec & 0x3; u8 ll = LL(ec);
ret = true; ret = true;
if (ll == LL_L2) if (ll == LL_L2)
pr_cont("during L1 linefill from L2.\n"); pr_cont("during L1 linefill from L2.\n");
else if (ll == LL_L1) else if (ll == LL_L1)
pr_cont("Data/Tag %s error.\n", RRRR_MSG(ec)); pr_cont("Data/Tag %s error.\n", R4_MSG(ec));
else else
ret = false; ret = false;
} }
...@@ -148,10 +148,7 @@ static bool f12h_dc_mce(u16 ec, u8 xec) ...@@ -148,10 +148,7 @@ static bool f12h_dc_mce(u16 ec, u8 xec)
static bool f10h_dc_mce(u16 ec, u8 xec) static bool f10h_dc_mce(u16 ec, u8 xec)
{ {
u8 r4 = (ec >> 4) & 0xf; if (R4(ec) == R4_GEN && LL(ec) == LL_L1) {
u8 ll = ec & 0x3;
if (r4 == R4_GEN && ll == LL_L1) {
pr_cont("during data scrub.\n"); pr_cont("during data scrub.\n");
return true; return true;
} }
...@@ -170,15 +167,12 @@ static bool k8_dc_mce(u16 ec, u8 xec) ...@@ -170,15 +167,12 @@ static bool k8_dc_mce(u16 ec, u8 xec)
static bool f14h_dc_mce(u16 ec, u8 xec) static bool f14h_dc_mce(u16 ec, u8 xec)
{ {
u8 r4 = (ec >> 4) & 0xf; u8 r4 = R4(ec);
u8 ll = ec & 0x3;
u8 tt = (ec >> 2) & 0x3;
u8 ii = tt;
bool ret = true; bool ret = true;
if (MEM_ERROR(ec)) { if (MEM_ERROR(ec)) {
if (tt != TT_DATA || ll != LL_L1) if (TT(ec) != TT_DATA || LL(ec) != LL_L1)
return false; return false;
switch (r4) { switch (r4) {
...@@ -198,7 +192,7 @@ static bool f14h_dc_mce(u16 ec, u8 xec) ...@@ -198,7 +192,7 @@ static bool f14h_dc_mce(u16 ec, u8 xec)
} }
} else if (BUS_ERROR(ec)) { } else if (BUS_ERROR(ec)) {
if ((ii != II_MEM && ii != II_IO) || ll != LL_LG) if ((II(ec) != II_MEM && II(ec) != II_IO) || LL(ec) != LL_LG)
return false; return false;
pr_cont("System read data error on a "); pr_cont("System read data error on a ");
...@@ -273,16 +267,14 @@ static bool f15h_dc_mce(u16 ec, u8 xec) ...@@ -273,16 +267,14 @@ static bool f15h_dc_mce(u16 ec, u8 xec)
static void amd_decode_dc_mce(struct mce *m) static void amd_decode_dc_mce(struct mce *m)
{ {
u16 ec = m->status & 0xffff; u16 ec = EC(m->status);
u8 xec = (m->status >> 16) & xec_mask; u8 xec = XEC(m->status, xec_mask);
pr_emerg(HW_ERR "Data Cache Error: "); pr_emerg(HW_ERR "Data Cache Error: ");
/* TLB error signatures are the same across families */ /* TLB error signatures are the same across families */
if (TLB_ERROR(ec)) { if (TLB_ERROR(ec)) {
u8 tt = (ec >> 2) & 0x3; if (TT(ec) == TT_DATA) {
if (tt == TT_DATA) {
pr_cont("%s TLB %s.\n", LL_MSG(ec), pr_cont("%s TLB %s.\n", LL_MSG(ec),
((xec == 2) ? "locked miss" ((xec == 2) ? "locked miss"
: (xec ? "multimatch" : "parity"))); : (xec ? "multimatch" : "parity")));
...@@ -296,8 +288,7 @@ static void amd_decode_dc_mce(struct mce *m) ...@@ -296,8 +288,7 @@ static void amd_decode_dc_mce(struct mce *m)
static bool k8_ic_mce(u16 ec, u8 xec) static bool k8_ic_mce(u16 ec, u8 xec)
{ {
u8 ll = ec & 0x3; u8 ll = LL(ec);
u8 r4 = (ec >> 4) & 0xf;
bool ret = true; bool ret = true;
if (!MEM_ERROR(ec)) if (!MEM_ERROR(ec))
...@@ -306,7 +297,7 @@ static bool k8_ic_mce(u16 ec, u8 xec) ...@@ -306,7 +297,7 @@ static bool k8_ic_mce(u16 ec, u8 xec)
if (ll == 0x2) if (ll == 0x2)
pr_cont("during a linefill from L2.\n"); pr_cont("during a linefill from L2.\n");
else if (ll == 0x1) { else if (ll == 0x1) {
switch (r4) { switch (R4(ec)) {
case R4_IRD: case R4_IRD:
pr_cont("Parity error during data load.\n"); pr_cont("Parity error during data load.\n");
break; break;
...@@ -331,13 +322,11 @@ static bool k8_ic_mce(u16 ec, u8 xec) ...@@ -331,13 +322,11 @@ static bool k8_ic_mce(u16 ec, u8 xec)
static bool f14h_ic_mce(u16 ec, u8 xec) static bool f14h_ic_mce(u16 ec, u8 xec)
{ {
u8 ll = ec & 0x3; u8 r4 = R4(ec);
u8 tt = (ec >> 2) & 0x3;
u8 r4 = (ec >> 4) & 0xf;
bool ret = true; bool ret = true;
if (MEM_ERROR(ec)) { if (MEM_ERROR(ec)) {
if (tt != 0 || ll != 1) if (TT(ec) != 0 || LL(ec) != 1)
ret = false; ret = false;
if (r4 == R4_IRD) if (r4 == R4_IRD)
...@@ -378,8 +367,8 @@ static bool f15h_ic_mce(u16 ec, u8 xec) ...@@ -378,8 +367,8 @@ static bool f15h_ic_mce(u16 ec, u8 xec)
static void amd_decode_ic_mce(struct mce *m) static void amd_decode_ic_mce(struct mce *m)
{ {
u16 ec = m->status & 0xffff; u16 ec = EC(m->status);
u8 xec = (m->status >> 16) & xec_mask; u8 xec = XEC(m->status, xec_mask);
pr_emerg(HW_ERR "Instruction Cache Error: "); pr_emerg(HW_ERR "Instruction Cache Error: ");
...@@ -398,8 +387,8 @@ static void amd_decode_ic_mce(struct mce *m) ...@@ -398,8 +387,8 @@ static void amd_decode_ic_mce(struct mce *m)
static void amd_decode_bu_mce(struct mce *m) static void amd_decode_bu_mce(struct mce *m)
{ {
u32 ec = m->status & 0xffff; u16 ec = EC(m->status);
u32 xec = (m->status >> 16) & xec_mask; u8 xec = XEC(m->status, xec_mask);
pr_emerg(HW_ERR "Bus Unit Error"); pr_emerg(HW_ERR "Bus Unit Error");
...@@ -408,23 +397,23 @@ static void amd_decode_bu_mce(struct mce *m) ...@@ -408,23 +397,23 @@ static void amd_decode_bu_mce(struct mce *m)
else if (xec == 0x3) else if (xec == 0x3)
pr_cont(" in the victim data buffers.\n"); pr_cont(" in the victim data buffers.\n");
else if (xec == 0x2 && MEM_ERROR(ec)) else if (xec == 0x2 && MEM_ERROR(ec))
pr_cont(": %s error in the L2 cache tags.\n", RRRR_MSG(ec)); pr_cont(": %s error in the L2 cache tags.\n", R4_MSG(ec));
else if (xec == 0x0) { else if (xec == 0x0) {
if (TLB_ERROR(ec)) if (TLB_ERROR(ec))
pr_cont(": %s error in a Page Descriptor Cache or " pr_cont(": %s error in a Page Descriptor Cache or "
"Guest TLB.\n", TT_MSG(ec)); "Guest TLB.\n", TT_MSG(ec));
else if (BUS_ERROR(ec)) else if (BUS_ERROR(ec))
pr_cont(": %s/ECC error in data read from NB: %s.\n", pr_cont(": %s/ECC error in data read from NB: %s.\n",
RRRR_MSG(ec), PP_MSG(ec)); R4_MSG(ec), PP_MSG(ec));
else if (MEM_ERROR(ec)) { else if (MEM_ERROR(ec)) {
u8 rrrr = (ec >> 4) & 0xf; u8 r4 = R4(ec);
if (rrrr >= 0x7) if (r4 >= 0x7)
pr_cont(": %s error during data copyback.\n", pr_cont(": %s error during data copyback.\n",
RRRR_MSG(ec)); R4_MSG(ec));
else if (rrrr <= 0x1) else if (r4 <= 0x1)
pr_cont(": %s parity/ECC error during data " pr_cont(": %s parity/ECC error during data "
"access from L2.\n", RRRR_MSG(ec)); "access from L2.\n", R4_MSG(ec));
else else
goto wrong_bu_mce; goto wrong_bu_mce;
} else } else
...@@ -440,8 +429,8 @@ static void amd_decode_bu_mce(struct mce *m) ...@@ -440,8 +429,8 @@ static void amd_decode_bu_mce(struct mce *m)
static void amd_decode_cu_mce(struct mce *m) static void amd_decode_cu_mce(struct mce *m)
{ {
u16 ec = m->status & 0xffff; u16 ec = EC(m->status);
u8 xec = (m->status >> 16) & xec_mask; u8 xec = XEC(m->status, xec_mask);
pr_emerg(HW_ERR "Combined Unit Error: "); pr_emerg(HW_ERR "Combined Unit Error: ");
...@@ -480,8 +469,8 @@ static void amd_decode_cu_mce(struct mce *m) ...@@ -480,8 +469,8 @@ static void amd_decode_cu_mce(struct mce *m)
static void amd_decode_ls_mce(struct mce *m) static void amd_decode_ls_mce(struct mce *m)
{ {
u16 ec = m->status & 0xffff; u16 ec = EC(m->status);
u8 xec = (m->status >> 16) & xec_mask; u8 xec = XEC(m->status, xec_mask);
if (boot_cpu_data.x86 >= 0x14) { if (boot_cpu_data.x86 >= 0x14) {
pr_emerg("You shouldn't be seeing an LS MCE on this cpu family," pr_emerg("You shouldn't be seeing an LS MCE on this cpu family,"
...@@ -492,12 +481,12 @@ static void amd_decode_ls_mce(struct mce *m) ...@@ -492,12 +481,12 @@ static void amd_decode_ls_mce(struct mce *m)
pr_emerg(HW_ERR "Load Store Error"); pr_emerg(HW_ERR "Load Store Error");
if (xec == 0x0) { if (xec == 0x0) {
u8 r4 = (ec >> 4) & 0xf; u8 r4 = R4(ec);
if (!BUS_ERROR(ec) || (r4 != R4_DRD && r4 != R4_DWR)) if (!BUS_ERROR(ec) || (r4 != R4_DRD && r4 != R4_DWR))
goto wrong_ls_mce; goto wrong_ls_mce;
pr_cont(" during %s.\n", RRRR_MSG(ec)); pr_cont(" during %s.\n", R4_MSG(ec));
} else } else
goto wrong_ls_mce; goto wrong_ls_mce;
...@@ -605,8 +594,8 @@ static bool nb_noop_mce(u16 ec, u8 xec) ...@@ -605,8 +594,8 @@ static bool nb_noop_mce(u16 ec, u8 xec)
void amd_decode_nb_mce(int node_id, struct mce *m, u32 nbcfg) void amd_decode_nb_mce(int node_id, struct mce *m, u32 nbcfg)
{ {
u8 xec = (m->status >> 16) & 0x1f; u16 ec = EC(m->status);
u16 ec = m->status & 0xffff; u8 xec = XEC(m->status, 0x1f);
u32 nbsh = (u32)(m->status >> 32); u32 nbsh = (u32)(m->status >> 32);
pr_emerg(HW_ERR "Northbridge Error, node %d: ", node_id); pr_emerg(HW_ERR "Northbridge Error, node %d: ", node_id);
...@@ -668,7 +657,7 @@ EXPORT_SYMBOL_GPL(amd_decode_nb_mce); ...@@ -668,7 +657,7 @@ EXPORT_SYMBOL_GPL(amd_decode_nb_mce);
static void amd_decode_fr_mce(struct mce *m) static void amd_decode_fr_mce(struct mce *m)
{ {
struct cpuinfo_x86 *c = &boot_cpu_data; struct cpuinfo_x86 *c = &boot_cpu_data;
u8 xec = (m->status >> 16) & xec_mask; u8 xec = XEC(m->status, xec_mask);
if (c->x86 == 0xf || c->x86 == 0x11) if (c->x86 == 0xf || c->x86 == 0x11)
goto wrong_fr_mce; goto wrong_fr_mce;
...@@ -694,7 +683,7 @@ static void amd_decode_fr_mce(struct mce *m) ...@@ -694,7 +683,7 @@ static void amd_decode_fr_mce(struct mce *m)
static void amd_decode_fp_mce(struct mce *m) static void amd_decode_fp_mce(struct mce *m)
{ {
u8 xec = (m->status >> 16) & xec_mask; u8 xec = XEC(m->status, xec_mask);
pr_emerg(HW_ERR "Floating Point Unit Error: "); pr_emerg(HW_ERR "Floating Point Unit Error: ");
...@@ -739,11 +728,11 @@ static inline void amd_decode_err_code(u16 ec) ...@@ -739,11 +728,11 @@ static inline void amd_decode_err_code(u16 ec)
TT_MSG(ec), LL_MSG(ec)); TT_MSG(ec), LL_MSG(ec));
} else if (MEM_ERROR(ec)) { } else if (MEM_ERROR(ec)) {
pr_emerg(HW_ERR "Transaction: %s, Type: %s, Cache Level: %s\n", pr_emerg(HW_ERR "Transaction: %s, Type: %s, Cache Level: %s\n",
RRRR_MSG(ec), TT_MSG(ec), LL_MSG(ec)); R4_MSG(ec), TT_MSG(ec), LL_MSG(ec));
} else if (BUS_ERROR(ec)) { } else if (BUS_ERROR(ec)) {
pr_emerg(HW_ERR "Transaction: %s (%s), %s, Cache Level: %s, " pr_emerg(HW_ERR "Transaction: %s (%s), %s, Cache Level: %s, "
"Participating Processor: %s\n", "Participating Processor: %s\n",
RRRR_MSG(ec), II_MSG(ec), TO_MSG(ec), LL_MSG(ec), R4_MSG(ec), II_MSG(ec), TO_MSG(ec), LL_MSG(ec),
PP_MSG(ec)); PP_MSG(ec));
} else } else
pr_emerg(HW_ERR "Huh? Unknown MCE error 0x%x\n", ec); pr_emerg(HW_ERR "Huh? Unknown MCE error 0x%x\n", ec);
......
drivers/edac/mce_amd.h
View file @ 62452882
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
#define BIT_64(n) (U64_C(1) << (n)) #define BIT_64(n) (U64_C(1) << (n))
#define ERROR_CODE(x) ((x) & 0xffff) #define EC(x) ((x) & 0xffff)
#define EXT_ERROR_CODE(x) (((x) >> 16) & 0x1f) #define XEC(x, mask) (((x) >> 16) & mask)
#define LOW_SYNDROME(x) (((x) >> 15) & 0xff) #define LOW_SYNDROME(x) (((x) >> 15) & 0xff)
#define HIGH_SYNDROME(x) (((x) >> 24) & 0xff) #define HIGH_SYNDROME(x) (((x) >> 24) & 0xff)
...@@ -21,15 +21,15 @@ ...@@ -21,15 +21,15 @@
#define TT_MSG(x) tt_msgs[TT(x)] #define TT_MSG(x) tt_msgs[TT(x)]
#define II(x) (((x) >> 2) & 0x3) #define II(x) (((x) >> 2) & 0x3)
#define II_MSG(x) ii_msgs[II(x)] #define II_MSG(x) ii_msgs[II(x)]
#define LL(x) (((x) >> 0) & 0x3) #define LL(x) ((x) & 0x3)
#define LL_MSG(x) ll_msgs[LL(x)] #define LL_MSG(x) ll_msgs[LL(x)]
#define TO(x) (((x) >> 8) & 0x1) #define TO(x) (((x) >> 8) & 0x1)
#define TO_MSG(x) to_msgs[TO(x)] #define TO_MSG(x) to_msgs[TO(x)]
#define PP(x) (((x) >> 9) & 0x3) #define PP(x) (((x) >> 9) & 0x3)
#define PP_MSG(x) pp_msgs[PP(x)] #define PP_MSG(x) pp_msgs[PP(x)]
#define RRRR(x) (((x) >> 4) & 0xf) #define R4(x) (((x) >> 4) & 0xf)
#define RRRR_MSG(x) ((RRRR(x) < 9) ? rrrr_msgs[RRRR(x)] : "Wrong R4!") #define R4_MSG(x) ((R4(x) < 9) ? rrrr_msgs[R4(x)] : "Wrong R4!")
#define K8_NBSH 0x4C #define K8_NBSH 0x4C
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7