[Midnightbsd-cvs] src [7175] trunk/usr.sbin/cpucontrol: add via support to cpucontrol(8)
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Jul 27 20:43:19 EDT 2015
Revision: 7175
http://svnweb.midnightbsd.org/src/?rev=7175
Author: laffer1
Date: 2015-07-27 20:43:18 -0400 (Mon, 27 Jul 2015)
Log Message:
-----------
add via support to cpucontrol(8)
Modified Paths:
--------------
trunk/usr.sbin/cpucontrol/Makefile
trunk/usr.sbin/cpucontrol/amd.c
trunk/usr.sbin/cpucontrol/amd.h
trunk/usr.sbin/cpucontrol/cpucontrol.8
trunk/usr.sbin/cpucontrol/cpucontrol.c
trunk/usr.sbin/cpucontrol/cpucontrol.h
trunk/usr.sbin/cpucontrol/intel.c
Added Paths:
-----------
trunk/usr.sbin/cpucontrol/via.c
trunk/usr.sbin/cpucontrol/via.h
Property Changed:
----------------
trunk/usr.sbin/cpucontrol/cpucontrol.8
Modified: trunk/usr.sbin/cpucontrol/Makefile
===================================================================
--- trunk/usr.sbin/cpucontrol/Makefile 2015-07-26 23:59:10 UTC (rev 7174)
+++ trunk/usr.sbin/cpucontrol/Makefile 2015-07-28 00:43:18 UTC (rev 7175)
@@ -2,8 +2,8 @@
PROG= cpucontrol
MAN= cpucontrol.8
-SRCS= cpucontrol.c intel.c amd.c
+SRCS= cpucontrol.c intel.c amd.c via.c
-WARNS?= 6
+NO_WCAST_ALIGN=
.include <bsd.prog.mk>
Modified: trunk/usr.sbin/cpucontrol/amd.c
===================================================================
--- trunk/usr.sbin/cpucontrol/amd.c 2015-07-26 23:59:10 UTC (rev 7174)
+++ trunk/usr.sbin/cpucontrol/amd.c 2015-07-28 00:43:18 UTC (rev 7175)
@@ -92,9 +92,7 @@
assert(dev);
fd = -1;
- devfd = -1;
fw_image = MAP_FAILED;
- error = 0;
devfd = open(dev, O_RDWR);
if (devfd < 0) {
WARN(0, "could not open %s for writing", dev);
@@ -162,7 +160,7 @@
args.data = fw_image;
args.size = st.st_size;
- error = ioctl(fd, CPUCTL_UPDATE, &args);
+ error = ioctl(devfd, CPUCTL_UPDATE, &args);
if (error < 0) {
fprintf(stderr, "failed.\n");
warn("ioctl()");
Modified: trunk/usr.sbin/cpucontrol/amd.h
===================================================================
--- trunk/usr.sbin/cpucontrol/amd.h 2015-07-26 23:59:10 UTC (rev 7174)
+++ trunk/usr.sbin/cpucontrol/amd.h 2015-07-28 00:43:18 UTC (rev 7175)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2006, 2008 Stanislav Sedov <stas at FreeBSD.org>.
* All rights reserved.
@@ -22,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: release/9.2.0/usr.sbin/cpucontrol/amd.h 181430 2008-08-08 16:26:53Z stas $
*/
#ifndef AMD_H
Modified: trunk/usr.sbin/cpucontrol/cpucontrol.8
===================================================================
--- trunk/usr.sbin/cpucontrol/cpucontrol.8 2015-07-26 23:59:10 UTC (rev 7174)
+++ trunk/usr.sbin/cpucontrol/cpucontrol.8 2015-07-28 00:43:18 UTC (rev 7175)
@@ -31,7 +31,7 @@
.Nm cpucontrol
.Nd control utility for the
.Xr cpuctl 4
-device.
+device
.Sh SYNOPSIS
.Nm
.Op Fl vh
@@ -164,10 +164,10 @@
.Nm
utility first appeared in
.Fx 7.2 .
-.Sh BUGS
-Yes, probably, report if any.
.Sh AUTHORS
The
.Nm
utility and this manual page was written by
.An Stanislav Sedov Aq stas at FreeBSD.org .
+.Sh BUGS
+Yes, probably, report if any.
Property changes on: trunk/usr.sbin/cpucontrol/cpucontrol.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/cpucontrol/cpucontrol.c
===================================================================
--- trunk/usr.sbin/cpucontrol/cpucontrol.c 2015-07-26 23:59:10 UTC (rev 7174)
+++ trunk/usr.sbin/cpucontrol/cpucontrol.c 2015-07-28 00:43:18 UTC (rev 7175)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2008 Stanislav Sedov <stas at FreeBSD.org>.
+ * Copyright (c) 2008-2011 Stanislav Sedov <stas at FreeBSD.org>.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD: src/usr.sbin/cpucontrol/cpucontrol.c,v 1.1 2012/03/01 04:45:09 laffer1 Exp $");
+__MBSDID("$MidnightBSD$");
#include <assert.h>
#include <stdio.h>
@@ -51,6 +51,7 @@
#include "cpucontrol.h"
#include "amd.h"
#include "intel.h"
+#include "via.h"
int verbosity_level = 0;
@@ -83,7 +84,7 @@
const char *path;
SLIST_ENTRY(datadir) next;
};
-static SLIST_HEAD(, datadir) datadirs = SLIST_HEAD_INITIALIZER(&datadirs);
+static SLIST_HEAD(, datadir) datadirs = SLIST_HEAD_INITIALIZER(datadirs);
struct ucode_handler {
ucode_probe_t *probe;
@@ -91,6 +92,7 @@
} handlers[] = {
{ intel_probe, intel_update },
{ amd_probe, amd_update },
+ { via_probe, via_update },
};
#define NHANDLERS (sizeof(handlers) / sizeof(*handlers))
@@ -177,6 +179,7 @@
unsigned long command;
int do_invert = 0, op;
int fd, error;
+ const char *command_name;
char *endptr;
char *p;
@@ -245,15 +248,19 @@
switch (op) {
case OP_READ:
command = CPUCTL_RDMSR;
+ command_name = "RDMSR";
break;
case OP_WRITE:
command = CPUCTL_WRMSR;
+ command_name = "WRMSR";
break;
case OP_OR:
command = CPUCTL_MSRSBIT;
+ command_name = "MSRSBIT";
break;
case OP_AND:
command = CPUCTL_MSRCBIT;
+ command_name = "MSRCBIT";
break;
default:
abort();
@@ -266,7 +273,7 @@
}
error = ioctl(fd, command, &args);
if (error < 0) {
- WARN(0, "ioctl(%s, %lu)", dev, command);
+ WARN(0, "ioctl(%s, CPUCTL_%s (%lu))", dev, command_name, command);
close(fd);
return (1);
}
Modified: trunk/usr.sbin/cpucontrol/cpucontrol.h
===================================================================
--- trunk/usr.sbin/cpucontrol/cpucontrol.h 2015-07-26 23:59:10 UTC (rev 7174)
+++ trunk/usr.sbin/cpucontrol/cpucontrol.h 2015-07-28 00:43:18 UTC (rev 7175)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Stanislav Sedov <stas at FreeBSD.org>.
* All rights reserved.
@@ -22,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: release/9.2.0/usr.sbin/cpucontrol/cpucontrol.h 181430 2008-08-08 16:26:53Z stas $
*/
#ifndef CPUCONTROL_H
Modified: trunk/usr.sbin/cpucontrol/intel.c
===================================================================
--- trunk/usr.sbin/cpucontrol/intel.c 2015-07-26 23:59:10 UTC (rev 7174)
+++ trunk/usr.sbin/cpucontrol/intel.c 2015-07-28 00:43:18 UTC (rev 7175)
@@ -33,6 +33,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <err.h>
+#include <errno.h>
#include <sys/types.h>
#include <sys/stat.h>
@@ -104,7 +105,6 @@
assert(dev);
fd = -1;
- devfd = -1;
fw_image = MAP_FAILED;
ext_table = NULL;
ext_header = NULL;
@@ -267,7 +267,9 @@
args.size = data_size;
error = ioctl(devfd, CPUCTL_UPDATE, &args);
if (error < 0) {
+ error = errno;
fprintf(stderr, "failed.\n");
+ errno = error;
WARN(0, "ioctl()");
goto fail;
}
Added: trunk/usr.sbin/cpucontrol/via.c
===================================================================
--- trunk/usr.sbin/cpucontrol/via.c (rev 0)
+++ trunk/usr.sbin/cpucontrol/via.c 2015-07-28 00:43:18 UTC (rev 7175)
@@ -0,0 +1,225 @@
+/*-
+ * Copyright (c) 2011 Fabien Thomas <fabient at FreeBSD.org>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__MBSDID("$MidnightBSD$");
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <err.h>
+#include <errno.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <sys/ioctl.h>
+#include <sys/ioccom.h>
+#include <sys/cpuctl.h>
+
+#include <machine/cpufunc.h>
+#include <machine/specialreg.h>
+
+#include "cpucontrol.h"
+#include "via.h"
+
+int
+via_probe(int fd)
+{
+ char vendor[13];
+ int error;
+ cpuctl_cpuid_args_t idargs = {
+ .level = 0,
+ };
+
+ error = ioctl(fd, CPUCTL_CPUID, &idargs);
+ if (error < 0) {
+ WARN(0, "ioctl()");
+ return (1);
+ }
+ ((uint32_t *)vendor)[0] = idargs.data[1];
+ ((uint32_t *)vendor)[1] = idargs.data[3];
+ ((uint32_t *)vendor)[2] = idargs.data[2];
+ vendor[12] = '\0';
+ if (strncmp(vendor, CENTAUR_VENDOR_ID, sizeof(CENTAUR_VENDOR_ID)) != 0)
+ return (1);
+
+ /* TODO: detect Nano CPU. */
+ return (0);
+}
+
+void
+via_update(const char *dev, const char *path)
+{
+ int fd, devfd;
+ struct stat st;
+ uint32_t *fw_image;
+ uint32_t sum;
+ unsigned int i;
+ size_t payload_size;
+ via_fw_header_t *fw_header;
+ uint32_t signature, flags;
+ int32_t revision;
+ void *fw_data;
+ size_t data_size, total_size;
+ cpuctl_msr_args_t msrargs = {
+ .msr = MSR_IA32_PLATFORM_ID,
+ };
+ cpuctl_cpuid_args_t idargs = {
+ .level = 1, /* Signature. */
+ };
+ cpuctl_update_args_t args;
+ int error;
+
+ assert(path);
+ assert(dev);
+
+ fd = -1;
+ devfd = -1;
+ fw_image = MAP_FAILED;
+ devfd = open(dev, O_RDWR);
+ if (devfd < 0) {
+ WARN(0, "could not open %s for writing", dev);
+ return;
+ }
+ error = ioctl(devfd, CPUCTL_CPUID, &idargs);
+ if (error < 0) {
+ WARN(0, "ioctl(%s)", dev);
+ goto fail;
+ }
+ signature = idargs.data[0];
+ error = ioctl(devfd, CPUCTL_RDMSR, &msrargs);
+ if (error < 0) {
+ WARN(0, "ioctl(%s)", dev);
+ goto fail;
+ }
+
+ /*
+ * MSR_IA32_PLATFORM_ID contains flag in BCD in bits 52-50.
+ */
+ flags = 1 << ((msrargs.data >> 50) & 7);
+ msrargs.msr = MSR_BIOS_SIGN;
+ error = ioctl(devfd, CPUCTL_RDMSR, &msrargs);
+ if (error < 0) {
+ WARN(0, "ioctl(%s)", dev);
+ goto fail;
+ }
+ revision = msrargs.data >> 32; /* Revision in the high dword. */
+ WARNX(2, "found cpu type %#x family %#x model %#x stepping %#x.",
+ (signature >> 12) & 0x03, (signature >> 8) & 0x0f,
+ (signature >> 4) & 0x0f, (signature >> 0) & 0x0f);
+ /*
+ * Open firmware image.
+ */
+ fd = open(path, O_RDONLY, 0);
+ if (fd < 0) {
+ WARN(0, "open(%s)", path);
+ return;
+ }
+ error = fstat(fd, &st);
+ if (error != 0) {
+ WARN(0, "fstat(%s)", path);
+ goto fail;
+ }
+ if (st.st_size < 0 || (unsigned)st.st_size < sizeof(*fw_header)) {
+ WARNX(2, "file too short: %s", path);
+ goto fail;
+ }
+
+ /*
+ * mmap the whole image.
+ */
+ fw_image = (uint32_t *)mmap(NULL, st.st_size, PROT_READ,
+ MAP_PRIVATE, fd, 0);
+ if (fw_image == MAP_FAILED) {
+ WARN(0, "mmap(%s)", path);
+ goto fail;
+ }
+ fw_header = (via_fw_header_t *)fw_image;
+ if (fw_header->signature != VIA_HEADER_SIGNATURE ||
+ fw_header->loader_revision != VIA_LOADER_REVISION) {
+ WARNX(2, "%s is not a valid via firmware: version mismatch",
+ path);
+ goto fail;
+ }
+ data_size = fw_header->data_size;
+ total_size = fw_header->total_size;
+ if (total_size > (unsigned)st.st_size || st.st_size < 0) {
+ WARNX(2, "file too short: %s", path);
+ goto fail;
+ }
+ payload_size = data_size + sizeof(*fw_header);
+
+ /*
+ * Check the primary checksum.
+ */
+ sum = 0;
+ for (i = 0; i < (payload_size / sizeof(uint32_t)); i++)
+ sum += *((uint32_t *)fw_image + i);
+ if (sum != 0) {
+ WARNX(2, "%s: update data checksum invalid", path);
+ goto fail;
+ }
+
+ fw_data = fw_header + 1; /* Pointer to the update data. */
+
+ /*
+ * Check if the given image is ok for this cpu.
+ */
+ if (signature != fw_header->cpu_signature)
+ goto fail;
+
+ if (fw_header->revision != 0 && revision >= fw_header->revision) {
+ WARNX(1, "skipping %s of rev %#x: up to date",
+ path, fw_header->revision);
+ goto fail;
+ }
+ fprintf(stderr, "%s: updating cpu %s from rev %#x to rev %#x... ",
+ path, dev, revision, fw_header->revision);
+ args.data = fw_data;
+ args.size = data_size;
+ error = ioctl(devfd, CPUCTL_UPDATE, &args);
+ if (error < 0) {
+ error = errno;
+ fprintf(stderr, "failed.\n");
+ errno = error;
+ WARN(0, "ioctl()");
+ goto fail;
+ }
+ fprintf(stderr, "done.\n");
+
+fail:
+ if (fw_image != MAP_FAILED)
+ if (munmap(fw_image, st.st_size) != 0)
+ warn("munmap(%s)", path);
+ if (devfd >= 0)
+ close(devfd);
+ if (fd >= 0)
+ close(fd);
+ return;
+}
Property changes on: trunk/usr.sbin/cpucontrol/via.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/usr.sbin/cpucontrol/via.h
===================================================================
--- trunk/usr.sbin/cpucontrol/via.h (rev 0)
+++ trunk/usr.sbin/cpucontrol/via.h 2015-07-28 00:43:18 UTC (rev 7175)
@@ -0,0 +1,64 @@
+/* $MidnightBSD$ */
+/*-
+ * Copyright (c) 2011 Fabien Thomas <fabient at FreeBSD.org>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD: release/9.2.0/usr.sbin/cpucontrol/via.h 229471 2012-01-04 08:14:05Z fabient $
+ */
+
+#ifndef VIA_H
+#define VIA_H
+
+/*
+ * Prototypes.
+ */
+ucode_probe_t via_probe;
+ucode_update_t via_update;
+
+typedef struct via_fw_header {
+ uint32_t signature; /* Signature. */
+ int32_t revision; /* Unique version number. */
+ uint32_t date; /* Date of creation in BCD. */
+ uint32_t cpu_signature; /* Extended family, extended
+ model, type, family, model
+ and stepping. */
+ uint32_t checksum; /* Sum of all DWORDS should
+ be 0. */
+ uint32_t loader_revision; /* Version of the loader
+ required to load update. */
+ uint32_t reserverd1; /* Platform IDs encoded in
+ the lower 8 bits. */
+ uint32_t data_size;
+ uint32_t total_size;
+ uint8_t reserved2[12];
+} via_fw_header_t;
+
+typedef struct via_cpu_signature {
+ uint32_t cpu_signature;
+ uint32_t checksum;
+} via_cpu_signature_t;
+
+#define VIA_HEADER_SIGNATURE 0x53415252
+#define VIA_LOADER_REVISION 0x00000001
+
+#endif /* !VIA_H */
Property changes on: trunk/usr.sbin/cpucontrol/via.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list