svn commit: r459102 - in branches/2018Q1/sysutils/devcpu-data: . files
Steve Wills
swills at FreeBSD.org
Mon Jan 15 17:28:43 UTC 2018
Author: swills
Date: Mon Jan 15 17:28:41 2018
New Revision: 459102
URL: https://svnweb.freebsd.org/changeset/ports/459102
Log:
sync up with HEAD
MFH: r458664 r458792 r458943 r458987 r459084
sysutils/devcpu-data follow up commit to 20180108 Intel microcode update.
Run cpucontrol -e after microcode update to refresh cpu flags. If running
on an older system without -e, fail silently.
Log any upgrade output via logger to /var/log/messages.
Add an instructional pkg-message for users.
Intel Release Notes:
Intel Processor Microcode Package for Linux
20180108 Release
-- Updates upon 20171117 release --
IVT C0 (06-3e-04:ed) 428->42a
SKL-U/Y D0 (06-4e-03:c0) ba->c2
BDW-U/Y E/F (06-3d-04:c0) 25->28
HSW-ULT Cx/Dx (06-45-01:72) 20->21
Crystalwell Cx (06-46-01:32) 17->18
BDW-H E/G (06-47-01:22) 17->1b
HSX-EX E0 (06-3f-04:80) 0f->10
SKL-H/S R0 (06-5e-03:36) ba->c2
HSW Cx/Dx (06-3c-03:32) 22->23
HSX C0 (06-3f-02:6f) 3a->3b
BDX-DE V0/V1 (06-56-02:10) 0f->14
BDX-DE V2 (06-56-03:10) 700000d->7000011
KBL-U/Y H0 (06-8e-09:c0) 62->80
KBL Y0 / CFL D0 (06-8e-0a:c0) 70->80
KBL-H/S B0 (06-9e-09:2a) 5e->80
CFL U0 (06-9e-0a:22) 70->80
CFL B0 (06-9e-0b:02) 72->80
SKX H0 (06-55-04:b7) 2000035->200003c
GLK B0 (06-7a-01:01) 1e->22
Reviewed by: A bunch of folks on the review
Sponsored by: Limelight Networks
Differential Revision: https://reviews.freebsd.org/D13815
Revert to previous Intel microcode archive (20171117).
FreeBSD kernel changes to make use of the capabilities provided by the
new microcode update have not yet been committed. Since we do not yet
require them, allow more time for validation.
Approved by: emaste
Sponsored by: Limelight Networks
sysutils/devcpu-data: Update AMD microcode, add cpu 17h microcode,
drop malfunctioning individual "AMD-XXX" files.
On the few machines that actually have microcode updates, chopping up the
microcode is incorrect and results in a failure to update. Don't do that.
I personally run this on my FX-8150 and this has been tested by a few others.
Sponsored by: Limelight Networks
Differential Revision: https://reviews.freebsd.org/D13832
sysutils/devcpu-data: Only run "cpucontrol -e" once.
Submitted by: kib
Sponsored by: Limelight Networks
sysutils/devcpu-data: fix rc script
PR: 225173
Reviewed by: sbruno
Approved by: portmgr (implicit)
Approved by: ports-secteam (implicit)
Added:
branches/2018Q1/sysutils/devcpu-data/pkg-message
- copied unchanged from r458664, head/sysutils/devcpu-data/pkg-message
Modified:
branches/2018Q1/sysutils/devcpu-data/Makefile
branches/2018Q1/sysutils/devcpu-data/distinfo
branches/2018Q1/sysutils/devcpu-data/files/Makefile
branches/2018Q1/sysutils/devcpu-data/files/microcode_update.in
branches/2018Q1/sysutils/devcpu-data/pkg-plist
Directory Properties:
branches/2018Q1/ (props changed)
Modified: branches/2018Q1/sysutils/devcpu-data/Makefile
==============================================================================
--- branches/2018Q1/sysutils/devcpu-data/Makefile Mon Jan 15 17:17:27 2018 (r459101)
+++ branches/2018Q1/sysutils/devcpu-data/Makefile Mon Jan 15 17:28:41 2018 (r459102)
@@ -2,12 +2,13 @@
# $FreeBSD$
PORTNAME= data
-PORTVERSION= 1.13
+PORTVERSION= 1.14
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= https://downloadmirror.intel.com/27431/eng/:intel \
LOCAL/sbruno:amd
PKGNAMEPREFIX= devcpu-
-DISTFILES= microcode-20180108.tgz:intel amd-ucode-2014-12-01.tar.bz2:amd
+DISTFILES= microcode-20171117.tgz:intel amd64-microcode_3.20171205.1.tar.xz:amd
MAINTAINER= clarkjc at runbox.com
COMMENT= Intel and AMD CPUs microcode updates
Modified: branches/2018Q1/sysutils/devcpu-data/distinfo
==============================================================================
--- branches/2018Q1/sysutils/devcpu-data/distinfo Mon Jan 15 17:17:27 2018 (r459101)
+++ branches/2018Q1/sysutils/devcpu-data/distinfo Mon Jan 15 17:28:41 2018 (r459102)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1515578462
-SHA256 (microcode-20180108.tgz) = 063f1aa3a546cb49323a5e0b516894e4b040007107b8c8ff017aca8a86204130
-SIZE (microcode-20180108.tgz) = 3676678
-SHA256 (amd-ucode-2014-12-01.tar.bz2) = e8f37ed12955585a625ee7cd48d89f9a04ceb2afa36081b52cc59d08a3bb8293
-SIZE (amd-ucode-2014-12-01.tar.bz2) = 20585
+TIMESTAMP = 1515706070
+SHA256 (microcode-20171117.tgz) = 93bd1da9fa58ece0016702e657f708b7e496e56da637a3fe9a6d21f1d6f524dc
+SIZE (microcode-20171117.tgz) = 3594762
+SHA256 (amd64-microcode_3.20171205.1.tar.xz) = a38bc072f535a3d3c1bf4e9e545197aa5114e979e94ef7e4a67e615df2f853a7
+SIZE (amd64-microcode_3.20171205.1.tar.xz) = 32584
Modified: branches/2018Q1/sysutils/devcpu-data/files/Makefile
==============================================================================
--- branches/2018Q1/sysutils/devcpu-data/files/Makefile Mon Jan 15 17:17:27 2018 (r459101)
+++ branches/2018Q1/sysutils/devcpu-data/files/Makefile Mon Jan 15 17:28:41 2018 (r459102)
@@ -1,14 +1,15 @@
-AMD_UCODE_DIR= amd-ucode
+AMD_UCODE_DIR= amd64-microcode-3.20171205.1
AMD_UCODE= $(AMD_UCODE_DIR)/microcode_amd.bin \
$(AMD_UCODE_DIR)/microcode_amd_fam15h.bin \
- $(AMD_UCODE_DIR)/microcode_amd_fam16h.bin
+ $(AMD_UCODE_DIR)/microcode_amd_fam16h.bin \
+ $(AMD_UCODE_DIR)/microcode_amd_fam17h.bin
INTEL_UCODE= microcode.dat
OUTPUT_DIR= mcodes
all: ucode
ucode: ucode-tool
mkdir -p $(OUTPUT_DIR)
./ucode-tool -o $(OUTPUT_DIR) -i $(INTEL_UCODE)
- ./ucode-tool -o $(OUTPUT_DIR) -a $(AMD_UCODE)
+ mv ${AMD_UCODE} $(OUTPUT_DIR)
# Use the host cc to compile ucode-tool in case of cross-compile
ucode-tool: ucode-tool.c
Modified: branches/2018Q1/sysutils/devcpu-data/files/microcode_update.in
==============================================================================
--- branches/2018Q1/sysutils/devcpu-data/files/microcode_update.in Mon Jan 15 17:17:27 2018 (r459101)
+++ branches/2018Q1/sysutils/devcpu-data/files/microcode_update.in Mon Jan 15 17:28:41 2018 (r459102)
@@ -42,7 +42,7 @@ microcode_update_prepare()
microcode_update_start()
{
- echo "Updating cpucodes..."
+ echo "Updating CPU Microcode..."
if [ "${microcode_cpus}" = "ALL" ]; then
ncpu=`/sbin/sysctl -n hw.ncpu`
cpus=`jot ${ncpu} 0`;
@@ -51,9 +51,22 @@ microcode_update_start()
fi
for i in ${cpus}; do
${CMT} -u ${microcode_update_flags} \
- -d "${microcode_update_datadir}" /dev/cpuctl${i} || \
- (echo "Failed." && exit 1)
+ -d "${microcode_update_datadir}" /dev/cpuctl${i} 2>&1 | \
+ logger -p daemon.notice -t microcode_update || \
+ (echo "Microcode Update Failed." && exit 1)
done
+ if [ "${microcode_cpus}" = "ALL" ]; then
+ CPUCONTROL_UPDATED=$(cpucontrol -h 2>&1 | grep -q -- -e; echo $?)
+ if [ ${CPUCONTROL_UPDATED} -ne 0 ]; then
+ echo "Please update your system in order to update CPU microcode."
+ else
+ ${CMT} -e /dev/cpuctl0 >/dev/null 2>&1
+ if [ $? -ne 0 ]; then
+ echo "Re-evalulation of CPU flags Failed."
+ exit 1
+ fi
+ fi
+ fi
echo "Done."
}
Copied: branches/2018Q1/sysutils/devcpu-data/pkg-message (from r458664, head/sysutils/devcpu-data/pkg-message)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2018Q1/sysutils/devcpu-data/pkg-message Mon Jan 15 17:28:41 2018 (r459102, copy of r458664, head/sysutils/devcpu-data/pkg-message)
@@ -0,0 +1,20 @@
+Installing this port will allow host startup to update the CPU microcode on
+a FreeBSD system automatically. In order to enable this feature, add the
+following to the system's /etc/rc.conf:
+
+microcode_update_enable="YES"
+
+To ensure the update is applied, reboot the system or start the microcode update
+service via:
+
+# service microcode_update start
+
+If the CPU requires a microcode update, a console message such as the following
+will appear:
+
+Updating CPU Microcode...
+/usr/local/share/cpucontrol/m32306c3_00000022.fw: updating cpu /dev/cpuctl0 from rev 0x17 to rev 0x22... done.
+/usr/local/share/cpucontrol/m32306c3_00000022.fw: updating cpu /dev/cpuctl2 from rev 0x17 to rev 0x22... done.
+/usr/local/share/cpucontrol/m32306c3_00000022.fw: updating cpu /dev/cpuctl4 from rev 0x17 to rev 0x22... done.
+/usr/local/share/cpucontrol/m32306c3_00000022.fw: updating cpu /dev/cpuctl6 from rev 0x17 to rev 0x22... done.
+Done.
Modified: branches/2018Q1/sysutils/devcpu-data/pkg-plist
==============================================================================
--- branches/2018Q1/sysutils/devcpu-data/pkg-plist Mon Jan 15 17:17:27 2018 (r459101)
+++ branches/2018Q1/sysutils/devcpu-data/pkg-plist Mon Jan 15 17:28:41 2018 (r459102)
@@ -1,20 +1,4 @@
%%DATADIR%%/2f0708.fw
-%%DATADIR%%/AMD-00001020-01000084.fw
-%%DATADIR%%/AMD-00001022-01000083.fw
-%%DATADIR%%/AMD-00001041-010000db.fw
-%%DATADIR%%/AMD-00001043-010000c8.fw
-%%DATADIR%%/AMD-00001062-010000c7.fw
-%%DATADIR%%/AMD-00001080-010000da.fw
-%%DATADIR%%/AMD-00001081-010000d9.fw
-%%DATADIR%%/AMD-000010a0-010000dc.fw
-%%DATADIR%%/AMD-00002031-02000032.fw
-%%DATADIR%%/AMD-00003010-03000027.fw
-%%DATADIR%%/AMD-00005010-05000029.fw
-%%DATADIR%%/AMD-00005020-05000119.fw
-%%DATADIR%%/AMD-00006012-0600063d.fw
-%%DATADIR%%/AMD-00006020-06000832.fw
-%%DATADIR%%/AMD-00006101-06001119.fw
-%%DATADIR%%/AMD-00007001-0700010f.fw
%%DATADIR%%/M01106C2217.fw
%%DATADIR%%/M01106CA107.fw
%%DATADIR%%/M0120661104.fw
@@ -73,7 +57,7 @@
%%DATADIR%%/m01f6402.fw
%%DATADIR%%/m01f6508.fw
%%DATADIR%%/m021066142.fw
-%%DATADIR%%/m02906eb_0000007f_00000080.fw
+%%DATADIR%%/m02906eb_00000071_00000072.fw
%%DATADIR%%/m02f0a15.fw
%%DATADIR%%/m02f241f.fw
%%DATADIR%%/m02f252a.fw
@@ -102,8 +86,8 @@
%%DATADIR%%/m0df330c.fw
%%DATADIR%%/m101067660F.fw
%%DATADIR%%/m101067770A.fw
-%%DATADIR%%/m1050662_00000014.fw
-%%DATADIR%%/m1050663_07000011.fw
+%%DATADIR%%/m1050662_0000000f.fw
+%%DATADIR%%/m1050663_0700000d.fw
%%DATADIR%%/m1050664_0f00000a.fw
%%DATADIR%%/m1069507.fw
%%DATADIR%%/m106f76a.fw
@@ -127,14 +111,14 @@
%%DATADIR%%/m206f6d1.fw
%%DATADIR%%/m206fbBA.fw
%%DATADIR%%/m206fda4.fw
-%%DATADIR%%/m2240671_0000001b.fw
-%%DATADIR%%/m22906ea_00000080.fw
+%%DATADIR%%/m2240671_00000017.fw
+%%DATADIR%%/m22906ea_0000006f_00000070.fw
%%DATADIR%%/m22f6809.fw
-%%DATADIR%%/m2a906e9_0000007f_00000080.fw
-%%DATADIR%%/m32306c3_00000023.fw
-%%DATADIR%%/m3240661_00000018.fw
+%%DATADIR%%/m2a906e9_0000005d_0000005e.fw
+%%DATADIR%%/m32306c3_00000022.fw
+%%DATADIR%%/m3240661_00000017.fw
%%DATADIR%%/m34f6404.fw
-%%DATADIR%%/m36506e3_000000c1_000000c2.fw
+%%DATADIR%%/m36506e3_000000b9_000000ba.fw
%%DATADIR%%/m401067660F.fw
%%DATADIR%%/m406f76b.fw
%%DATADIR%%/m406fbBC.fw
@@ -145,11 +129,11 @@
%%DATADIR%%/m5ff4807.fw
%%DATADIR%%/m6d206d6_00000619.fw
%%DATADIR%%/m6d206d7_00000710.fw
-%%DATADIR%%/m6f306f2_0000003b.fw
-%%DATADIR%%/m7240651_00000021.fw
+%%DATADIR%%/m6f306f2_0000003a.fw
+%%DATADIR%%/m7240651_00000020.fw
%%DATADIR%%/m801066144.fw
%%DATADIR%%/m801067660F.fw
-%%DATADIR%%/m80306f4_00000010.fw
+%%DATADIR%%/m80306f4_0000000f.fw
%%DATADIR%%/m8069547.fw
%%DATADIR%%/m806ec59.fw
%%DATADIR%%/m806fa95.fw
@@ -160,19 +144,23 @@
%%DATADIR%%/m9df4406.fw
%%DATADIR%%/m9df4703.fw
%%DATADIR%%/mA01067AA0B.fw
-%%DATADIR%%/m_01_706a1_00000022.fw
+%%DATADIR%%/m_01_706a1_0000001e.fw
%%DATADIR%%/m_03_506c9_0000002c.fw
-%%DATADIR%%/mb750654_0200003c.fw
+%%DATADIR%%/mb750654_02000035.fw
%%DATADIR%%/mbdf4117.fw
%%DATADIR%%/mbdf4903.fw
-%%DATADIR%%/mc0306d4_00000028.fw
-%%DATADIR%%/mc0406e3_000000c1_000000c2.fw
-%%DATADIR%%/mc0806e9_0000007f_00000080.fw
-%%DATADIR%%/mc0806ea_0000007f_00000080.fw
-%%DATADIR%%/med306e4_0000042a.fw
+%%DATADIR%%/mc0306d4_00000025.fw
+%%DATADIR%%/mc0406e3_000000b9_000000ba.fw
+%%DATADIR%%/mc0806e9_00000061_00000062.fw
+%%DATADIR%%/mc0806ea_0000006f_00000070.fw
+%%DATADIR%%/med306e4_00000428.fw
%%DATADIR%%/med306e6_00000600.fw
%%DATADIR%%/med306e7_0000070d.fw
%%DATADIR%%/mef406f1_0b000021.fw
+%%DATADIR%%/microcode_amd.bin
+%%DATADIR%%/microcode_amd_fam15h.bin
+%%DATADIR%%/microcode_amd_fam16h.bin
+%%DATADIR%%/microcode_amd_fam17h.bin
%%DATADIR%%/mu267114.fw
%%DATADIR%%/mu267238.fw
%%DATADIR%%/mu26732e.fw
More information about the svn-ports-branches
mailing list