From patchwork Sat Aug 12 19:58:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 134939 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp1887448vqi; Sat, 12 Aug 2023 13:39:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH6b/i735fj9Gd7nRVKbLzlF9r/ik2b3RDaQwjKjivJh9kYh5o7NVsZeCDnLSd0LLWnerjM X-Received: by 2002:a17:90a:e542:b0:263:eb0e:5681 with SMTP id ei2-20020a17090ae54200b00263eb0e5681mr6868160pjb.3.1691872748157; Sat, 12 Aug 2023 13:39:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691872748; cv=none; d=google.com; s=arc-20160816; b=MrrfTcb5I86K1mDX1l+Sa5zXezKRv9sEoLYImSwFJpll2DotEt8Ysu1nQesy5JVKcV QxB+SX/Me7oZ1F4Uwt3xo0fy90oi2lWaJ/30B/bDx5x2l1Wp9aSwbu/vj/bXZyx4ess5 trY1p1f+dGidoA6I3N8a9EVO6Dmm98woMKTjSL5kD3iQygw0ATykA+7bsNjA3Zo3UGtl vRG8c0iEaRebPHE5yw1oNx88qqy2i2O1jAPdFRCG/TN+5FnOeKTlQ3qlal7sK0IPh8lk OSMzFqKovxMEVc8Pb0V5FBCsbuBnBEUy9E5A/WaK893uWJb1iuRpThPrFZ5DcxWNow42 LpCw== 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=UL/mdoYp2YOPutZME2dSUHU8tUoO072JwJbw3jCdJRc=; fh=yVae3u0BRTnDkPuniOcxLkA1wgvMDfOA8XxNsc4ELm4=; b=h1yfHz4eb3AjlwfUw/fjtr7O+O7M3xVwBoi0ObtBOZENvAHYGGcXSeo9WTVOqr2kOl F6w7DjUi/+ZUwrIWit2cJe2Wond1vOzzNuCc0rPgbE0jOY8XhQ3SQemKqgt7GOYknDej oeRq6dnKDX/7alOIZ+5qU4uXs40ByMrFK8f0nnsTdCFGh9WFNmASE61/zTwtom5OCao6 Gt5wsxH/+Mv5a9go5TWTlq/eg8eFjTdCaAdUufUiJYp+z04tHBz+qjztuhlCvM37ODfN jV/WWm8Li4Yb32ZqNSgtZprspQTeVfURFyEekrDkBUDorvGOyTRYgHsFnvE0J97fNiK+ +bFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=k196Gikc; dkim=neutral (no key) header.i=@linutronix.de; 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 co20-20020a17090afe9400b002534f4ce2b6si7358364pjb.125.2023.08.12.13.38.52; Sat, 12 Aug 2023 13:39:08 -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=k196Gikc; dkim=neutral (no key) header.i=@linutronix.de; 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 S230415AbjHLUAw (ORCPT + 99 others); Sat, 12 Aug 2023 16:00:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58370 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230349AbjHLUAs (ORCPT ); Sat, 12 Aug 2023 16:00:48 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C5641FE6 for ; Sat, 12 Aug 2023 13:00:18 -0700 (PDT) Message-ID: <20230812195728.188483733@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691870334; 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=UL/mdoYp2YOPutZME2dSUHU8tUoO072JwJbw3jCdJRc=; b=k196Gikce4bNi5roHHck82eFjbXLl9qvTM21pyAwgSV1PGVZpP68bSXUquAaTlo45GKi3b 0D5+H5Upb40rc6ezn73UIpYOgu/M/gDP4JoYj0G4dN81V0dc6mwuIAG0uy6VYsvE4PRWok YtU2rUe4OA5EcN5lBn4YpodKCU6WWgxKUcMggfWKFjyPwAGQHd72WZlgJp2eOvIecTOBzi xET5TmbObUsnQlOd8HDXhVC8UlDymZm8Yy8I4rEjAnpqGMC8HUuXsGjOFuYokLWvIzRQmN KvbMjTNo4ijiWVxIkHFJ3Ac2egSkCcSnT5jW/UI4H2clluMxBvqF2oc+XcXIBA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691870334; 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=UL/mdoYp2YOPutZME2dSUHU8tUoO072JwJbw3jCdJRc=; b=wYMXV8LdRz0zsOeaxUoMbnhf8qyYqy8Dpx2tC+1KmIkxAQI2AvQetjwn2uLa0ioUSVfAtW IxKPuVssEC4/bBCQ== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Borislav Petkov , Ashok Raj , Arjan van de Ven , Nikolay Borisov Subject: [patch V2 11/37] x86/microcode/intel: Simplify scan_microcode() References: <20230812194003.682298127@linutronix.de> MIME-Version: 1.0 Date: Sat, 12 Aug 2023 21:58:53 +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,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: INBOX X-GMAIL-THRID: 1774057158778258014 X-GMAIL-MSGID: 1774057158778258014 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 @@ -275,22 +275,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); @@ -298,27 +292,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)