From 4add9923c0cdc07ddfa554720d651f54aa2d2f2e Mon Sep 17 00:00:00 2001 From: Felix Held Date: Fri, 9 Jul 2021 23:04:27 +0200 Subject: soc/amd/*/mca: use mca_get_bank_count() Use the common mca_get_bank_count function instead of open-coding the functionality to get the MCA bank number. Also re-type the num_banks variable from signed in to unsigned int, since the number of MCA bank is always positive. Change-Id: I126767cf9ad468cab6d6537dd73e9b2dc377b5c4 Signed-off-by: Felix Held Reviewed-on: https://review.coreboot.org/c/coreboot/+/56185 Tested-by: build bot (Jenkins) Reviewed-by: Marshall Dawson --- src/soc/amd/picasso/mca.c | 6 ++---- src/soc/amd/stoneyridge/mca.c | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'src/soc') diff --git a/src/soc/amd/picasso/mca.c b/src/soc/amd/picasso/mca.c index 12d4cccbc8..acb248d2f4 100644 --- a/src/soc/amd/picasso/mca.c +++ b/src/soc/amd/picasso/mca.c @@ -152,12 +152,10 @@ static const char *const mca_bank_name[] = { void check_mca(void) { int i; - msr_t cap; struct mca_bank mci; - int num_banks; + unsigned int num_banks; - cap = rdmsr(IA32_MCG_CAP); - num_banks = cap.lo & MCA_BANKS_MASK; + num_banks = mca_get_bank_count(); for (i = 0 ; i < num_banks ; i++) { mci.sts = rdmsr(MCAX_STATUS_MSR(i)); diff --git a/src/soc/amd/stoneyridge/mca.c b/src/soc/amd/stoneyridge/mca.c index 346cd6da48..db5fabc389 100644 --- a/src/soc/amd/stoneyridge/mca.c +++ b/src/soc/amd/stoneyridge/mca.c @@ -151,12 +151,10 @@ static const char *const mca_bank_name[] = { void check_mca(void) { int i; - msr_t cap; struct mca_bank mci; - int num_banks; + unsigned int num_banks; - cap = rdmsr(IA32_MCG_CAP); - num_banks = cap.lo & MCA_BANKS_MASK; + num_banks = mca_get_bank_count(); if (is_warm_reset()) { for (i = 0 ; i < num_banks ; i++) { -- cgit v1.2.3