[arch-commits] Commit in intel-ucode/trunk (PKGBUILD intel-microcode2ucode.c)

[Christian Hesse]

    Date: Saturday, May 13, 2017 @ 09:40:19
  Author: eworm
Revision: 295880

upgpkg: intel-ucode 20170511-1

new upstream release

Modified:
  intel-ucode/trunk/PKGBUILD
  intel-ucode/trunk/intel-microcode2ucode.c

-------------------------+
 PKGBUILD                |   16 ++++++++--------
 intel-microcode2ucode.c |   14 ++++++++------
 2 files changed, 16 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-05-13 08:31:49 UTC (rev 295879)
+++ PKGBUILD	2017-05-13 09:40:19 UTC (rev 295880)
@@ -2,7 +2,9 @@
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 
 pkgname=intel-ucode
-pkgver=20161104
+pkgver=20170511
+# Some random "download id" that intel has in their downloadcenter
+_dlid=26798
 pkgrel=1
 pkgdesc="Microcode update files for Intel CPUs"
 arch=('any')
@@ -10,14 +12,12 @@
 url="https://downloadcenter.intel.com/SearchResult.aspx?lang=eng&keyword=%22microcode%22"
 replaces=('microcode_ctl')
 license=('custom')
-# Some random "download id" that intel has in their downloadcenter
-_dlid=26400
-source=(https://downloadmirror.intel.com/${_dlid}/eng/microcode-${pkgver}.tgz
-        LICENSE
-        intel-microcode2ucode.c)
-sha256sums=('70154ca62ff9b3da6291dfdecc90daaeb399d7290c0d308d719df16dff5ee3d1'
+source=("https://downloadmirror.intel.com/${_dlid}/eng/microcode-${pkgver}.tgz"
+        'LICENSE'
+        'intel-microcode2ucode.c')
+sha256sums=('2f77fd2d87403b754d01a66c78a36a8b8ffc16dc3c50fb7aa2c4cd4da7f681a3'
             '6983e83ec10c6467fb9101ea496e0443f0574c805907155118e2c9f0bbea97b6'
-            '03a13a966316a4d3d9c7e1b46007fd4b80911aea5ddd957ddf33ce660efe03de')
+            '5af76d7e23768c94ab03fbf0d280b30fccd9c1ce697111c9999f6d51955c5a98');
 
 build() {
   cd "$srcdir"

Modified: intel-microcode2ucode.c
===================================================================
--- intel-microcode2ucode.c	2017-05-13 08:31:49 UTC (rev 295879)
+++ intel-microcode2ucode.c	2017-05-13 09:40:19 UTC (rev 295880)
@@ -94,7 +94,7 @@
 	start = 0;
 	for (;;) {
 		size_t size;
-		unsigned int family, model, stepping;
+		unsigned int family, model, stepping, type;
 		unsigned int year, month, day;
 
 		mc = (union mcbuf *) &buf[start];
@@ -118,13 +118,14 @@
 		 * 16-19 extended model
 		 * 20-27 extended family
 		 */
-		family = (mc->hdr.sig >> 8) & 0xf;
-		if (family == 0xf)
-			family += (mc->hdr.sig >> 20) & 0xff;
+		stepping = mc->hdr.sig & 0x0f;
 		model = (mc->hdr.sig >> 4) & 0x0f;
+		family = (mc->hdr.sig >> 8) & 0x0f;
+		type = (mc->hdr.sig >> 12) & 0x0f;
 		if (family == 0x06)
 			model += ((mc->hdr.sig >> 16) & 0x0f) << 4;
-		stepping = mc->hdr.sig & 0x0f;
+		if (family == 0x0f)
+			family += (mc->hdr.sig >> 20) & 0xff;
 
 		year = mc->hdr.date & 0xffff;
 		month = mc->hdr.date >> 24;
@@ -131,7 +132,8 @@
 		day = (mc->hdr.date >> 16) & 0xff;
 
 		printf("\n");
-		printf("signature: 0x%02x\n", mc->hdr.sig);
+		printf("signature: 0x%02x (stepping %d, model %d, family %d, type %d)\n",
+			mc->hdr.sig, stepping, model, family, type);
 		printf("flags:     0x%02x\n", mc->hdr.pf);
 		printf("revision:  0x%02x\n", mc->hdr.rev);
 		printf("date:      %04x-%02x-%02x\n", year, month, day);