Linux-EDAC Archive on lore.kernel.org
 help / color / Atom feed
* [GIT PULL] EDAC urgent for 5.8
@ 2020-06-27 10:59 Borislav Petkov
  2020-06-27 20:25 ` pr-tracker-bot
  0 siblings, 1 reply; 2+ messages in thread
From: Borislav Petkov @ 2020-06-27 10:59 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: linux-edac, lkml

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [GIT PULL] EDAC urgent for 5.8
  2020-06-27 10:59 [GIT PULL] EDAC urgent for 5.8 Borislav Petkov
@ 2020-06-27 20:25 ` pr-tracker-bot
  0 siblings, 0 replies; 2+ messages in thread
From: pr-tracker-bot @ 2020-06-27 20:25 UTC (permalink / raw)
  To: Borislav Petkov; +Cc: Linus Torvalds, linux-edac, lkml

The pull request you sent on Sat, 27 Jun 2020 12:59:18 +0200:

> git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git tags/edac_urgent_for_5.8

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/42f8f9bc5cb7c35ca04a6867cc01c24538d59f7f

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-27 10:59 [GIT PULL] EDAC urgent for 5.8 Borislav Petkov
2020-06-27 20:25 ` pr-tracker-bot

Linux-EDAC Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-edac/0 linux-edac/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-edac linux-edac/ https://lore.kernel.org/linux-edac \
		linux-edac@vger.kernel.org
	public-inbox-index linux-edac

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-edac


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git