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

soc/amd/picasso,stoneyridge/mca: clean up mca_bank struct 

Only the fields bank and sts from the mca_bank struct were used outside
a local scope, so remove the rest. Also rename the struct that now only
contains the bank number and the status MSR content to mca_bank_status.

Change-Id: I925347dff950ac2bd021635ca988c02fba48df7f
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/56237
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 21:47:57 +02:00
parent c0a6a0efc4
commit 5183abd312
2 changed files with 34 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,13 +13,9 @@
/* MISC4 is the last used register in the MCAX banks of Picasso */ /* MISC4 is the last used register in the MCAX banks of Picasso */
#define MCAX_USED_REGISTERS_PER_BANK (MCAX_MISC4_OFFSET + 1) #define MCAX_USED_REGISTERS_PER_BANK (MCAX_MISC4_OFFSET + 1)
struct mca_bank { struct mca_bank_status {
int bank; int bank;
msr_t ctl;
msr_t sts; msr_t sts;
msr_t addr;
msr_t misc;
msr_t cmask;
}; };
static inline size_t mca_report_size_reqd(void) static inline size_t mca_report_size_reqd(void)
@ -50,7 +46,7 @@ static inline size_t mca_report_size_reqd(void)
return size; return size;
} }
static enum cper_x86_check_type error_to_chktype(struct mca_bank *mci) static enum cper_x86_check_type error_to_chktype(struct mca_bank_status *mci)
{ {
int error = mca_err_type(mci->sts); int error = mca_err_type(mci->sts);
@ -68,7 +64,7 @@ static enum cper_x86_check_type error_to_chktype(struct mca_bank *mci)
/* Fill additional information in the Generic Processor Error Section. */ /* Fill additional information in the Generic Processor Error Section. */
static void fill_generic_section(cper_proc_generic_error_section_t *sec, static void fill_generic_section(cper_proc_generic_error_section_t *sec,
struct mca_bank *mci) struct mca_bank_status *mci)
{ {
int type = mca_err_type(mci->sts); int type = mca_err_type(mci->sts);
@ -91,7 +87,7 @@ static void fill_generic_section(cper_proc_generic_error_section_t *sec,
* structures: A "processor generic error" that is parsed, and an IA32/X64 one * structures: A "processor generic error" that is parsed, and an IA32/X64 one
* to capture complete information. * to capture complete information.
*/ */
static void build_bert_mca_error(struct mca_bank *mci) static void build_bert_mca_error(struct mca_bank_status *mci)
{ {
acpi_generic_error_status_t *status; acpi_generic_error_status_t *status;
acpi_hest_generic_data_v300_t *gen_entry; acpi_hest_generic_data_v300_t *gen_entry;
@ -153,7 +149,8 @@ static const char *const mca_bank_name[] = {
void check_mca(void) void check_mca(void)
{ {
int i; int i;
struct mca_bank mci; struct mca_bank_status mci;
msr_t msr;
const unsigned int num_banks = mca_get_bank_count(); const unsigned int num_banks = mca_get_bank_count();
for (i = 0 ; i < num_banks ; i++) { for (i = 0 ; i < num_banks ; i++) {
@ -165,18 +162,18 @@ void check_mca(void)
printk(BIOS_WARNING, " MC%d_STATUS = %08x_%08x\n", printk(BIOS_WARNING, " MC%d_STATUS = %08x_%08x\n",
i, mci.sts.hi, mci.sts.lo); i, mci.sts.hi, mci.sts.lo);
mci.addr = rdmsr(MCAX_ADDR_MSR(i)); msr = rdmsr(MCAX_ADDR_MSR(i));
printk(BIOS_WARNING, " MC%d_ADDR = %08x_%08x\n", printk(BIOS_WARNING, " MC%d_ADDR = %08x_%08x\n",
i, mci.addr.hi, mci.addr.lo); i, msr.hi, msr.lo);
mci.misc = rdmsr(MCAX_MISC0_MSR(i)); msr = rdmsr(MCAX_MISC0_MSR(i));
printk(BIOS_WARNING, " MC%d_MISC = %08x_%08x\n", printk(BIOS_WARNING, " MC%d_MISC = %08x_%08x\n",
i, mci.misc.hi, mci.misc.lo); i, msr.hi, msr.lo);
mci.ctl = rdmsr(MCAX_CTL_MSR(i)); msr = rdmsr(MCAX_CTL_MSR(i));
printk(BIOS_WARNING, " MC%d_CTL = %08x_%08x\n", printk(BIOS_WARNING, " MC%d_CTL = %08x_%08x\n",
i, mci.ctl.hi, mci.ctl.lo); i, msr.hi, msr.lo);
mci.cmask = rdmsr(MCA_CTL_MASK_MSR(i)); msr = rdmsr(MCA_CTL_MASK_MSR(i));
printk(BIOS_WARNING, " MC%d_CTL_MASK = %08x_%08x\n", printk(BIOS_WARNING, " MC%d_CTL_MASK = %08x_%08x\n",
i, mci.cmask.hi, mci.cmask.lo); i, msr.hi, msr.lo);
mci.bank = i; mci.bank = i;
if (CONFIG(ACPI_BERT) && mca_valid(mci.sts)) if (CONFIG(ACPI_BERT) && mca_valid(mci.sts))
@ -185,8 +182,8 @@ void check_mca(void)
} }
/* zero the machine check error status registers */ /* zero the machine check error status registers */
mci.sts.lo = 0; msr.lo = 0;
mci.sts.hi = 0; msr.hi = 0;
for (i = 0 ; i < num_banks ; i++) for (i = 0 ; i < num_banks ; i++)
wrmsr(MCAX_STATUS_MSR(i), mci.sts); wrmsr(MCAX_STATUS_MSR(i), msr);
} }

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

@ -9,13 +9,9 @@
#include <arch/bert_storage.h> #include <arch/bert_storage.h>
#include <cper.h> #include <cper.h>
struct mca_bank { struct mca_bank_status {
int bank; int bank;
msr_t ctl;
msr_t sts; msr_t sts;
msr_t addr;
msr_t misc;
msr_t cmask;
}; };
static inline size_t mca_report_size_reqd(void) static inline size_t mca_report_size_reqd(void)
@ -45,7 +41,7 @@ static inline size_t mca_report_size_reqd(void)
return size; return size;
} }
static enum cper_x86_check_type error_to_chktype(struct mca_bank *mci) static enum cper_x86_check_type error_to_chktype(struct mca_bank_status *mci)
{ {
int error = mca_err_type(mci->sts); int error = mca_err_type(mci->sts);
@ -63,7 +59,7 @@ static enum cper_x86_check_type error_to_chktype(struct mca_bank *mci)
/* Fill additional information in the Generic Processor Error Section. */ /* Fill additional information in the Generic Processor Error Section. */
static void fill_generic_section(cper_proc_generic_error_section_t *sec, static void fill_generic_section(cper_proc_generic_error_section_t *sec,
struct mca_bank *mci) struct mca_bank_status *mci)
{ {
int type = mca_err_type(mci->sts); int type = mca_err_type(mci->sts);
@ -91,7 +87,7 @@ static void fill_generic_section(cper_proc_generic_error_section_t *sec,
* Processor Generic section and the failing error/check added to the * Processor Generic section and the failing error/check added to the
* IA32/X64 section. * IA32/X64 section.
*/ */
static void build_bert_mca_error(struct mca_bank *mci) static void build_bert_mca_error(struct mca_bank_status *mci)
{ {
acpi_generic_error_status_t *status; acpi_generic_error_status_t *status;
acpi_hest_generic_data_v300_t *gen_entry; acpi_hest_generic_data_v300_t *gen_entry;
@ -152,7 +148,8 @@ static const char *const mca_bank_name[] = {
void check_mca(void) void check_mca(void)
{ {
int i; int i;
struct mca_bank mci; struct mca_bank_status mci;
msr_t msr;
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()) {
@ -167,18 +164,18 @@ void check_mca(void)
printk(BIOS_WARNING, " MC%d_STATUS = %08x_%08x\n", printk(BIOS_WARNING, " MC%d_STATUS = %08x_%08x\n",
i, mci.sts.hi, mci.sts.lo); i, mci.sts.hi, mci.sts.lo);
mci.addr = rdmsr(IA32_MC0_ADDR + (i * 4)); msr = rdmsr(IA32_MC0_ADDR + (i * 4));
printk(BIOS_WARNING, " MC%d_ADDR = %08x_%08x\n", printk(BIOS_WARNING, " MC%d_ADDR = %08x_%08x\n",
i, mci.addr.hi, mci.addr.lo); i, msr.hi, msr.lo);
mci.misc = rdmsr(IA32_MC0_MISC + (i * 4)); msr = rdmsr(IA32_MC0_MISC + (i * 4));
printk(BIOS_WARNING, " MC%d_MISC = %08x_%08x\n", printk(BIOS_WARNING, " MC%d_MISC = %08x_%08x\n",
i, mci.misc.hi, mci.misc.lo); i, msr.hi, msr.lo);
mci.ctl = rdmsr(IA32_MC0_CTL + (i * 4)); msr = rdmsr(IA32_MC0_CTL + (i * 4));
printk(BIOS_WARNING, " MC%d_CTL = %08x_%08x\n", printk(BIOS_WARNING, " MC%d_CTL = %08x_%08x\n",
i, mci.ctl.hi, mci.ctl.lo); i, msr.hi, msr.lo);
mci.cmask = rdmsr(MC0_CTL_MASK + i); msr = rdmsr(MC0_CTL_MASK + i);
printk(BIOS_WARNING, " MC%d_CTL_MASK = %08x_%08x\n", printk(BIOS_WARNING, " MC%d_CTL_MASK = %08x_%08x\n",
i, mci.cmask.hi, mci.cmask.lo); i, msr.hi, msr.lo);
mci.bank = i; mci.bank = i;
if (CONFIG(ACPI_BERT) && mca_valid(mci.sts)) if (CONFIG(ACPI_BERT) && mca_valid(mci.sts))
@ -188,8 +185,8 @@ void check_mca(void)
} }
/* zero the machine check error status registers */ /* zero the machine check error status registers */
mci.sts.lo = 0; msr.lo = 0;
mci.sts.hi = 0; msr.hi = 0;
for (i = 0 ; i < num_banks ; i++) for (i = 0 ; i < num_banks ; i++)
wrmsr(IA32_MC0_STATUS + (i * 4), mci.sts); wrmsr(IA32_MC0_STATUS + (i * 4), msr);
} }