[1/3] EDAC/amd64: Print ECC enabled/disabled for nodes with enabled MCs
From: Yazen Ghannam <yazen.ghannam@amd.com>
Date: 2018-03-21 19:13:54
Also in:
lkml
Subsystem:
edac-amd64, edac-core, the rest · Maintainers:
Yazen Ghannam, Borislav Petkov, Tony Luck, Linus Torvalds
From: Yazen Ghannam <yazen.ghannam@amd.com> It's possible that a system can be used without any DRAM populated on one or more physical Dies on multi-die systems. Firmware will not enable DRAM ECC on Dies without DRAM. Users will then see a message about DRAM ECC disabled on those nodes without DRAM. However, DRAM ECC may, in fact, be enabled on the other Dies that have DRAM. Only print ECC enabled/disabled information for nodes that have at least one enabled memory channel. A memory channel that is unused, i.e. has no DRAM, should be seen as disabled. DRAM ECC information is not relevant on nodes without DRAM. Cc: <redacted> # 4.14.x Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com> --- drivers/edac/amd64_edac.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index 329cb96f886f..af0ce9aa8d24 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c@@ -3035,6 +3035,7 @@ static const char *ecc_msg = static bool ecc_enabled(struct pci_dev *F3, u16 nid) { bool nb_mce_en = false; + bool mc_en = true; u8 ecc_en = 0, i; u32 value;
@@ -3060,6 +3061,8 @@ static bool ecc_enabled(struct pci_dev *F3, u16 nid) ecc_en_mask |= BIT(i); } + mc_en = !!umc_en_mask; + /* Check whether at least one UMC is enabled: */ if (umc_en_mask) ecc_en = umc_en_mask == ecc_en_mask;
@@ -3079,14 +3082,19 @@ static bool ecc_enabled(struct pci_dev *F3, u16 nid) MSR_IA32_MCG_CTL, nid); } - amd64_info("Node %d: DRAM ECC %s.\n", - nid, (ecc_en ? "enabled" : "disabled")); + /* + * Only print ECC enabled/disabled messages for nodes with enabled + * memory controllers. + */ + if (mc_en) { + amd64_info("Node %d: DRAM ECC %s.\n", + nid, (ecc_en ? "enabled" : "disabled")); - if (!ecc_en || !nb_mce_en) { - amd64_info("%s", ecc_msg); - return false; + if (!ecc_en || !nb_mce_en) + amd64_info("%s", ecc_msg); } - return true; + + return ecc_en && nb_mce_en; } static inline void