GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/amd/picasso,stoneyridge/mca: factor out mca_check_all_banks 

Change-Id: I5496fd27f5c56d35ab95a5e02ea313b5b5536668
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/56241
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Felix Held 2021-07-12 22:39:10 +02:00
parent 7830e3a836
commit 2927a66dc9
2 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/soc/amd/picasso/mca.c
View File

@ -164,6 +164,23 @@ static void mca_print_error(unsigned int bank)
printk(BIOS_WARNING, " MC%u_CTL_MASK = %08x_%08x\n", bank, msr.hi, msr.lo); printk(BIOS_WARNING, " MC%u_CTL_MASK = %08x_%08x\n", bank, msr.hi, msr.lo);
} }
static void mca_check_all_banks(void)
{
struct mca_bank_status mci;
const unsigned int num_banks = mca_get_bank_count();
for (unsigned int i = 0 ; i < num_banks ; i++) {
mci.bank = i;
mci.sts = rdmsr(MCAX_STATUS_MSR(i));
if (mci.sts.hi || mci.sts.lo) {
mca_print_error(i);
if (CONFIG(ACPI_BERT) && mca_valid(mci.sts))
build_bert_mca_error(&mci);
}
}
}
static void mca_clear_errors(void) static void mca_clear_errors(void)
{ {
const unsigned int num_banks = mca_get_bank_count(); const unsigned int num_banks = mca_get_bank_count();
@ -177,20 +194,6 @@ static void mca_clear_errors(void)
/* Check the Machine Check Architecture Extension registers */ /* Check the Machine Check Architecture Extension registers */
void check_mca(void) void check_mca(void)
{ {
unsigned int i; mca_check_all_banks();
struct mca_bank_status mci;
const unsigned int num_banks = mca_get_bank_count();
for (i = 0 ; i < num_banks ; i++) {
mci.bank = i;
mci.sts = rdmsr(MCAX_STATUS_MSR(i));
if (mci.sts.hi || mci.sts.lo) {
mca_print_error(i);
if (CONFIG(ACPI_BERT) && mca_valid(mci.sts))
build_bert_mca_error(&mci);
}
}
mca_clear_errors(); mca_clear_errors();
} }

29
src/soc/amd/stoneyridge/mca.c
View File

@ -164,24 +164,13 @@ static void mca_print_error(unsigned int bank)
printk(BIOS_WARNING, " MC%u_CTL_MASK = %08x_%08x\n", bank, msr.hi, msr.lo); printk(BIOS_WARNING, " MC%u_CTL_MASK = %08x_%08x\n", bank, msr.hi, msr.lo);
} }
static void mca_clear_errors(void) static void mca_check_all_banks(void)
{ {
const unsigned int num_banks = mca_get_bank_count();
const msr_t msr = {.lo = 0, .hi = 0};
/* Zero all machine check error status registers */
for (unsigned int i = 0 ; i < num_banks ; i++)
wrmsr(IA32_MC0_STATUS + (i * 4), msr);
}
void check_mca(void)
{
unsigned int i;
struct mca_bank_status mci; struct mca_bank_status mci;
const unsigned int num_banks = mca_get_bank_count(); const unsigned int num_banks = mca_get_bank_count();
if (is_warm_reset()) { if (is_warm_reset()) {
for (i = 0 ; i < num_banks ; i++) { for (unsigned int i = 0 ; i < num_banks ; i++) {
if (i == 3) /* Reserved in Family 15h */ if (i == 3) /* Reserved in Family 15h */
continue; continue;
@ -195,6 +184,20 @@ void check_mca(void)
} }
} }
} }
}
static void mca_clear_errors(void)
{
const unsigned int num_banks = mca_get_bank_count();
const msr_t msr = {.lo = 0, .hi = 0};
/* Zero all machine check error status registers */
for (unsigned int i = 0 ; i < num_banks ; i++)
wrmsr(IA32_MC0_STATUS + (i * 4), msr);
}
void check_mca(void)
{
mca_check_all_banks();
mca_clear_errors(); mca_clear_errors();
} }