From ba6fd3b373ea4cff9e4aced2b8c7ee70858721c3 Mon Sep 17 00:00:00 2001 From: Wenhui Fan Date: Fri, 21 Feb 2025 10:43:36 +0800 Subject: [PATCH] EDAC/amd64: Add support family types for hygon family 4h~5h and 7h. hygon inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IBNT4E CVE: NA --------------------------- In commit f53aa5cf1c23, it revert the support for hygon family 4h~5h and 7h committed by Hygon, this will cause the print info incorrectly after edac driver loaded. Fixes: f53aa5cf1c23 ("EDAC/amd64: Merge struct amd64_family_type into struct amd64_pvt") Signed-off-by: Wenhui Fan --- drivers/edac/amd64_edac.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index ce947c4bf967..e3aa5d9778fe 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -3574,9 +3574,20 @@ static int per_family_init(struct amd64_pvt *pvt) case 0x18: switch (pvt->model) { + case 0x04: + pvt->ctl_name = "F18h_M04h"; + pvt->max_mcs = 3; + break; + case 0x05: + pvt->ctl_name = "F18h_M05h"; + pvt->max_mcs = 1; + break; case 0x06: pvt->ctl_name = "F18h_M06h"; break; + case 0x07: + pvt->ctl_name = "F18h_M07h"; + break; case 0x10: pvt->ctl_name = "F18h_M10h"; break; -- Gitee