From patchwork Sat Jan 21 14:54:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 46828 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp754903wrn; Sat, 21 Jan 2023 06:58:18 -0800 (PST) X-Google-Smtp-Source: AMrXdXvK4n5dgWuF6mjgASRN8x9Kwqq+huVYgk2IhSdgiUlXkA9hkLyUG5Uxa5P+JeV13GPcDnkY X-Received: by 2002:a50:ff12:0:b0:492:8c77:7da9 with SMTP id a18-20020a50ff12000000b004928c777da9mr16827446edu.9.1674313098229; Sat, 21 Jan 2023 06:58:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674313098; cv=none; d=google.com; s=arc-20160816; b=wmuJSV3OiK7CZ2+M7/4aHCMjMWxB8XGihM1XVcSR+CLVoRWFyHke29sXJg416uLo9F CrOHbbDwmS5WbWFFHcBjKKKsJOoearwXW+fxEKsyZN67glQNxnQrp893zG4smH0P4SYU Up0fzbFqkGkTd6xzwAqa3tOVPbAeAqdxkGeRG3GiOSe1FdAF0ST1YPrFOXzEmnaZvdat hWv7/AHbe1etdDMrg/aczddAfxP7EQ29s+FAsQLmqYjb/R6CYqJ2eluj8Hr792GdTIoR mezhHLDep9CMIV+GQ/Qz1TMq32np8bMb1mGTKCr843XJvbtmM/4RxpqtkiUQoA1LjtBc camQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=1nCB5yYS/tkI5VyimcBNhdMpiz8n9jB8G7ssJJ7+P5w=; b=fQ6+18zkm/3dsOWLNUTjKX81W84eGXCDdAHZN19AlhJpBLF4BKN3tGoIi6RSVLdLNZ KNgUEiV6HLBqR7jZEEcsuvw3swUOqoNHAOjLLM6TDQrlyoWAK+IsrdyEnAFhZeDtTL4Z zvY3qLohEeOQWj2HBclj4OUQ5R+CmH915iRY2ZAKNZF0K9UybnvljsM07rJiIPkvMLSu 7zJaMLdu37vMEHPpuzvWM9GZro4GioH5BhWbCnD8pPaBzASm+Utkh8IvQs5vFTWO+Z4Z VAaL1GtWGdr01c5ziHhPwAeYlQK+lQUsW1ee7+bf1bau1Du1JD63bC6veoGv7Lsnu4x6 iwiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=z4qVJH2G; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=w+zMIFSS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f9-20020a0564021e8900b00499d35c577csi22948139edf.104.2023.01.21.06.57.54; Sat, 21 Jan 2023 06:58:18 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=z4qVJH2G; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=w+zMIFSS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229764AbjAUOyf (ORCPT + 99 others); Sat, 21 Jan 2023 09:54:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38462 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229653AbjAUOyb (ORCPT ); Sat, 21 Jan 2023 09:54:31 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A8C871A967; Sat, 21 Jan 2023 06:54:30 -0800 (PST) Date: Sat, 21 Jan 2023 14:54:27 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1674312868; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1nCB5yYS/tkI5VyimcBNhdMpiz8n9jB8G7ssJJ7+P5w=; b=z4qVJH2G8oMoCQvmRkskhatBlRdn0Y7TiusQ26Xbu1owAsz0zxLTw6yuN3bDgri/SVeHKK FXdiCEBwQuGGh1xkGE8PvXkJpLm1+LjYKV466GfS0dmcgBjH+Yvg+OjC+8sbJbXeHa0OE+ UC6L6st4uwa3uN7aaxvDyNUYQ43YiXhc050cYwoRDrLU0K1Y/BLEFtOlZ3fs6xGPQLSL2o oo6K1HSN1Fv5J3StjOiCV0fIpSJ9a5reLlQrk/GRwkV01B9TO3p/weWJ5qsTdBm2EZS9Ra eD0CLOO2VVfkUmfwUFjtlXF2UN1vi8qGW3hNS9EPi3G2fs8oLwa1j7EVwIeupg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1674312868; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1nCB5yYS/tkI5VyimcBNhdMpiz8n9jB8G7ssJJ7+P5w=; b=w+zMIFSSpg2SDeIEQt/vrbnp3BzOqWtAZMzsMN0TuijBjkw6ZtteRtlHSRhyOSHGWXKwbT bj8PsRC5tbBq5rBA== From: "tip-bot2 for Ashok Raj" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/microcode] x86/microcode/intel: Print old and new revision during early boot Cc: Ashok Raj , "Borislav Petkov (AMD)" , Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230120161923.118882-6-ashok.raj@intel.com> References: <20230120161923.118882-6-ashok.raj@intel.com> MIME-Version: 1.0 Message-ID: <167431286745.4906.3764375388680449088.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755644531028613622?= X-GMAIL-MSGID: =?utf-8?q?1755644531028613622?= The following commit has been merged into the x86/microcode branch of tip: Commit-ID: a9a5cac225b0830d1879640e25231a37e537f0da Gitweb: https://git.kernel.org/tip/a9a5cac225b0830d1879640e25231a37e537f0da Author: Ashok Raj AuthorDate: Sun, 15 Jan 2023 19:57:27 +01:00 Committer: Borislav Petkov (AMD) CommitterDate: Sat, 21 Jan 2023 14:55:21 +01:00 x86/microcode/intel: Print old and new revision during early boot Make early loading message match late loading message and print both old and new revisions. This is helpful to know what the BIOS loaded revision is before an early update. Cache the early BIOS revision before the microcode update and have print_ucode_info() print both the old and new revision in the same format as microcode_reload_late(). [ bp: Massage, remove useless comment. ] Signed-off-by: Ashok Raj Signed-off-by: Borislav Petkov (AMD) Reviewed-by: Thomas Gleixner Link: https://lore.kernel.org/r/20230120161923.118882-6-ashok.raj@intel.com --- arch/x86/kernel/cpu/microcode/intel.c | 28 ++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c index 9dbd007..467cf37 100644 --- a/arch/x86/kernel/cpu/microcode/intel.c +++ b/arch/x86/kernel/cpu/microcode/intel.c @@ -305,12 +305,10 @@ static bool load_builtin_intel_microcode(struct cpio_data *cp) return false; } -/* - * Print ucode update info. - */ -static void print_ucode_info(unsigned int new_rev, unsigned int date) +static void print_ucode_info(int old_rev, int new_rev, unsigned int date) { - pr_info_once("microcode updated early to revision 0x%x, date = %04x-%02x-%02x\n", + pr_info_once("updated early: 0x%x -> 0x%x, date = %04x-%02x-%02x\n", + old_rev, new_rev, date & 0xffff, date >> 24, @@ -321,6 +319,7 @@ static void print_ucode_info(unsigned int new_rev, unsigned int date) static int delay_ucode_info; static int current_mc_date; +static int early_old_rev; /* * Print early updated ucode info after printk works. This is delayed info dump. @@ -331,7 +330,7 @@ void show_ucode_info_early(void) if (delay_ucode_info) { intel_cpu_collect_info(&uci); - print_ucode_info(uci.cpu_sig.rev, current_mc_date); + print_ucode_info(early_old_rev, uci.cpu_sig.rev, current_mc_date); delay_ucode_info = 0; } } @@ -340,29 +339,32 @@ void show_ucode_info_early(void) * At this point, we can not call printk() yet. Delay printing microcode info in * show_ucode_info_early() until printk() works. */ -static void print_ucode(int new_rev, int date) +static void print_ucode(int old_rev, int new_rev, int date) { int *delay_ucode_info_p; int *current_mc_date_p; + int *early_old_rev_p; delay_ucode_info_p = (int *)__pa_nodebug(&delay_ucode_info); current_mc_date_p = (int *)__pa_nodebug(¤t_mc_date); + early_old_rev_p = (int *)__pa_nodebug(&early_old_rev); *delay_ucode_info_p = 1; *current_mc_date_p = date; + *early_old_rev_p = old_rev; } #else -static inline void print_ucode(int new_rev, int date) +static inline void print_ucode(int old_rev, int new_rev, int date) { - print_ucode_info(new_rev, date); + print_ucode_info(old_rev, new_rev, date); } #endif static int apply_microcode_early(struct ucode_cpu_info *uci, bool early) { struct microcode_intel *mc; - u32 rev; + u32 rev, old_rev; mc = uci->mc; if (!mc) @@ -379,6 +381,8 @@ static int apply_microcode_early(struct ucode_cpu_info *uci, bool early) return UCODE_OK; } + old_rev = rev; + /* * Writeback and invalidate caches before updating microcode to avoid * internal issues depending on what the microcode is updating. @@ -395,9 +399,9 @@ static int apply_microcode_early(struct ucode_cpu_info *uci, bool early) uci->cpu_sig.rev = rev; if (early) - print_ucode(uci->cpu_sig.rev, mc->hdr.date); + print_ucode(old_rev, uci->cpu_sig.rev, mc->hdr.date); else - print_ucode_info(uci->cpu_sig.rev, mc->hdr.date); + print_ucode_info(old_rev, uci->cpu_sig.rev, mc->hdr.date); return 0; }