From patchwork Sat Jun 27 10:59:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 11629539 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 90E3490 for ; Sat, 27 Jun 2020 10:59:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 76FC6214DB for ; Sat, 27 Jun 2020 10:59:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726175AbgF0K7a (ORCPT ); Sat, 27 Jun 2020 06:59:30 -0400 Received: from mx2.suse.de ([195.135.220.15]:60582 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725991AbgF0K73 (ORCPT ); Sat, 27 Jun 2020 06:59:29 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id C6527ABE4; Sat, 27 Jun 2020 10:59:27 +0000 (UTC) Date: Sat, 27 Jun 2020 12:59:18 +0200 From: Borislav Petkov To: Linus Torvalds Cc: linux-edac , lkml Subject: [GIT PULL] EDAC urgent for 5.8 Message-ID: <20200627105918.GD18956@zn.tnic> MIME-Version: 1.0 Content-Disposition: inline Sender: linux-edac-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-edac@vger.kernel.org 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); }