Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 28 Feb 2017 11:42:05 +0000 (UTC)
From:      Andriy Gapon <avg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r314386 - stable/10/sys/x86/x86
Message-ID:  <201702281142.v1SBg5BZ016684@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: avg
Date: Tue Feb 28 11:42:04 2017
New Revision: 314386
URL: https://svnweb.freebsd.org/changeset/base/314386

Log:
  MFC r313751: mca: fix writes to MSR_MC_CTL2 in cmci_update

Modified:
  stable/10/sys/x86/x86/mca.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/x86/x86/mca.c
==============================================================================
--- stable/10/sys/x86/x86/mca.c	Tue Feb 28 11:41:57 2017	(r314385)
+++ stable/10/sys/x86/x86/mca.c	Tue Feb 28 11:42:04 2017	(r314386)
@@ -550,7 +550,7 @@ cmci_update(enum scan_mode mode, int ban
 			limit = min(limit << 1, cc->max_threshold);
 			ctl &= ~MC_CTL2_THRESHOLD;
 			ctl |= limit;
-			wrmsr(MSR_MC_CTL2(bank), limit);
+			wrmsr(MSR_MC_CTL2(bank), ctl);
 		}
 		cc->last_intr = time_uptime;
 		return;
@@ -583,7 +583,7 @@ cmci_update(enum scan_mode mode, int ban
 	if ((ctl & MC_CTL2_THRESHOLD) != limit) {
 		ctl &= ~MC_CTL2_THRESHOLD;
 		ctl |= limit;
-		wrmsr(MSR_MC_CTL2(bank), limit);
+		wrmsr(MSR_MC_CTL2(bank), ctl);
 	}
 }
 #endif



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702281142.v1SBg5BZ016684>