This is a note to let you know that I've just added the patch titled
EDAC/amd64: Read back the scrub rate PCI register on F15h
to the 5.7-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
edac-amd64-read-back-the-scrub-rate-pci-register-on-f15h.patch
and it can be found in the queue-5.7 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From ee470bb25d0dcdf126f586ec0ae6dca66cb340a4 Mon Sep 17 00:00:00 2001
From: Borislav Petkov <bp@xxxxxxx>
Date: Thu, 18 Jun 2020 20:25:25 +0200
Subject: EDAC/amd64: Read back the scrub rate PCI register on F15h
From: Borislav Petkov <bp@xxxxxxx>
commit ee470bb25d0dcdf126f586ec0ae6dca66cb340a4 upstream.
Commit:
da92110dfdfa ("EDAC, amd64_edac: Extend scrub rate support to F15hM60h")
added support for F15h, model 0x60 CPUs but in doing so, missed to read
back SCRCTRL PCI config register on F15h CPUs which are *not* model
0x60. Add that read so that doing
$ cat /sys/devices/system/edac/mc/mc0/sdram_scrub_rate
can show the previously set DRAM scrub rate.
Fixes: da92110dfdfa ("EDAC, amd64_edac: Extend scrub rate support to F15hM60h")
Reported-by: Anders Andersson <pipatron@xxxxxxxxx>
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Cc: <stable@xxxxxxxxxxxxxxx> #v4.4..
Link: https://lkml.kernel.org/r/CAKkunMbNWppx_i6xSdDHLseA2QQmGJqj_crY=NF-GZML5np4Vw@xxxxxxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/edac/amd64_edac.c | 2 ++
1 file changed, 2 insertions(+)
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -272,6 +272,8 @@ static int get_scrub_rate(struct mem_ctl
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);
}
Patches currently in stable-queue which might be from bp@xxxxxxx are
queue-5.7/x86-asm-64-align-start-of-__clear_user-loop-to-16-bytes.patch
queue-5.7/x86-resctrl-fix-a-null-vs-is_err-static-checker-warn.patch
queue-5.7/x86-cpu-reinitialize-ia32_feat_ctl-msr-on-bsp-during-wakeup.patch
queue-5.7/edac-amd64-read-back-the-scrub-rate-pci-register-on-f15h.patch
queue-5.7/x86-cpu-move-resctrl-cpuid-code-to-resctrl.patch
queue-5.7/x86-resctrl-support-cpuid-enumeration-of-mbm-counter.patch
queue-5.7/x86-resctrl-fix-memory-bandwidth-counter-width-for-a.patch
