From patchwork Wed Oct 31 17:48: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: 991591 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.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="HlWnpUIH"; 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 42lbSV2fqnz9s3l for ; Thu, 1 Nov 2018 04:49:30 +1100 (AEDT) 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=trNQcdKWzEYpnQq0hPsLh6Iwceqc8x3WqcCNKtlvwVw=; b=HlWnpUIH4hxoz2 u+VetERBm/U4Gk2BV/TZkpgwP4iUnFIpZ1OrOYPTqQaxkZCo9GvyTdMkwAkKCB6EkD3IQjisN5x2q 1a6FyyAGPFejWeiUkJ5yBxLTQoyZOWpixTSJM9O6eDyeT2zr2HRtjjj6cRZifAkvalJ++WhZrK2xB QRznrqZqON5fnEFEbfz58xH66pTA1VnbT/OjjPzIDmc7wGSgIJwfPOGTzPmSyF+yuJjuR9r976agg 9lUMB614uXGpVF0eGB+CIaySkgndgf+lB561WrocJzeBBLecoSNAmM+5b7KXCs46vuXFg10AHYqDs 82mOjjdCkiAmOsTJE3rA==; 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 1gHucL-0001Dy-Rs; Wed, 31 Oct 2018 17:49:21 +0000 Received: from mx-out.tlen.pl ([193.222.135.158]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gHuc1-0000nB-RV for openwrt-devel@lists.openwrt.org; Wed, 31 Oct 2018 17:49:04 +0000 Received: (wp-smtpd smtp.tlen.pl 36209 invoked from network); 31 Oct 2018 18:48:50 +0100 Received: from 131.ip-164-132-48.eu (HELO vaio-vpcz1.localdomain) (tomek_n@o2.pl@[164.132.48.131]) (envelope-sender ) by smtp.tlen.pl (WP-SMTPD) with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP for ; 31 Oct 2018 18:48:50 +0100 From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Date: Wed, 31 Oct 2018 18:48:37 +0100 Message-Id: <20181031174839.7380-2-tomek_n@o2.pl> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181031174839.7380-1-tomek_n@o2.pl> References: <20181031174839.7380-1-tomek_n@o2.pl> MIME-Version: 1.0 X-WP-MailID: e9d81c8646a26e071f7488e72cfd7dac X-WP-AV: skaner antywirusowy Poczty o2 X-WP-SPAM: NO 000000A [YdMU] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181031_104902_067271_D2D33CC4 X-CRM114-Status: UNSURE ( 7.78 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.2 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.158 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: [OpenWrt-Devel] [PATCH v2 1/2] x86: add amd microcode entries to grub config X-BeenThere: openwrt-devel@lists.openwrt.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 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Create initrd enries for x86 images, that'll load amd microcode as early as possible. Also remove the preinit script responsible for late load of microcode. Signed-off-by: Tomasz Maciej Nowak --- .../x86/base-files/lib/preinit/02_load_x86_ucode | 12 ------------ target/linux/x86/image/grub-iso.cfg | 9 +++++++-- target/linux/x86/image/grub.cfg | 9 +++++++-- 3 files changed, 14 insertions(+), 16 deletions(-) delete mode 100644 target/linux/x86/base-files/lib/preinit/02_load_x86_ucode diff --git a/target/linux/x86/base-files/lib/preinit/02_load_x86_ucode b/target/linux/x86/base-files/lib/preinit/02_load_x86_ucode deleted file mode 100644 index d3a23e24b2..0000000000 --- a/target/linux/x86/base-files/lib/preinit/02_load_x86_ucode +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# Copyright (C) 2018 OpenWrt.org - -do_load_x86_ucode() { - if grep -q AuthenticAMD /proc/cpuinfo; then - if [ -e "/sys/devices/system/cpu/microcode/reload" ]; then - echo 1 > /sys/devices/system/cpu/microcode/reload - fi - fi -} - -boot_hook_add preinit_main do_load_x86_ucode diff --git a/target/linux/x86/image/grub-iso.cfg b/target/linux/x86/image/grub-iso.cfg index 5d128aa3aa..c624cbe0ee 100644 --- a/target/linux/x86/image/grub-iso.cfg +++ b/target/linux/x86/image/grub-iso.cfg @@ -7,7 +7,12 @@ set root='(cd)' menuentry "@TITLE@" { linux /boot/vmlinuz @CMDLINE@ noinitrd - if [ -s /boot/intel-ucode.img ]; then - initrd /boot/intel-ucode.img + set amd="/boot/amd-ucode.img" + set intel="/boot/intel-ucode.img" + if [ -s "$amd" ]; then + initrd $amd $intel + fi + if [ -s "$intel" ]; then + initrd $intel $amd fi } diff --git a/target/linux/x86/image/grub.cfg b/target/linux/x86/image/grub.cfg index a665686863..21d719261b 100644 --- a/target/linux/x86/image/grub.cfg +++ b/target/linux/x86/image/grub.cfg @@ -7,8 +7,13 @@ set root='(@ROOT@)' menuentry "@TITLE@" { linux /boot/vmlinuz @CMDLINE@ noinitrd - if [ -s /boot/intel-ucode.img ]; then - initrd /boot/intel-ucode.img + set amd="/boot/amd-ucode.img" + set intel="/boot/intel-ucode.img" + if [ -s "$amd" ]; then + initrd $amd $intel + fi + if [ -s "$intel" ]; then + initrd $intel $amd fi } menuentry "@TITLE@ (failsafe)" {