From patchwork Mon Oct 2 11:59:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 147396 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1578235vqb; Mon, 2 Oct 2023 10:26:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEpEAWuoHEyGJqyEoc8LuaHI8Lw8opfww59CdCFDv6BF/9/smPw5xQo4/dGciEKo5epdzmo X-Received: by 2002:a05:6808:1a13:b0:3a7:6213:6899 with SMTP id bk19-20020a0568081a1300b003a762136899mr15498613oib.24.1696267606510; Mon, 02 Oct 2023 10:26:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696267606; cv=none; d=google.com; s=arc-20160816; b=HCXQ0h5iDypSFGWpYzxtK3h1JBXCmqhYF2DEMcqK4oyTe3HwGlN7aGmsXf5iIivH3B kfXqmzexTD7qmrZukX922mSESea0FeZ6yB4/h90NfVwm9t6lon3VLdmMdUcfdptUjElB 9ea++JRzKtCudQR4cQcm1P0WJ12QoEDpx2pzBPYJ5OD2uGMO2ZSv3x8VQK0BDvCAkFYc cMOcGHQ2JYedppXqVxvGt6iI24UdfaNLLT1YiI67iEsDRTf795eGIyabWEG1ra05lknh DeJBztwVmasi/g0R7inZYJPIlHgLCk2ax0NugnqgFDTmRiUTILSj3r0QakSWKtV/HzbC Zehw== 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=CL8Mt93Hk88+MM0PiUaqDK+zdUWvTsAJgc1nd1BOMcc=; fh=u57tXYamzTrJA+Ht8n1u7SfTMptrQaIb6LVW+jsaYf4=; b=s6esM0hrDaXzFnaPAy1DFIa/8PeXgcJq1AKS1nkW5qDQXDlzaSgJ3t2GRiKet2/Gpt mexb0Qy4Tx+34RtKI4rx71UxaBGL8Y++HZbah4KpDyctM3UR9wbv/d6+nTNojtRvG/6A +D8Qka7h8bia3YSpz1ZRNVexM6AiIvxE6IuVWVmHUE5xds7b8YdYBT1VKveapDA0JCbg fScA/8/nVqYa8Ty+c5JRD/8YmT2fpP1bbPe4up8GbYNARlG3WfU/KsHaU5+d5XdvYI/N k4YBSWF9dF0WYklgOtrtuP1/kOn+3MdOLZZXpC9QAmda+sCEtWI/qxM5vnvrfv3mePPt vLig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=1ZR90Hun; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b="e1fd2q/a"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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 pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id y24-20020a17090aa41800b0027744a9de69si7851674pjp.126.2023.10.02.10.26.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 10:26:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=1ZR90Hun; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b="e1fd2q/a"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id CDE2C8076D3D; Mon, 2 Oct 2023 05:00:33 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236881AbjJBL75 (ORCPT + 18 others); Mon, 2 Oct 2023 07:59:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236857AbjJBL7q (ORCPT ); Mon, 2 Oct 2023 07:59:46 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B3B2DD for ; Mon, 2 Oct 2023 04:59:43 -0700 (PDT) Message-ID: <20231002115902.389400871@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1696247982; 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=CL8Mt93Hk88+MM0PiUaqDK+zdUWvTsAJgc1nd1BOMcc=; b=1ZR90HunL9z5eJ6ksvZnLxRCkDP6aHy7OvvfxSMM9OVjgGH0+MEbvcxfJ3fmeIwrow8ofh tWnQz+KToKu4IXT3FLnOJOTnj/o4snGqbAeeCcE02mxt6HxRV5qFqI1ylt0/6nzmpgTCLf e9NII/4aI0iw1sFRiz89MgNP+njjYSarHXxcZQZK0Cvvig4ghVj4aoa6SQwCghEKMgSwYm WWJ1TZTeXZyZt1zOAY/CnyJMCZXJ+65Xn5uYyfwqfkl2N3H+xdSUxb5ZmaK8LEPRGNgLbX DcJ/HFEJur/QqSjHaZNPfD/nwp+WrEq5tyfiaE8uRnk4BNRjI8X5hLRImYGb3A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1696247982; 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=CL8Mt93Hk88+MM0PiUaqDK+zdUWvTsAJgc1nd1BOMcc=; b=e1fd2q/aWoqUYauDcuakBc68T6pPCnXcRcOBJ0Ol6ItZqqtV/IwBxs4E10STFLIgeloruX Y4zcjwAQo1fuwVCQ== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Borislav Petkov , "Chang S. Bae" , Arjan van de Ven , Nikolay Borisov Subject: [patch V4 06/30] x86/microcode/intel: Cleanup code further References: <20231002115506.217091296@linutronix.de> MIME-Version: 1.0 Date: Mon, 2 Oct 2023 13:59:41 +0200 (CEST) X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Mon, 02 Oct 2023 05:00:33 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778665501426411272 X-GMAIL-MSGID: 1778665501426411272 From: Thomas Gleixner Sanitize the microcode scan loop, fixup printks and move the loading function for builtin microcode next to the place where it is used and mark it __init. Signed-off-by: Thomas Gleixner --- V2: Fix changelog - Nikolay --- arch/x86/kernel/cpu/microcode/intel.c | 76 ++++++++++++++-------------------- 1 file changed, 32 insertions(+), 44 deletions(-) --- --- a/arch/x86/kernel/cpu/microcode/intel.c +++ b/arch/x86/kernel/cpu/microcode/intel.c @@ -36,7 +36,7 @@ static const char ucode_path[] = "kernel static struct microcode_intel *intel_ucode_patch __read_mostly; /* last level cache size per core */ -static int llc_size_per_core __ro_after_init; +static unsigned int llc_size_per_core __ro_after_init; /* microcode format is extended from prescott processors */ struct extended_signature { @@ -296,29 +296,6 @@ static struct microcode_intel *scan_micr return patch; } -static bool load_builtin_intel_microcode(struct cpio_data *cp) -{ - unsigned int eax = 1, ebx, ecx = 0, edx; - struct firmware fw; - char name[30]; - - if (IS_ENABLED(CONFIG_X86_32)) - return false; - - native_cpuid(&eax, &ebx, &ecx, &edx); - - sprintf(name, "intel-ucode/%02x-%02x-%02x", - x86_family(eax), x86_model(eax), x86_stepping(eax)); - - if (firmware_request_builtin(&fw, name)) { - cp->size = fw.size; - cp->data = (void *)fw.data; - return true; - } - - return false; -} - static int apply_microcode_early(struct ucode_cpu_info *uci) { struct microcode_intel *mc; @@ -362,6 +339,28 @@ static int apply_microcode_early(struct return 0; } +static bool load_builtin_intel_microcode(struct cpio_data *cp) +{ + unsigned int eax = 1, ebx, ecx = 0, edx; + struct firmware fw; + char name[30]; + + if (IS_ENABLED(CONFIG_X86_32)) + return false; + + native_cpuid(&eax, &ebx, &ecx, &edx); + + sprintf(name, "intel-ucode/%02x-%02x-%02x", + x86_family(eax), x86_model(eax), x86_stepping(eax)); + + if (firmware_request_builtin(&fw, name)) { + cp->size = fw.size; + cp->data = (void *)fw.data; + return true; + } + return false; +} + int __init save_microcode_in_initrd_intel(void) { struct ucode_cpu_info uci; @@ -434,25 +433,16 @@ void load_ucode_intel_ap(void) apply_microcode_early(&uci); } -/* Accessor for microcode pointer */ -static struct microcode_intel *ucode_get_patch(void) -{ - return intel_ucode_patch; -} - void reload_ucode_intel(void) { - struct microcode_intel *p; struct ucode_cpu_info uci; intel_cpu_collect_info(&uci); - p = ucode_get_patch(); - if (!p) + uci.mc = intel_ucode_patch; + if (!uci.mc) return; - uci.mc = p; - apply_microcode_early(&uci); } @@ -490,8 +480,7 @@ static enum ucode_state apply_microcode_ if (WARN_ON(raw_smp_processor_id() != cpu)) return UCODE_ERROR; - /* Look for a newer patch in our cache: */ - mc = ucode_get_patch(); + mc = intel_ucode_patch; if (!mc) { mc = uci->mc; if (!mc) @@ -682,18 +671,17 @@ static enum ucode_state request_microcod } static struct microcode_ops microcode_intel_ops = { - .request_microcode_fw = request_microcode_fw, - .collect_cpu_info = collect_cpu_info, - .apply_microcode = apply_microcode_intel, + .request_microcode_fw = request_microcode_fw, + .collect_cpu_info = collect_cpu_info, + .apply_microcode = apply_microcode_intel, }; -static int __init calc_llc_size_per_core(struct cpuinfo_x86 *c) +static __init void calc_llc_size_per_core(struct cpuinfo_x86 *c) { u64 llc_size = c->x86_cache_size * 1024ULL; do_div(llc_size, c->x86_max_cores); - - return (int)llc_size; + llc_size_per_core = (unsigned int)llc_size; } struct microcode_ops * __init init_intel_microcode(void) @@ -706,7 +694,7 @@ struct microcode_ops * __init init_intel return NULL; } - llc_size_per_core = calc_llc_size_per_core(c); + calc_llc_size_per_core(c); return µcode_intel_ops; }