diff options
author | 2016-11-23 21:13:40 +0100 | |
---|---|---|
committer | 2016-11-23 21:13:40 +0100 | |
commit | 627bc29ed90ca50dbf7a4e7b43c267a2920bbadb (patch) | |
tree | 838d8aca5a04166b6ad74a2ef0f5291224768501 /drivers/edac/mce_amd.c | |
parent | EDAC, amd64: Don't force-enable ECC checking on newer systems (diff) | |
parent | x86/mce: Include the PPIN in MCE records when available (diff) | |
download | linux-627bc29ed90ca50dbf7a4e7b43c267a2920bbadb.tar.gz linux-627bc29ed90ca50dbf7a4e7b43c267a2920bbadb.tar.bz2 linux-627bc29ed90ca50dbf7a4e7b43c267a2920bbadb.zip |
Merge tip:ras/core to pick up dependent changes
tip:ras/core contains the respective Fam17h x86 RAS bits which
amd64_edac is going to use. So merge it into the EDAC branch.
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'drivers/edac/mce_amd.c')
-rw-r--r-- | drivers/edac/mce_amd.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/edac/mce_amd.c b/drivers/edac/mce_amd.c index ac11bccba809..ba2995c2cc23 100644 --- a/drivers/edac/mce_amd.c +++ b/drivers/edac/mce_amd.c @@ -851,7 +851,7 @@ static void decode_mc6_mce(struct mce *m) /* Decode errors according to Scalable MCA specification */ static void decode_smca_errors(struct mce *m) { - struct smca_hwid_mcatype *type; + struct smca_hwid *hwid; unsigned int bank_type; const char *ip_name; u8 xec = XEC(m->status, xec_mask); @@ -862,18 +862,18 @@ static void decode_smca_errors(struct mce *m) if (boot_cpu_data.x86 >= 0x17 && m->bank == 4) pr_emerg(HW_ERR "Bank 4 is reserved on Fam17h.\n"); - type = smca_banks[m->bank].type; - if (!type) + hwid = smca_banks[m->bank].hwid; + if (!hwid) return; - bank_type = type->bank_type; - ip_name = smca_bank_names[bank_type].long_name; + bank_type = hwid->bank_type; + ip_name = smca_get_long_name(bank_type); pr_emerg(HW_ERR "%s Extended Error Code: %d\n", ip_name, xec); /* Only print the decode of valid error codes */ if (xec < smca_mce_descs[bank_type].num_descs && - (type->xec_bitmap & BIT_ULL(xec))) { + (hwid->xec_bitmap & BIT_ULL(xec))) { pr_emerg(HW_ERR "%s Error: ", ip_name); pr_cont("%s.\n", smca_mce_descs[bank_type].descs[xec]); } |