|
@@ -110,14 +110,14 @@ const char *smca_get_long_name(enum smca_bank_types t)
|
|
|
}
|
|
|
EXPORT_SYMBOL_GPL(smca_get_long_name);
|
|
|
|
|
|
-static enum smca_bank_types smca_get_bank_type(struct mce *m)
|
|
|
+static enum smca_bank_types smca_get_bank_type(unsigned int bank)
|
|
|
{
|
|
|
struct smca_bank *b;
|
|
|
|
|
|
- if (m->bank >= N_SMCA_BANK_TYPES)
|
|
|
+ if (bank >= MAX_NR_BANKS)
|
|
|
return N_SMCA_BANK_TYPES;
|
|
|
|
|
|
- b = &smca_banks[m->bank];
|
|
|
+ b = &smca_banks[bank];
|
|
|
if (!b->hwid)
|
|
|
return N_SMCA_BANK_TYPES;
|
|
|
|
|
@@ -760,7 +760,7 @@ bool amd_mce_is_memory_error(struct mce *m)
|
|
|
u8 xec = (m->status >> 16) & 0x1f;
|
|
|
|
|
|
if (mce_flags.smca)
|
|
|
- return smca_get_bank_type(m) == SMCA_UMC && xec == 0x0;
|
|
|
+ return smca_get_bank_type(m->bank) == SMCA_UMC && xec == 0x0;
|
|
|
|
|
|
return m->bank == 4 && xec == 0x8;
|
|
|
}
|
|
@@ -1063,7 +1063,7 @@ static struct kobj_type threshold_ktype = {
|
|
|
|
|
|
static const char *get_name(unsigned int bank, struct threshold_block *b)
|
|
|
{
|
|
|
- unsigned int bank_type;
|
|
|
+ enum smca_bank_types bank_type;
|
|
|
|
|
|
if (!mce_flags.smca) {
|
|
|
if (b && bank == 4)
|
|
@@ -1072,11 +1072,10 @@ static const char *get_name(unsigned int bank, struct threshold_block *b)
|
|
|
return th_names[bank];
|
|
|
}
|
|
|
|
|
|
- if (!smca_banks[bank].hwid)
|
|
|
+ bank_type = smca_get_bank_type(bank);
|
|
|
+ if (bank_type >= N_SMCA_BANK_TYPES)
|
|
|
return NULL;
|
|
|
|
|
|
- bank_type = smca_banks[bank].hwid->bank_type;
|
|
|
-
|
|
|
if (b && bank_type == SMCA_UMC) {
|
|
|
if (b->block < ARRAY_SIZE(smca_umc_block_names))
|
|
|
return smca_umc_block_names[b->block];
|