From owner-svn-src-all@freebsd.org  Sat Oct  7 08:44:10 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 108CAE32545;
 Sat,  7 Oct 2017 08:44:10 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D043265439;
 Sat,  7 Oct 2017 08:44:09 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v978i8m9066485;
 Sat, 7 Oct 2017 08:44:08 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v978i8gO066484;
 Sat, 7 Oct 2017 08:44:08 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <201710070844.v978i8gO066484@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org
 using -f
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sat, 7 Oct 2017 08:44:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r324381 - stable/11/usr.sbin/cpucontrol
X-SVN-Group: stable-11
X-SVN-Commit-Author: kib
X-SVN-Commit-Paths: stable/11/usr.sbin/cpucontrol
X-SVN-Commit-Revision: 324381
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
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: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Oct 2017 08:44:10 -0000

Author: kib
Date: Sat Oct  7 08:44:08 2017
New Revision: 324381
URL: https://svnweb.freebsd.org/changeset/base/324381

Log:
  MFC r324114:
  Update cpucontrol(8).

Modified:
  stable/11/usr.sbin/cpucontrol/cpucontrol.8
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.sbin/cpucontrol/cpucontrol.8
==============================================================================
--- stable/11/usr.sbin/cpucontrol/cpucontrol.8	Sat Oct  7 08:42:36 2017	(r324380)
+++ stable/11/usr.sbin/cpucontrol/cpucontrol.8	Sat Oct  7 08:44:08 2017	(r324381)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 30, 2009
+.Dd September 30, 2017
 .Dt CPUCONTROL 8
 .Os
 .Sh NAME
@@ -34,43 +34,43 @@
 device
 .Sh SYNOPSIS
 .Nm
-.Op Fl vh
+.Op Fl v
 .Fl m Ar msr
 .Bk
 .Ar device
 .Ek
 .Nm
-.Op Fl vh
+.Op Fl v
 .Fl m Ar msr Ns = Ns Ar value
 .Bk
 .Ar device
 .Ek
 .Nm
-.Op Fl vh
+.Op Fl v
 .Fl m Ar msr Ns &= Ns Ar mask
 .Bk
 .Ar device
 .Ek
 .Nm
-.Op Fl vh
+.Op Fl v
 .Fl m Ar msr Ns |= Ns Ar mask
 .Bk
 .Ar device
 .Ek
 .Nm
-.Op Fl vh
+.Op Fl v
 .Fl i Ar level
 .Bk
 .Ar device
 .Ek
 .Nm
-.Op Fl vh
+.Op Fl v
 .Fl i Ar level,level_type
 .Bk
 .Ar device
 .Ek
 .Nm
-.Op Fl vh
+.Op Fl vn
 .Op Fl d Ar datadir
 .Fl u
 .Bk
@@ -88,8 +88,14 @@ It can also be used to apply CPU firmware updates.
 The following options are available:
 .Bl -tag -width indent
 .It Fl d Ar datadir
-Where to look for microcode images.
+Directory paths where to look for microcode images.
 The option can be specified multiple times.
+The paths are added in order of the options appearance on the command
+line, default directories are appended after the user-supplied paths.
+.It Fl n
+Do not look for the microcode images in the standard directories.
+Currently standard directory to look for the microcode update files is
+.Pa /usr/local/share/cpucontrol .
 .It Fl m Ar msr
 Show value of the specified MSR.
 MSR register number should be given as a hexadecimal number.
@@ -163,10 +169,10 @@ The command
 will retrieve the CPUID level 0x1 from CPU 1.
 .Pp
 To perform firmware updates on CPU 0 from images located at
-.Pa /usr/local/share/cpuctl/
+.Pa /usr/local/share/cpuctl
 use the following command:
 .Pp
-.Dq Li "cpucontrol -d /usr/local/share/cpuctl/ -u /dev/cpuctl0"
+.Dq Li "cpucontrol -nd /usr/local/share/cpuctl -u /dev/cpuctl0"
 .Sh SEE ALSO
 .Xr cpuctl 4
 .Sh HISTORY
@@ -179,5 +185,3 @@ The
 .Nm
 utility and this manual page was written by
 .An Stanislav Sedov Aq Mt stas@FreeBSD.org .
-.Sh BUGS
-Yes, probably, report if any.