Hi Linus,
please pull a single fix for amd64_edac.
Thx.
---
The following changes since commit b3a9e3b9622ae10064826dccb4f7a52bd88c7407:
Linux 5.8-rc1 (2020-06-14 12:45:04 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git
tags/edac_urgent_for_5.8
for you to fetch changes up to ee470bb25d0dcdf126f586ec0ae6dca66cb340a4:
EDAC/amd64: Read back the scrub rate PCI register on F15h (2020-06-18
20:25:25 +0200)
----------------------------------------------------------------
A single fix for amd64_edac restoring the reporting of the DRAM scrub
rate on family 0x15 CPUs
----------------------------------------------------------------
Borislav Petkov (1):
EDAC/amd64: Read back the scrub rate PCI register on F15h
drivers/edac/amd64_edac.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index ef90070a9194..6262f6370c5d 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -269,6 +269,8 @@ static int get_scrub_rate(struct mem_ctl_info *mci)
if (pvt->model == 0x60)
amd64_read_pci_cfg(pvt->F2, F15H_M60H_SCRCTRL,
&scrubval);
+ else
+ amd64_read_pci_cfg(pvt->F3, SCRCTRL, &scrubval);
} else {
amd64_read_pci_cfg(pvt->F3, SCRCTRL, &scrubval);
}
--
Regards/Gruss,
Boris.
SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG
Nürnberg
