Revert removal of intel_microcode2ucode [1]. Since it was shipped to end users, its removal may introduce unneeded disruption. [1] https://pagure.io/microcode_ctl/c/fde91236cc7b45ecffa5c48a7cd8b30ff75752cf.patch Index: microcode_ctl-2.1-18/Makefile =================================================================== --- microcode_ctl-2.1-18.orig/Makefile 2018-07-20 17:52:34.767187807 +0200 +++ microcode_ctl-2.1-18/Makefile 2018-07-20 19:13:37.948699082 +0200 @@ -7,6 +7,7 @@ # as published by the Free Software Foundation; either version # 2 of the License, or (at your option) any later version. +PROGRAM = intel-microcode2ucode MICROCODE_INTEL = microcode-20180703.tgz INS = install @@ -16,23 +17,29 @@ DESTDIR = PREFIX = /usr/local +INSDIR = $(PREFIX)/sbin DOCDIR = $(PREFIX)/share/doc/microcode_ctl MICDIR = /lib/firmware MICDIRINTEL = $(MICDIR)/intel-ucode -all: +all: microcode_ctl tar -xf $(MICROCODE_INTEL) ./intel-ucode +microcode_ctl: intel-microcode2ucode.c + $(CC) $(CFLAGS) -o $(PROGRAM) intel-microcode2ucode.c + clean: - rm -rf intel-ucode + rm -rf $(PROGRAM) intel-ucode install: - $(INS) -d $(DESTDIR)$(DOCDIR) \ + $(INS) -d $(DESTDIR)$(INSDIR) $(DESTDIR)$(DOCDIR) \ $(DESTDIR)$(MICDIRINTEL) + $(INS) -m 755 $(PROGRAM) $(DESTDIR)$(INSDIR) $(INS) -m 644 README $(DESTDIR)$(DOCDIR) $(INS) -m 644 intel-ucode/* $(DESTDIR)$(MICDIRINTEL) uninstall: - rm -rf $(DESTDIR)$(MICDIRINTEL) \ + rm -rf $(DESTDIR)$(INSDIR)/$(PROGRAM) \ + $(DESTDIR)$(MICDIRINTEL) \ $(DESTDIR)$(DOCDIR) Index: microcode_ctl-2.1-18/intel-microcode2ucode.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ microcode_ctl-2.1-18/intel-microcode2ucode.c 2018-07-20 19:02:19.510433818 +0200 @@ -0,0 +1,169 @@ +/* + * 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 + * Anton Arapov + */ + + +#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 *input, *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]; + + if (!strcmp(filename, "-")) { + input = stdin; + } else { + input = fopen(filename, "re"); + if (input == NULL) { + printf("open %s: %m\n", filename); + rc = EXIT_FAILURE; + goto out; + } + } + + count = 0; + mc = (union mcbuf *) buf; + while (fgets(line, sizeof(line), input) != 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(input); + + 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; +}