Skip to content

Commit

Permalink
EDAC, MCE: Pass complete MCE info to decoders
Browse files Browse the repository at this point in the history 
... instead of the MCi_STATUS info only for improved handling of certain
types of errors later.

Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
  • Loading branch information
Borislav Petkov authored and Borislav Petkov committed Oct 21, 2010
1 parent 6337583 commit 7cfd4a8
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 47 deletions.
13 changes: 10 additions & 3 deletions drivers/edac/amd64_edac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2073,11 +2073,18 @@ static inline void __amd64_decode_bus_error(struct mem_ctl_info *mci,
amd64_handle_ue(mci, info);
}

void amd64_decode_bus_error(int node_id, struct err_regs *regs)
void amd64_decode_bus_error(int node_id, struct mce *m, u32 nbcfg)
{
struct mem_ctl_info *mci = mci_lookup[node_id];
struct err_regs regs;

__amd64_decode_bus_error(mci, regs);
regs.nbsl = (u32) m->status;
regs.nbsh = (u32)(m->status >> 32);
regs.nbeal = (u32) m->addr;
regs.nbeah = (u32)(m->addr >> 32);
regs.nbcfg = nbcfg;

__amd64_decode_bus_error(mci, &regs);

/*
* Check the UE bit of the NB status high register, if set generate some
Expand All @@ -2086,7 +2093,7 @@ void amd64_decode_bus_error(int node_id, struct err_regs *regs)
*
* FIXME: this should go somewhere else, if at all.
*/
if (regs->nbsh & K8_NBSH_UC_ERR && !report_gart_errors)
if (regs.nbsh & K8_NBSH_UC_ERR && !report_gart_errors)
edac_mc_handle_ue_no_info(mci, "UE bit is set");

}
Expand Down
10 changes: 8 additions & 2 deletions drivers/edac/amd64_edac_dbg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,27 @@ static ssize_t amd64_nbea_store(struct mem_ctl_info *mci, const char *data,
size_t count)
{
struct amd64_pvt *pvt = mci->pvt_info;
unsigned long long value;
u64 value;
int ret = 0;
struct mce m;

ret = strict_strtoull(data, 16, &value);
if (ret != -EINVAL) {
struct err_regs *regs = &pvt->ctl_error_info;

debugf0("received NBEA= 0x%llx\n", value);

/* place the value into the virtual error packet */
pvt->ctl_error_info.nbeal = (u32) value;
value >>= 32;
pvt->ctl_error_info.nbeah = (u32) value;

m.addr = value;
m.status = regs->nbsl | ((u64)regs->nbsh << 32);

/* Process the Mapping request */
/* TODO: Add race prevention */
amd_decode_nb_mce(pvt->mc_node_id, &pvt->ctl_error_info);
amd_decode_nb_mce(pvt->mc_node_id, &m, regs->nbcfg);

return count;
}
Expand Down
74 changes: 35 additions & 39 deletions drivers/edac/edac_mce_amd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
#include "edac_mce_amd.h"

static bool report_gart_errors;
static void (*nb_bus_decoder)(int node_id, struct err_regs *regs);
static void (*nb_bus_decoder)(int node_id, struct mce *m, u32 nbcfg);

void amd_report_gart_errors(bool v)
{
report_gart_errors = v;
}
EXPORT_SYMBOL_GPL(amd_report_gart_errors);

void amd_register_ecc_decoder(void (*f)(int, struct err_regs *))
void amd_register_ecc_decoder(void (*f)(int, struct mce *, u32))
{
nb_bus_decoder = f;
}
EXPORT_SYMBOL_GPL(amd_register_ecc_decoder);

void amd_unregister_ecc_decoder(void (*f)(int, struct err_regs *))
void amd_unregister_ecc_decoder(void (*f)(int, struct mce *, u32))
{
if (nb_bus_decoder) {
WARN_ON(nb_bus_decoder != f);
Expand Down Expand Up @@ -97,17 +97,17 @@ const char *ext_msgs[] = {
};
EXPORT_SYMBOL_GPL(ext_msgs);

static void amd_decode_dc_mce(u64 mc0_status)
static void amd_decode_dc_mce(struct mce *m)
{
u32 ec = mc0_status & 0xffff;
u32 xec = (mc0_status >> 16) & 0xf;
u32 ec = m->status & 0xffff;
u32 xec = (m->status >> 16) & 0xf;

pr_emerg(HW_ERR "Data Cache Error: ");

if (xec == 1 && TLB_ERROR(ec))
pr_cont(": %s TLB multimatch.\n", LL_MSG(ec));
else if (xec == 0) {
if (mc0_status & (1ULL << 40))
if (m->status & (1ULL << 40))
pr_cont(" during Data Scrub.\n");
else if (TLB_ERROR(ec))
pr_cont(": %s TLB parity error.\n", LL_MSG(ec));
Expand Down Expand Up @@ -140,10 +140,10 @@ static void amd_decode_dc_mce(u64 mc0_status)
pr_emerg(HW_ERR "Corrupted DC MCE info?\n");
}

static void amd_decode_ic_mce(u64 mc1_status)
static void amd_decode_ic_mce(struct mce *m)
{
u32 ec = mc1_status & 0xffff;
u32 xec = (mc1_status >> 16) & 0xf;
u32 ec = m->status & 0xffff;
u32 xec = (m->status >> 16) & 0xf;

pr_emerg(HW_ERR "Instruction Cache Error");

Expand All @@ -154,7 +154,7 @@ static void amd_decode_ic_mce(u64 mc1_status)
pr_cont(": %s TLB Parity error.\n", LL_MSG(ec));
else if (BUS_ERROR(ec)) {
if (boot_cpu_data.x86 == 0xf &&
(mc1_status & (1ULL << 58)))
(m->status & BIT(58)))
pr_cont(" during system linefill.\n");
else
pr_cont(" during attempted NB data read.\n");
Expand Down Expand Up @@ -197,10 +197,10 @@ static void amd_decode_ic_mce(u64 mc1_status)
pr_emerg(HW_ERR "Corrupted IC MCE info?\n");
}

static void amd_decode_bu_mce(u64 mc2_status)
static void amd_decode_bu_mce(struct mce *m)
{
u32 ec = mc2_status & 0xffff;
u32 xec = (mc2_status >> 16) & 0xf;
u32 ec = m->status & 0xffff;
u32 xec = (m->status >> 16) & 0xf;

pr_emerg(HW_ERR "Bus Unit Error");

Expand Down Expand Up @@ -239,10 +239,10 @@ static void amd_decode_bu_mce(u64 mc2_status)
pr_emerg(HW_ERR "Corrupted BU MCE info?\n");
}

static void amd_decode_ls_mce(u64 mc3_status)
static void amd_decode_ls_mce(struct mce *m)
{
u32 ec = mc3_status & 0xffff;
u32 xec = (mc3_status >> 16) & 0xf;
u32 ec = m->status & 0xffff;
u32 xec = (m->status >> 16) & 0xf;

pr_emerg(HW_ERR "Load Store Error");

Expand All @@ -260,9 +260,11 @@ static void amd_decode_ls_mce(u64 mc3_status)
pr_emerg(HW_ERR "Corrupted LS MCE info?\n");
}

void amd_decode_nb_mce(int node_id, struct err_regs *regs)
void amd_decode_nb_mce(int node_id, struct mce *m, u32 nbcfg)
{
u32 ec = ERROR_CODE(regs->nbsl);
u32 ec = m->status & 0xffff;
u32 nbsh = (u32)(m->status >> 32);
u32 nbsl = (u32)m->status;

/*
* GART TLB error reporting is disabled by default. Bail out early.
Expand All @@ -278,28 +280,28 @@ void amd_decode_nb_mce(int node_id, struct err_regs *regs)
*/
if ((boot_cpu_data.x86 == 0x10) &&
(boot_cpu_data.x86_model > 7)) {
if (regs->nbsh & K8_NBSH_ERR_CPU_VAL)
pr_cont(", core: %u\n", (u8)(regs->nbsh & 0xf));
if (nbsh & K8_NBSH_ERR_CPU_VAL)
pr_cont(", core: %u\n", (u8)(nbsh & 0xf));
} else {
u8 assoc_cpus = regs->nbsh & 0xf;
u8 assoc_cpus = nbsh & 0xf;

if (assoc_cpus > 0)
pr_cont(", core: %d", fls(assoc_cpus) - 1);

pr_cont("\n");
}

pr_emerg(HW_ERR "%s.\n", EXT_ERR_MSG(regs->nbsl));
pr_emerg(HW_ERR "%s.\n", EXT_ERR_MSG(nbsl));

if (BUS_ERROR(ec) && nb_bus_decoder)
nb_bus_decoder(node_id, regs);
nb_bus_decoder(node_id, m, nbcfg);
}
EXPORT_SYMBOL_GPL(amd_decode_nb_mce);

static void amd_decode_fr_mce(u64 mc5_status)
static void amd_decode_fr_mce(struct mce *m)
{
/* we have only one error signature so match all fields at once. */
if ((mc5_status & 0xffff) == 0x0f0f)
if ((m->status & 0xffff) == 0x0f0f)
pr_emerg(HW_ERR " FR Error: CPU Watchdog timer expire.\n");
else
pr_emerg(HW_ERR "Corrupted FR MCE info?\n");
Expand All @@ -326,7 +328,6 @@ static int amd_decode_mce(struct notifier_block *nb, unsigned long val,
void *data)
{
struct mce *m = (struct mce *)data;
struct err_regs regs;
int node, ecc;

pr_emerg(HW_ERR "MC%d_STATUS: ", m->bank);
Expand All @@ -346,33 +347,28 @@ static int amd_decode_mce(struct notifier_block *nb, unsigned long val,

switch (m->bank) {
case 0:
amd_decode_dc_mce(m->status);
amd_decode_dc_mce(m);
break;

case 1:
amd_decode_ic_mce(m->status);
amd_decode_ic_mce(m);
break;

case 2:
amd_decode_bu_mce(m->status);
amd_decode_bu_mce(m);
break;

case 3:
amd_decode_ls_mce(m->status);
amd_decode_ls_mce(m);
break;

case 4:
regs.nbsl = (u32) m->status;
regs.nbsh = (u32)(m->status >> 32);
regs.nbeal = (u32) m->addr;
regs.nbeah = (u32)(m->addr >> 32);
node = amd_get_nb_id(m->extcpu);

amd_decode_nb_mce(node, &regs);
node = amd_get_nb_id(m->extcpu);
amd_decode_nb_mce(node, m, 0);
break;

case 5:
amd_decode_fr_mce(m->status);
amd_decode_fr_mce(m);
break;

default:
Expand Down
6 changes: 3 additions & 3 deletions drivers/edac/edac_mce_amd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ struct err_regs {


void amd_report_gart_errors(bool);
void amd_register_ecc_decoder(void (*f)(int, struct err_regs *));
void amd_unregister_ecc_decoder(void (*f)(int, struct err_regs *));
void amd_decode_nb_mce(int, struct err_regs *);
void amd_register_ecc_decoder(void (*f)(int, struct mce *, u32));
void amd_unregister_ecc_decoder(void (*f)(int, struct mce *, u32));
void amd_decode_nb_mce(int, struct mce *, u32);

#endif /* _EDAC_MCE_AMD_H */

0 comments on commit 7cfd4a8

Please sign in to comment.