EDAC/amd64: Split dump_misc_regs() into dct/umc functions

Add a function pointer to pvt->ops.

No functional change is intended.

  [ Yazen: Rebased/reworked patch and reworded commit message. ]

Signed-off-by: Muralidhara M K <muralidhara.mk@amd.com>
Co-developed-by: Naveen Krishna Chatradhi <naveenkrishna.chatradhi@amd.com>
Signed-off-by: Naveen Krishna Chatradhi <naveenkrishna.chatradhi@amd.com>
Co-developed-by: Yazen Ghannam <yazen.ghannam@amd.com>
Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20230127170419.1824692-22-yazen.ghannam@amd.com

diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index 0d96eae..7446b48 100644 (file)
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -1525,7 +1525,7 @@ static void umc_debug_display_dimm_sizes(struct amd64_pvt *pvt, u8 ctrl)
        }
 }
 
-static void __dump_misc_regs_df(struct amd64_pvt *pvt)
+static void umc_dump_misc_regs(struct amd64_pvt *pvt)
 {
        struct amd64_umc *umc;
        u32 i, tmp, umc_base;
@@ -1568,8 +1568,7 @@ static void __dump_misc_regs_df(struct amd64_pvt *pvt)
        }
 }
 
-/* Display and decode various NB registers for debug purposes. */
-static void __dump_misc_regs(struct amd64_pvt *pvt)
+static void dct_dump_misc_regs(struct amd64_pvt *pvt)
 {
        edac_dbg(1, "F3xE8 (NB Cap): 0x%08x\n", pvt->nbcap);
 
@@ -1606,15 +1605,6 @@ static void __dump_misc_regs(struct amd64_pvt *pvt)
        amd64_info("using x%u syndromes.\n", pvt->ecc_sym_sz);
 }
 
-/* Display and decode various NB registers for debug purposes. */
-static void dump_misc_regs(struct amd64_pvt *pvt)
-{
-       if (pvt->umc)
-               __dump_misc_regs_df(pvt);
-       else
-               __dump_misc_regs(pvt);
-}
-
 /*
  * See BKDG, F2x[1,0][5C:40], F2[1,0][6C:60]
  */
@@ -3694,6 +3684,7 @@ static struct low_ops umc_ops = {
        .hw_info_get                    = umc_hw_info_get,
        .ecc_enabled                    = umc_ecc_enabled,
        .setup_mci_misc_attrs           = umc_setup_mci_misc_attrs,
+       .dump_misc_regs                 = umc_dump_misc_regs,
 };
 
 /* Use Family 16h versions for defaults and adjust as needed below. */
@@ -3703,6 +3694,7 @@ static struct low_ops dct_ops = {
        .hw_info_get                    = dct_hw_info_get,
        .ecc_enabled                    = dct_ecc_enabled,
        .setup_mci_misc_attrs           = dct_setup_mci_misc_attrs,
+       .dump_misc_regs                 = dct_dump_misc_regs,
 };
 
 static int per_family_init(struct amd64_pvt *pvt)
@@ -3953,7 +3945,8 @@ static int probe_one_instance(unsigned int nid)
 
        amd64_info("%s detected (node %d).\n", pvt->ctl_name, pvt->mc_node_id);
 
-       dump_misc_regs(pvt);
+       /* Display and decode various registers for debug purposes. */
+       pvt->ops->dump_misc_regs(pvt);
 
        return ret;
 

diff --git a/drivers/edac/amd64_edac.h b/drivers/edac/amd64_edac.h
index 1fb39d7..1c64fd4 100644 (file)
--- a/drivers/edac/amd64_edac.h
+++ b/drivers/edac/amd64_edac.h
@@ -469,6 +469,7 @@ struct low_ops {
        int (*hw_info_get)(struct amd64_pvt *pvt);
        bool (*ecc_enabled)(struct amd64_pvt *pvt);
        void (*setup_mci_misc_attrs)(struct mem_ctl_info *mci);
+       void (*dump_misc_regs)(struct amd64_pvt *pvt);
 };
 
 int __amd64_read_pci_cfg_dword(struct pci_dev *pdev, int offset,