diff options
| author | Borislav Petkov <bp@suse.de> | 2020-06-18 20:25:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-07-09 09:37:09 +0200 |
| commit | a0b3103d7c897db89604b59249dbe64ddc4a2111 (patch) | |
| tree | e555d2ae2aa43c84593c71a2f24e7155cddf925b | |
| parent | fa11088c6f75f8da2e20dd2b80105b67f0e4f117 (diff) | |
| download | linux-stable-a0b3103d7c897db89604b59249dbe64ddc4a2111.tar.gz linux-stable-a0b3103d7c897db89604b59249dbe64ddc4a2111.tar.bz2 linux-stable-a0b3103d7c897db89604b59249dbe64ddc4a2111.zip | |
EDAC/amd64: Read back the scrub rate PCI register on F15h
[ Upstream commit ee470bb25d0dcdf126f586ec0ae6dca66cb340a4 ]
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@gmail.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: <stable@vger.kernel.org> #v4.4..
Link: https://lkml.kernel.org/r/CAKkunMbNWppx_i6xSdDHLseA2QQmGJqj_crY=NF-GZML5np4Vw@mail.gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/edac/amd64_edac.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index 268ada29cd98..cbe415853197 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -261,6 +261,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); break; case 0x17: |