amd64_edac: Simplify scrubrate setting

Drop per-instance variable and compute min scrubrate dynamically.

Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>

2 files changed, 5 insertions, 13 deletions

diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index eb6b6bace683..0caf05e376cb 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -193,8 +193,12 @@ static int __amd64_set_scrub_rate(struct pci_dev *ctl, u32 new_bw, u32 min_rate)
 static int amd64_set_scrub_rate(struct mem_ctl_info *mci, u32 bw)
 {
         struct amd64_pvt *pvt = mci->pvt_info;
+        u32 min_scrubrate = 0x5;
 
-        return __amd64_set_scrub_rate(pvt->F3, bw, pvt->min_scrubrate);
+        if (boot_cpu_data.x86 == 0xf)
+                min_scrubrate = 0x0;
+
+        return __amd64_set_scrub_rate(pvt->F3, bw, min_scrubrate);
 }
 
 static int amd64_get_scrub_rate(struct mem_ctl_info *mci)
@@ -2399,13 +2403,11 @@ static struct amd64_family_type *amd64_per_family_init(struct amd64_pvt *pvt)
                 fam_type                = &amd64_family_types[K8_CPUS];
                 pvt->ops                = &amd64_family_types[K8_CPUS].ops;
                 pvt->ctl_name           = fam_type->ctl_name;
-                pvt->min_scrubrate      = K8_MIN_SCRUB_RATE_BITS;
                 break;
         case 0x10:
                 fam_type                = &amd64_family_types[F10_CPUS];
                 pvt->ops                = &amd64_family_types[F10_CPUS].ops;
                 pvt->ctl_name           = fam_type->ctl_name;
-                pvt->min_scrubrate      = F10_MIN_SCRUB_RATE_BITS;
                 break;
 
         default:
diff --git a/drivers/edac/amd64_edac.h b/drivers/edac/amd64_edac.h
index 8e431ab6a983..3f853ed684af 100644
--- a/drivers/edac/amd64_edac.h
+++ b/drivers/edac/amd64_edac.h
@@ -368,9 +368,6 @@ struct amd64_pvt {
         /* place to store error injection parameters prior to issue */
         struct error_injection injection;
 
-        /* DCT per-family scrubrate setting */
-        u32 min_scrubrate;
-
         /* family name this instance is running on */
         const char *ctl_name;
 
@@ -468,12 +465,5 @@ int __amd64_write_pci_cfg_dword(struct pci_dev *pdev, int offset,
 #define amd64_read_dct_pci_cfg(pvt, offset, val) \
         pvt->ops->read_dct_pci_cfg(pvt, offset, val, __func__)
 
-/*
- * For future CPU versions, verify the following as new 'slow' rates appear and
- * modify the necessary skip values for the supported CPU.
- */
-#define K8_MIN_SCRUB_RATE_BITS  0x0
-#define F10_MIN_SCRUB_RATE_BITS 0x5
-
 int amd64_get_dram_hole_info(struct mem_ctl_info *mci, u64 *hole_base,
                              u64 *hole_offset, u64 *hole_size);