From nobody Mon Feb 9 03:10:56 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB109C001DE for ; Thu, 10 Aug 2023 18:38:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235961AbjHJSiQ (ORCPT ); Thu, 10 Aug 2023 14:38:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235865AbjHJSiB (ORCPT ); Thu, 10 Aug 2023 14:38:01 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0068A3585 for ; Thu, 10 Aug 2023 11:37:45 -0700 (PDT) Message-ID: <20230810160805.655551122@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691692664; 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=uWV1AnK66aJ45IpQqDrjl0snIk0PFjfM1jJpRITU7kE=; b=VjB4d83+qGsxayaMcW67CC34Wp6v6LB8yGlMmcmxPaQgML0Q3Lo0U+qvSjxL1NqG4AqgTP A8RMQa3Hu9Snq/tvUkQ4wep/EQVW8YesFYze+3RTidOaMIjvDo2laC3bqWzpcy+Tm+FUk3 79pUjSFLA1qVBPAep0EWdjeuPUxZ7fqTYiXMwTqvKmn2i7s8pxWqWLNOgPT4Ee+Csrc/zN Q1QnU0l/L+RqjbR74s1bBpOBVNSTWZrzJ4XTmSUgoakpv1+ZVjXxlEMkiBzSPJToSBqhH5 u1FiibSmDEj9pFnsmrkgtZmGQ+G5Tip9NbkV3UUBMEPeT5EVq/BkGobBC5xU+w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691692664; 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=uWV1AnK66aJ45IpQqDrjl0snIk0PFjfM1jJpRITU7kE=; b=ehzq3ip81m4NMQ0v9I9XcNeXSz6ZsjWKcGdMVYeLNkghzKJ/yjWj7B3X/N4sRNWvDvv4H3 tisIObZBOnSoWvAw== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Borislav Petkov , Ashok Raj , Arjan van de Ven Subject: [patch 12/30] x86/microcode/intel: Simplify and rename generic_load_microcode() References: <20230810153317.850017756@linutronix.de> MIME-Version: 1.0 Date: Thu, 10 Aug 2023 20:37:43 +0200 (CEST) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" so it becomes less obfuscated and rename it because there is nothing generic about it. Signed-off-by: Thomas Gleixner --- arch/x86/kernel/cpu/microcode/intel.c | 47 ++++++++++++-----------------= ----- 1 file changed, 17 insertions(+), 30 deletions(-) --- a/arch/x86/kernel/cpu/microcode/intel.c +++ b/arch/x86/kernel/cpu/microcode/intel.c @@ -212,19 +212,6 @@ int intel_microcode_sanity_check(void *m } EXPORT_SYMBOL_GPL(intel_microcode_sanity_check); =20 -/* - * Returns 1 if update has been found, 0 otherwise. - */ -static int has_newer_microcode(void *mc, unsigned int csig, int cpf, int n= ew_rev) -{ - struct microcode_header_intel *mc_hdr =3D mc; - - if (mc_hdr->rev <=3D new_rev) - return 0; - - return intel_find_matching_signature(mc, csig, cpf); -} - static void save_microcode_patch(void *data, unsigned int size) { struct microcode_header_intel *p; @@ -617,14 +604,12 @@ static enum ucode_state apply_microcode_ return ret; } =20 -static enum ucode_state generic_load_microcode(int cpu, struct iov_iter *i= ter) +static enum ucode_state read_ucode_intel(int cpu, struct iov_iter *iter) { struct ucode_cpu_info *uci =3D ucode_cpu_info + cpu; unsigned int curr_mc_size =3D 0, new_mc_size =3D 0; - enum ucode_state ret =3D UCODE_OK; - int new_rev =3D uci->cpu_sig.rev; + int cur_rev =3D uci->cpu_sig.rev; u8 *new_mc =3D NULL, *mc =3D NULL; - unsigned int csig, cpf; =20 while (iov_iter_count(iter)) { struct microcode_header_intel mc_header; @@ -641,6 +626,7 @@ static enum ucode_state generic_load_mic pr_err("error! Bad data in microcode data file (totalsize too small)\n"= ); break; } + data_size =3D mc_size - sizeof(mc_header); if (data_size > iov_iter_count(iter)) { pr_err("error! Bad data in microcode data file (truncated file?)\n"); @@ -663,16 +649,17 @@ static enum ucode_state generic_load_mic break; } =20 - csig =3D uci->cpu_sig.sig; - cpf =3D uci->cpu_sig.pf; - if (has_newer_microcode(mc, csig, cpf, new_rev)) { - vfree(new_mc); - new_rev =3D mc_header.rev; - new_mc =3D mc; - new_mc_size =3D mc_size; - mc =3D NULL; /* trigger new vmalloc */ - ret =3D UCODE_NEW; - } + if (cur_rev >=3D mc_header.rev) + continue; + + if (!intel_find_matching_signature(mc, uci->cpu_sig.sig, uci->cpu_sig.pf= )) + continue; + + vfree(new_mc); + cur_rev =3D mc_header.rev; + new_mc =3D mc; + new_mc_size =3D mc_size; + mc =3D NULL; } =20 vfree(mc); @@ -692,9 +679,9 @@ static enum ucode_state generic_load_mic save_microcode_patch(new_mc, new_mc_size); =20 pr_debug("CPU%d found a matching microcode update with version 0x%x (curr= ent=3D0x%x)\n", - cpu, new_rev, uci->cpu_sig.rev); + cpu, cur_rev, uci->cpu_sig.rev); =20 - return ret; + return UCODE_NEW; } =20 static bool is_blacklisted(unsigned int cpu) @@ -743,7 +730,7 @@ static enum ucode_state request_microcod kvec.iov_base =3D (void *)firmware->data; kvec.iov_len =3D firmware->size; iov_iter_kvec(&iter, ITER_SOURCE, &kvec, 1, firmware->size); - ret =3D generic_load_microcode(cpu, &iter); + ret =3D read_ucode_intel(cpu, &iter); =20 release_firmware(firmware);