diff --git a/intel-microcode2ucode.c b/intel-microcode2ucode.c deleted file mode 100644 index 79ae532..0000000 --- a/intel-microcode2ucode.c +++ /dev/null @@ -1,163 +0,0 @@ -/* - * Convert Intel microcode.dat into individual ucode files - * named: intel-ucode/$family-$model-$stepping - * - * The subdir intel-ucode/ is created in the current working - * directory. We get multiple ucodes in the same file, so they - * are appended to an existing file. Make sure the directory - * is empty before every run of the converter. - * - * Kay Sievers - */ - - -#ifndef _GNU_SOURCE -# define _GNU_SOURCE 1 -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -struct microcode_header_intel { - unsigned int hdrver; - unsigned int rev; - unsigned int date; - unsigned int sig; - unsigned int cksum; - unsigned int ldrver; - unsigned int pf; - unsigned int datasize; - unsigned int totalsize; - unsigned int reserved[3]; -}; - -union mcbuf { - struct microcode_header_intel hdr; - unsigned int i[0]; - char c[0]; -}; - -int main(int argc, char *argv[]) -{ - char *filename = "/lib/firmware/microcode.dat"; - FILE *f; - char line[LINE_MAX]; - char buf[4000000]; - union mcbuf *mc; - size_t bufsize, count, start; - int rc = EXIT_SUCCESS; - - if (argv[1] != NULL) - filename = argv[1]; - - count = 0; - mc = (union mcbuf *) buf; - f = fopen(filename, "re"); - if (f == NULL) { - printf("open %s: %m\n", filename); - rc = EXIT_FAILURE; - goto out; - } - - while (fgets(line, sizeof(line), f) != NULL) { - if (sscanf(line, "%x, %x, %x, %x", - &mc->i[count], - &mc->i[count + 1], - &mc->i[count + 2], - &mc->i[count + 3]) != 4) - continue; - count += 4; - } - fclose(f); - - bufsize = count * sizeof(int); - printf("%s: %lu(%luk) bytes, %zu integers\n", - filename, - bufsize, - bufsize / 1024, - count); - - if (bufsize < sizeof(struct microcode_header_intel)) - goto out; - - mkdir("intel-ucode", 0750); - - start = 0; - for (;;) { - size_t size; - unsigned int family, model, stepping; - unsigned int year, month, day; - - mc = (union mcbuf *) &buf[start]; - - if (mc->hdr.totalsize) - size = mc->hdr.totalsize; - else - size = 2000 + sizeof(struct microcode_header_intel); - - if (mc->hdr.ldrver != 1 || mc->hdr.hdrver != 1) { - printf("unknown version/format:\n"); - rc = EXIT_FAILURE; - break; - } - - /* - * 0- 3 stepping - * 4- 7 model - * 8-11 family - * 12-13 type - * 16-19 extended model - * 20-27 extended family - */ - family = (mc->hdr.sig >> 8) & 0xf; - if (family == 0xf) - family += (mc->hdr.sig >> 20) & 0xff; - model = (mc->hdr.sig >> 4) & 0x0f; - if (family == 0x06) - model += ((mc->hdr.sig >> 16) & 0x0f) << 4; - stepping = mc->hdr.sig & 0x0f; - - year = mc->hdr.date & 0xffff; - month = mc->hdr.date >> 24; - day = (mc->hdr.date >> 16) & 0xff; - - asprintf(&filename, "intel-ucode/%02x-%02x-%02x", family, model, stepping); - printf("\n"); - printf("%s\n", filename); - printf("signature: 0x%02x\n", mc->hdr.sig); - 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); - printf("size: %zu\n", size); - - f = fopen(filename, "ae"); - if (f == NULL) { - printf("open %s: %m\n", filename); - rc = EXIT_FAILURE; - goto out; - } - if (fwrite(mc, size, 1, f) != 1) { - printf("write %s: %m\n", filename); - rc = EXIT_FAILURE; - goto out; - } - fclose(f); - free(filename); - - start += size; - if (start >= bufsize) - break; - } - printf("\n"); -out: - return rc; -} diff --git a/ucode-intel.changes b/ucode-intel.changes index dbefad9..f87b965 100644 --- a/ucode-intel.changes +++ b/ucode-intel.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 5 21:56:59 UTC 2018 - crrodriguez@opensuse.org + +- intel-microcode2ucode.c replaced by better maintained and + feature rich iucode_tool package, add it to buildrequires. + ------------------------------------------------------------------- Thu Nov 23 14:01:29 UTC 2017 - trenn@suse.de diff --git a/ucode-intel.spec b/ucode-intel.spec index 94e04b3..6af7822 100644 --- a/ucode-intel.spec +++ b/ucode-intel.spec @@ -1,7 +1,7 @@ # # spec file for package ucode-intel # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,10 +26,10 @@ BuildRequires: suse-module-tools #License is: Intel Software License Agreement Url: https://downloadcenter.intel.com/download/25512/Linux-Processor-Microcode-Data-File Source0: microcode-%{version}.tgz -Source1: intel-microcode2ucode.c Source2: LICENSE Supplements: modalias(x86cpu:vendor%3A0000%3Afamily%3A*%3Amodel%3A*%3Afeature%3A*) BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: iucode-tool Requires(post): coreutils Requires(postun): coreutils ExclusiveArch: %ix86 x86_64 @@ -42,14 +42,11 @@ This package contains the microcode update blobs for Intel x86 and x86-64 CPUs. cp %{SOURCE2} . %build -%{__cc} -fwhole-program %{optflags} %{SOURCE1} -o generate_microcode -./generate_microcode microcode.dat +#it is closed source.. nothing to build. %install -install -D -m 0755 generate_microcode %{buildroot}%{_bindir}/generate_microcode -for file in intel-ucode/*; do -install -D -m 0644 $file %{buildroot}/lib/firmware/$file -done +mkdir -p %{buildroot}/lib/firmware/intel-ucode +/usr/sbin/iucode_tool -vvv --write-firmware="%{buildroot}/lib/firmware/intel-ucode" microcode.dat %post %{?regenerate_initrd_post} @@ -63,7 +60,6 @@ done %files %defattr(-,root,root) %doc LICENSE -%{_bindir}/generate_microcode /lib/firmware/intel-ucode/ %changelog