Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 26 Jun 2009 22:13:15 +0000 (UTC)
From:      Stanislav Sedov <stas@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r195081 - head/sys/dev/cpuctl
Message-ID:  <200906262213.n5QMDFKE009008@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: stas
Date: Fri Jun 26 22:13:15 2009
New Revision: 195081
URL: http://svn.freebsd.org/changeset/base/195081

Log:
  - 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.
  
  Approved by:	re (kib)
  MFC after:	1 week

Modified:
  head/sys/dev/cpuctl/cpuctl.c

Modified: head/sys/dev/cpuctl/cpuctl.c
==============================================================================
--- head/sys/dev/cpuctl/cpuctl.c	Fri Jun 26 21:47:37 2009	(r195080)
+++ head/sys/dev/cpuctl/cpuctl.c	Fri Jun 26 22:13:15 2009	(r195081)
@@ -222,14 +222,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);
 }
@@ -368,7 +371,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.

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