From patchwork Thu Aug 10 18:37:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 134145 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp611899vqi; Thu, 10 Aug 2023 11:40:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHFzSh9K4RlQAzXcNOBEyxLFtNWWubIfP+J9Eiq2roWoj0O3XJM2T08tKnpgWQk2uR3ZRQd X-Received: by 2002:a05:6808:6343:b0:39e:b985:b47e with SMTP id eb3-20020a056808634300b0039eb985b47emr3314739oib.36.1691692840375; Thu, 10 Aug 2023 11:40:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691692840; cv=none; d=google.com; s=arc-20160816; b=NuuRjWZhSa6cFclfROJqUyBzzFMLin1DNprSANsvr2d8OvB1XPkIC+viMhK7sdoZHe Db6dJ7TJhTs6eebplxs+3a4YsNxUnFFkx2NVbutP4xs0HUZ/XL//rOlFNomc7w2BzRUq YT0FQd4RsFwwo+ZyAqeyfYBkuPDD2wLNzxTy/osnl2RtWz4I4DoHT2zpAnl1q1ilaRtu YBHrUdIuraR8QZsBa+sgyZA8muWZQxAHenHipepJaDbWiVkuv7GnOORn57hnuKDF+FbB U1VZw9vf3PCByL3xefNZ4zicbrKy/g5MlOsv7oUmfhKi7l5NcktDv/f7xZ+fbG+aHqSk 0qqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:mime-version:references:subject:cc:to:from :dkim-signature:dkim-signature:message-id; bh=b/ELWliFBPnNte8vlpVCfRTqinp+om6shCPvsMqFYso=; fh=Vp72a/EEov1VOHpGPkCjAnDQEmhhYrQPa+PSfT8H2jQ=; b=QuNAyT+7RN9rolvE/0wP++ZSEIHoqLrkL1j6bqvKJolbd5O1BBjBLentgzspdtQXZ2 NqCuuILYV+eAKGRZx1hEOxIJD6RTH19XfckxbntLmuCW23wgL9QFexVYp/icFnFEd3zp kA8Kd1JnO1gEEqPPmF3ZzAMpnIpMD8+zFmSyvv2HhW3Fx0y+noL1GrCgJFKsB3H94prk 1JGdjJAyssRKuYeQGSQ5GyE7+dB84Qe3Oo8uZAjha85iuObxt/J/EUTc6nQGGc+cQ1lK UalhsP39zpLyxlXzHX8gkZAy/QryF9oAwfUdsA/pjFyofsrRe8zi8TGqyWcv7uu5qJPh CIjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=tIDqRKts; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=kacb0RkV; 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 e65-20020a636944000000b0056546b5fef5si1961626pgc.561.2023.08.10.11.40.27; Thu, 10 Aug 2023 11:40:40 -0700 (PDT) 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=tIDqRKts; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=kacb0RkV; 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 S235957AbjHJSiN (ORCPT + 99 others); Thu, 10 Aug 2023 14:38:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235776AbjHJShw (ORCPT ); Thu, 10 Aug 2023 14:37:52 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5897A30E8 for ; Thu, 10 Aug 2023 11:37:44 -0700 (PDT) Message-ID: <20230810160805.599721262@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691692662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=b/ELWliFBPnNte8vlpVCfRTqinp+om6shCPvsMqFYso=; b=tIDqRKtsAczC2vhSfOg9J4ElLqv9zAb4WvzrFXZc2m2+mDeV6zwRTyLHe4JzX1+htCAQKh sYGzX5kVQjNUTlUbppesPINgKiM1YjIHTLhmQp0grSO+69C7vk9/ESoA1Y1LhEaK1WGtGx aHJEZB6t3ZQMDhV2/HfUtF+940FPHXmdrvTawbP1rmc6Ve8RlcTIrK/quQ3uo3upARZPT3 YFB1pM9V73Ni2m3XOUtHTH2BmxzjtawMMj2NTkIRY+5TNuIiC0N9BrvFE/Eb52DaC3cAMM kh09plQ4FVOdiY/5AgErzbWoVTlcYJxCGt9DsQ49Fu2/B/JfAAuMCZ4tyrlu4w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691692662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=b/ELWliFBPnNte8vlpVCfRTqinp+om6shCPvsMqFYso=; b=kacb0RkVDEqsTXw8fDBnUowRs3bIY1HfbQ/cV7LDach52B1oymcv/xuKjcdZj0f5dCiG02 ISP+yZuOoDBISLBw== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Borislav Petkov , Ashok Raj , Arjan van de Ven Subject: [patch 11/30] x86/microcode/intel: Simplify scan_microcode() References: <20230810153317.850017756@linutronix.de> MIME-Version: 1.0 Date: Thu, 10 Aug 2023 20:37:42 +0200 (CEST) X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS 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: INBOX X-GMAIL-THRID: 1773868511459591732 X-GMAIL-MSGID: 1773868511459591732 Make it readable and comprehensible. Signed-off-by: Thomas Gleixner --- arch/x86/kernel/cpu/microcode/intel.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) --- a/arch/x86/kernel/cpu/microcode/intel.c +++ b/arch/x86/kernel/cpu/microcode/intel.c @@ -247,22 +247,16 @@ static void save_microcode_patch(void *d intel_ucode_patch = (struct microcode_intel *)p; } -/* - * Get microcode matching with BSP's model. Only CPUs with the same model as - * BSP can stay in the platform. - */ -static struct microcode_intel * -scan_microcode(void *data, size_t size, struct ucode_cpu_info *uci, bool save) +/* Scan CPIO for microcode matching the boot CPUs family, model, stepping */ +static struct microcode_intel *scan_microcode(void *data, size_t size, + struct ucode_cpu_info *uci, bool save) { struct microcode_header_intel *mc_header; struct microcode_intel *patch = NULL; u32 cur_rev = uci->cpu_sig.rev; unsigned int mc_size; - while (size) { - if (size < sizeof(struct microcode_header_intel)) - break; - + for (; size >= sizeof(struct microcode_header_intel); size -= mc_size, data += mc_size) { mc_header = (struct microcode_header_intel *)data; mc_size = get_totalsize(mc_header); @@ -270,27 +264,19 @@ scan_microcode(void *data, size_t size, intel_microcode_sanity_check(data, false, MC_HEADER_TYPE_MICROCODE) < 0) break; - size -= mc_size; - - if (!intel_find_matching_signature(data, uci->cpu_sig.sig, - uci->cpu_sig.pf)) { - data += mc_size; + if (!intel_find_matching_signature(data, uci->cpu_sig.sig, uci->cpu_sig.pf)) continue; - } /* BSP scan: Check whether there is newer microcode */ if (save && cur_rev >= mc_header->rev) - goto next; + continue; /* Save scan: Check whether there is newer or matching microcode */ if (save && cur_rev != mc_header->rev) - goto next; + continue; patch = data; cur_rev = mc_header->rev; - -next: - data += mc_size; } if (size)