Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-12 00:00:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

A single fix for amd64_edac restoring the reporting of the DRAM scrub

Browse Source 
rate on family 0x15 CPUs
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEzv7L6UO9uDPlPSfHEsHwGGHeVUoFAl73JTwACgkQEsHwGGHe
 VUrKhw/9FwG6ow1vBVqwqwBItAlJ7wVBSE27iLnPoCtIIsvci1duAysJ03WlfeDf
 KnqhpHYRmzLwUYmDggzlumltE4aR0wgTDaknCC6SdkWEpzdNBgFxtTUPZwmRR25m
 TJDuVbdbqpV8sKc3E/5YY1Z7FLAeSJJJLKTMyWnm8FXpTXfQ9zbBQtvOoJS2+tpb
 k2H/jlw/ws4K7YLs/YiHD8oBpC+S2vEZGRq9iaOJ0Hze47+IpHdg0uSWG/aMlgr8
 IkPwOP6bbuSxfZWeG+y15VGexPyo2IDMK1bEV4nxrkl9vr/m+q2dcmGPh3qQmy4N
 /JdF8bCTiyw8AKwCHUkVP6I9kML9aIHiHVlfcCkpHB5EsC8WEJi/d5Ilf0Wq99HX
 gDEsO3abOaleCqsntdfkk4ZANgHcnx90kToQLNgsjmIPz/qCx9btWgTQkOTb0khw
 po6pExW+JRQ6Q9ZSUe5N15tWKoMIiJE/7mtnbTOXtxzCAcj7Fw+wAFhDo91cmtti
 3CSIftzN7yyd/ruNa/XcJ/Aq+GYNnx7N5zz6nLo6sDsWeO4URWLigV7HLuH+3OPi
 wedlzyjqwFYx9Blv9Uu1FnvpOv/qt6ofMnqiEOgyOpKu7kiwuYJ0LX10Q8n/R5k3
 iwxTD3LofYSo3RSJbQ1f9qio789TRbtTj4l+/WVFn+wyNXDDFNA=
 =Ti/g
 -----END PGP SIGNATURE-----

Merge tag 'edac_urgent_for_5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras

Pull EDAC fix from Borislav Petkov:
 "A single fix for amd64_edac restoring the reporting of the DRAM scrub
  rate on family 0x15 CPUs"

* tag 'edac_urgent_for_5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  EDAC/amd64: Read back the scrub rate PCI register on F15h
This commit is contained in:
Linus Torvalds 2020-06-27 13:08:14 -07:00
commit 42f8f9bc5c
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/edac/amd64_edac.c
View File

@ -269,6 +269,8 @@ static int get_scrub_rate(struct mem_ctl_info *mci)
if (pvt->model == 0x60) if (pvt->model == 0x60)
amd64_read_pci_cfg(pvt->F2, F15H_M60H_SCRCTRL, &scrubval); amd64_read_pci_cfg(pvt->F2, F15H_M60H_SCRCTRL, &scrubval);
else
amd64_read_pci_cfg(pvt->F3, SCRCTRL, &scrubval);
} else { } else {
amd64_read_pci_cfg(pvt->F3, SCRCTRL, &scrubval); amd64_read_pci_cfg(pvt->F3, SCRCTRL, &scrubval);
} }