From patchwork Tue Apr 3 13:13:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Maciej Nowak X-Patchwork-Id: 894588 X-Patchwork-Delegate: wigyori@uid0.hu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=o2.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="emS9bqih"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40FqMr5cTfz9s4X for ; Tue, 3 Apr 2018 23:15:36 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=eB7MPBkEpEK6UM8De09j8J0dHuYWtvgL3NFNC9laCBw=; b=emS9bqihEZdv3k nl8wrjF+EzKkjo1v4lW2xIaiJEPN3ACTZaQSVfzFbKx+VNmQkKHOjGSDKDHPmgPo4WJLzmcks8Oif Cq9zHF96JQ36DPd1yAqDhg2frMkOnr0XqGEs3hT4SMAZgJ/6wEs6c2BfgPh3m63sPvwRkPsKVYRxH oZ/883Z2om4IaP8v9Uf4vGVWBN0Om/3mC2UDNBQQek+fkdx1v5whmkMs9/3LwrzCx0YYabs+UeCpa wfIRd2dqdkmxa9RBKUxbpHaaJE57RuA5IMAKU9WDnH31PfWv4Seug97rmKykdGOgSASAPreF9pG+Z bxBi+4/EloSJN+QpUg8A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1f3LmZ-0000yz-Qx; Tue, 03 Apr 2018 13:15:27 +0000 Received: from mx-out.tlen.pl ([193.222.135.145]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1f3Llb-00079F-5T for lede-dev@lists.infradead.org; Tue, 03 Apr 2018 13:14:30 +0000 Received: (wp-smtpd smtp.tlen.pl 21024 invoked from network); 3 Apr 2018 15:14:09 +0200 Received: from pub-75.180.29.194.multiplay.pl (HELO localhost.localdomain) (tomek_n@o2.pl@[194.29.180.75]) (envelope-sender ) by smtp.tlen.pl (WP-SMTPD) with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP for ; 3 Apr 2018 15:14:09 +0200 From: Tomasz Maciej Nowak To: lede-dev@lists.infradead.org Date: Tue, 3 Apr 2018 15:13:37 +0200 Message-Id: <20180403131337.3094-4-tomek_n@o2.pl> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180403131337.3094-1-tomek_n@o2.pl> References: <20180403131337.3094-1-tomek_n@o2.pl> MIME-Version: 1.0 X-WP-MailID: 14a531f7d6dc2210edf82bc38607d5a8 X-WP-AV: skaner antywirusowy Poczty o2 X-WP-SPAM: NO 000000A [gZMU] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180403_061427_396535_4510B026 X-CRM114-Status: UNSURE ( 7.04 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [193.222.135.145 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (tomek_n[at]o2.pl) Subject: [LEDE-DEV] [PATCH 3/3] intel-microcode: create early load microcode image X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tomasz Maciej Nowak , Zoltan HERPAI Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Create initrd image with packed microcode. This'll allow to load it at early boot stage. Unfortunately the package can't install files directly to /boot directory, therefore additional installation hooks are placed for standalone package and when building directly into target image. Signed-off-by: Tomasz Maciej Nowak --- package/firmware/intel-microcode/Makefile | 32 +++++++++++++++++++++++++------ target/linux/x86/image/Makefile | 6 ++++++ 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/package/firmware/intel-microcode/Makefile b/package/firmware/intel-microcode/Makefile index d2663bb901..9970f8f072 100644 --- a/package/firmware/intel-microcode/Makefile +++ b/package/firmware/intel-microcode/Makefile @@ -35,15 +35,35 @@ define Package/intel-microcode endef define Build/Compile - IUCODE_TOOL=$(STAGING_DIR)/../host/bin/iucode_tool $(MAKE) -C $(PKG_BUILD_DIR) - mkdir $(PKG_BUILD_DIR)/intel-ucode - $(STAGING_DIR)/../host/bin/iucode_tool -q \ - --write-firmware=$(PKG_BUILD_DIR)/intel-ucode $(PKG_BUILD_DIR)/$(MICROCODE).bin + IUCODE_TOOL=$(STAGING_DIR)/../host/bin/iucode_tool \ + $(MAKE) -C $(PKG_BUILD_DIR) + $(STAGING_DIR)/../host/bin/iucode_tool -q --mini-earlyfw \ + --write-earlyfw=$(PKG_BUILD_DIR)/intel-ucode.cpio \ + $(PKG_BUILD_DIR)/$(MICROCODE).bin endef define Package/intel-microcode/install - $(INSTALL_DIR) $(1)/lib/firmware/intel-ucode - $(INSTALL_DATA) $(PKG_BUILD_DIR)/intel-ucode/* $(1)/lib/firmware/intel-ucode + $(INSTALL_DIR) $(1)/lib/firmware + $(INSTALL_DATA) $(PKG_BUILD_DIR)/intel-ucode.cpio \ + $(1)/lib/firmware/intel-ucode.img +endef + +ifeq ($(CONFIG_PACKAGE_intel-microcode),m) +define Package/intel-microcode/postinst +#!/bin/sh + +mount /boot -o remount,rw,noatime +cp -f /lib/firmware/intel-ucode.img /boot/ +mount /boot -o remount,ro,noatime +endef +endif + +define Package/intel-microcode/prerm +#!/bin/sh + +mount /boot -o remount,rw,noatime +rm /boot/intel-ucode.img +mount /boot -o remount,ro,noatime endef $(eval $(call BuildPackage,intel-microcode)) diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile index a05f4babd9..4d6a3016d2 100644 --- a/target/linux/x86/image/Makefile +++ b/target/linux/x86/image/Makefile @@ -83,6 +83,9 @@ ifneq ($(CONFIG_GRUB_IMAGES),) -e 's#@TIMEOUT@#$(GRUB_TIMEOUT)#g' \ -e 's#@ROOT@#$(GRUB_ROOT)#g' \ ./grub.cfg > $(KDIR)/root.grub/boot/grub/grub.cfg + ifeq ($(CONFIG_PACKAGE_intel-microcode),y) + $(CP) $(STAGING_DIR)/root-x86/lib/firmware/intel-ucode.img $(KDIR)/root.grub/boot/ + endif PADDING="$(CONFIG_TARGET_IMAGES_PAD)" SIGNATURE="$(SIGNATURE)" PATH="$(TARGET_PATH)" $(SCRIPT_DIR)/gen_image_generic.sh \ $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \ $(CONFIG_TARGET_KERNEL_PARTSIZE) $(KDIR)/root.grub \ @@ -120,6 +123,9 @@ define Image/Build/iso -e 's#@CMDLINE@#root=/dev/sr0 rootfstype=iso9660 rootwait $(strip $(call Image/cmdline/$(1)) $(BOOTOPTS) $(GRUB_CONSOLE_CMDLINE))#g' \ -e 's#@TIMEOUT@#$(GRUB_TIMEOUT)#g' \ ./grub-iso.cfg > $(KDIR)/root.grub/boot/grub/grub.cfg + ifeq ($(CONFIG_PACKAGE_intel-microcode),y) + $(CP) $(STAGING_DIR)/root-x86/lib/firmware/intel-ucode.img $(KDIR)/root.grub/boot/ + endif mkisofs -R -b boot/grub/eltorito.img -no-emul-boot -boot-info-table \ -o $(KDIR)/root.iso $(KDIR)/root.grub $(TARGET_DIR) endef