Re: EDAC instances probing
From: Yazen Ghannam <yazen.ghannam@amd.com>
Date: 2021-01-23 04:46:23
On Wed, Jan 13, 2021 at 09:33:16PM +0100, Borislav Petkov wrote:
quoted hunk ↗ jump to hunk
I'm soo stupid. Usually I do the simplest solution but this time it has escaped me. But I caught it now: ---diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index 9868f95a5622..105d00b27be2 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c@@ -3528,8 +3528,7 @@ static bool ecc_enabled(struct amd64_pvt *pvt) MSR_IA32_MCG_CTL, nid); } - amd64_info("Node %d: DRAM ECC %s.\n", - nid, (ecc_en ? "enabled" : "disabled")); + edac_dbg(3, "Node %d: DRAM ECC %s.\n", nid, (ecc_en ? "enabled" : "disabled")); if (!ecc_en || !nb_mce_en) return false;@@ -3689,11 +3688,6 @@ static struct amd64_family_type *per_family_init(struct amd64_pvt *pvt) return NULL; } - amd64_info("%s %sdetected (node %d).\n", fam_type->ctl_name, - (pvt->fam == 0xf ? - (pvt->ext_model >= K8_REV_F ? "revF or later " - : "revE or earlier ") - : ""), pvt->mc_node_id); return fam_type; }@@ -3867,6 +3861,12 @@ static int probe_one_instance(unsigned int nid) dump_misc_regs(pvt); + amd64_info("%s %sdetected (node %d).\n", fam_type->ctl_name, + (pvt->fam == 0xf ? + (pvt->ext_model >= K8_REV_F ? "revF or later " + : "revE or earlier ") + : ""), pvt->mc_node_id); + return ret; err_enable: --
I like it. I tested it out on one of my server systems, and it seems to work well. Tested-by: Yazen Ghannam <yazen.ghannam@amd.com> Thanks, Yazen