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

torvalds · torvalds · commit 42f8f9bc5cb7 · 2020-06-27T13:08:14.000-07:00
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
diff --git 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);
 	}

Original file line number	Diff line number	Diff line change
`@@ -269,6 +269,8 @@ static int get_scrub_rate(struct mem_ctl_info *mci)`
`269`	`269`
`270`	`270`	`if (pvt->model == 0x60)`
`271`	`271`	`amd64_read_pci_cfg(pvt->F2, F15H_M60H_SCRCTRL, &scrubval);`
	`272`	`+ else`
	`273`	`+ amd64_read_pci_cfg(pvt->F3, SCRCTRL, &scrubval);`
`272`	`274`	`} else {`
`273`	`275`	`amd64_read_pci_cfg(pvt->F3, SCRCTRL, &scrubval);`
`274`	`276`	`}`