From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757199AbcBIM0v (ORCPT ); Tue, 9 Feb 2016 07:26:51 -0500 Received: from terminus.zytor.com ([198.137.202.10]:36332 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757174AbcBIM0t (ORCPT ); Tue, 9 Feb 2016 07:26:49 -0500 Date: Tue, 9 Feb 2016 04:26:11 -0800 From: tip-bot for Borislav Petkov Message-ID: Cc: hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org, peterz@infradead.org, bp@suse.de, linux-kernel@vger.kernel.org, tv@lio96.de, torvalds@linux-foundation.org Reply-To: linux-kernel@vger.kernel.org, tv@lio96.de, torvalds@linux-foundation.org, hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org, peterz@infradead.org, bp@suse.de In-Reply-To: <1454499225-21544-18-git-send-email-bp@alien8.de> References: <1454499225-21544-18-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/microcode] x86/microcode: Document builtin microcode loading method Git-Commit-ID: b584303261b7041f209afde4bf7ddb7a21598a1f X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: b584303261b7041f209afde4bf7ddb7a21598a1f Gitweb: http://git.kernel.org/tip/b584303261b7041f209afde4bf7ddb7a21598a1f Author: Borislav Petkov AuthorDate: Wed, 3 Feb 2016 12:33:45 +0100 Committer: Ingo Molnar CommitDate: Tue, 9 Feb 2016 11:41:19 +0100 x86/microcode: Document builtin microcode loading method Add some text and an example to Documentation/x86/early-microcode.txt explaining how to build in microcode. Tested-by: Thomas Voegtle Signed-off-by: Borislav Petkov Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1454499225-21544-18-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- Documentation/x86/early-microcode.txt | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/Documentation/x86/early-microcode.txt b/Documentation/x86/early-microcode.txt index d62bea6..c956d99 100644 --- a/Documentation/x86/early-microcode.txt +++ b/Documentation/x86/early-microcode.txt @@ -40,3 +40,28 @@ cp ../microcode.bin kernel/x86/microcode/GenuineIntel.bin (or AuthenticAMD.bin) find . | cpio -o -H newc >../ucode.cpio cd .. cat ucode.cpio /boot/initrd-3.5.0.img >/boot/initrd-3.5.0.ucode.img + +Builtin microcode +================= + +We can also load builtin microcode supplied through the regular firmware +builtin method CONFIG_FIRMWARE_IN_KERNEL. Here's an example: + +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="intel-ucode/06-3a-09 amd-ucode/microcode_amd_fam15h.bin" +CONFIG_EXTRA_FIRMWARE_DIR="/lib/firmware" + +This basically means, you have the following tree structure locally: + +/lib/firmware/ +|-- amd-ucode +... +| |-- microcode_amd_fam15h.bin +... +|-- intel-ucode +... +| |-- 06-3a-09 +... + +so that the build system can find those files and integrate them into +the final kernel image. The early loader finds them and applies them.