From owner-svn-src-all@FreeBSD.ORG  Sat Aug 15 15:52:20 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E084D1065690;
	Sat, 15 Aug 2009 15:52:20 +0000 (UTC)
	(envelope-from stas@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CE56C8FC59;
	Sat, 15 Aug 2009 15:52:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7FFqKCO076299;
	Sat, 15 Aug 2009 15:52:20 GMT (envelope-from stas@svn.freebsd.org)
Received: (from stas@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7FFqKJQ076297;
	Sat, 15 Aug 2009 15:52:20 GMT (envelope-from stas@svn.freebsd.org)
Message-Id: <200908151552.n7FFqKJQ076297@svn.freebsd.org>
From: Stanislav Sedov <stas@FreeBSD.org>
Date: Sat, 15 Aug 2009 15:52:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196251 - in stable/7/sys: . contrib/pf dev/cpuctl
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 15 Aug 2009 15:52:21 -0000

Author: stas
Date: Sat Aug 15 15:52:20 2009
New Revision: 196251
URL: http://svn.freebsd.org/changeset/base/196251

Log:
  - MFC r195081:
    - Don't zero data field in case of MSR write operation.  Before this change
      the value written to MSR register was always 0 regardless of value passed
      by user.
    - Use proper data pointer when performing AMD microcode update.  Previously,
      the pointer to user-space data has been provided instead, which is totally
      incorrect.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/cpuctl/cpuctl.c

Modified: stable/7/sys/dev/cpuctl/cpuctl.c
==============================================================================
--- stable/7/sys/dev/cpuctl/cpuctl.c	Sat Aug 15 15:48:10 2009	(r196250)
+++ stable/7/sys/dev/cpuctl/cpuctl.c	Sat Aug 15 15:52:20 2009	(r196251)
@@ -223,14 +223,17 @@ cpuctl_do_msr(int cpu, cpuctl_msr_args_t
 	 * Explicitly clear cpuid data to avoid returning stale
 	 * info
 	 */
-	data->data = 0;
 	DPRINTF("[cpuctl,%d]: operating on MSR %#0x for %d cpu\n", __LINE__,
 	    data->msr, cpu);
 	oldcpu = td->td_oncpu;
 	is_bound = cpu_sched_is_bound(td);
 	set_cpu(cpu, td);
-	ret = cmd == CPUCTL_RDMSR ? rdmsr_safe(data->msr, &data->data) :
-	    wrmsr_safe(data->msr, data->data);
+	if (cmd == CPUCTL_RDMSR) {
+		data->data = 0;
+		ret = rdmsr_safe(data->msr, &data->data);
+	} else {
+		ret = wrmsr_safe(data->msr, data->data);
+	}
 	restore_cpu(oldcpu, is_bound, td);
 	return (ret);
 }
@@ -369,7 +372,7 @@ update_amd(int cpu, cpuctl_update_args_t
 	/*
 	 * Perform update.
 	 */
-	wrmsr_safe(MSR_K8_UCODE_UPDATE, (uintptr_t)args->data);
+	wrmsr_safe(MSR_K8_UCODE_UPDATE, (uintptr_t)ptr);
 
 	/*
 	 * Serialize instruction flow.