From patchwork Mon Oct 2 11:59:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 147433 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1635822vqb; Mon, 2 Oct 2023 12:10:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEd+ppC/Ka4jyZHt5n3dqf3rTQhhkao8Cm6G5hJWGqbRmyUZxR2HEJThWjXI/9nPyF2JN97 X-Received: by 2002:a17:90b:3a85:b0:278:faf8:af9f with SMTP id om5-20020a17090b3a8500b00278faf8af9fmr11524016pjb.20.1696273824323; Mon, 02 Oct 2023 12:10:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696273824; cv=none; d=google.com; s=arc-20160816; b=uPWkiD0FfCuy0RLA4eYdxdipooHDHRwCvD+WVrrrHU7LRwxvdY3PIuou/Kd+DjBJAD w94jr1qC4OZkGF8VSIwAoNyDmiWM6ewcCMcJoQHcnjTexdu84Rw63tcrAJYqgSTUZY+W f9KHWjwDd0e1l05uym2KnYuLZqtxDehB7if3FAIuk1uiA+UNMXNHzrzeAljr3p1Z0u9T S2TrcGg27FWU7B6DuHkOsBqrrYm4+cy2gTdFKaPUn/omM594sOygT5ElwQCdoMdE61Pz zwUiUzK5sHBwRIzMkZQog6r24LMeRK+gNmXrIzGZSKfP7hJ0V509edEuhyb6g/5k91G3 edKA== 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=Y5qxxKqecrle90S2dXSe1Mr+hVulDTSr+daYuKbLlV8=; fh=u57tXYamzTrJA+Ht8n1u7SfTMptrQaIb6LVW+jsaYf4=; b=VXGJkaSt1Ci7eMH/ygN4PzbopU6vEDMRAF2ajlH4AIWUF9bWfIYHoqmEaD09NtdgID TYe32j1JpqS2YAVovIX3Vs+xejULkFpbMuvIVuKYo2pcRLqUi9qDvv5/fuAN3QOMuDpd twH3n4Lpfm6XGWHvvreJ36hl+iY547ZgZArX1r4wqog2hnW1lCQMnl7kmttYV1HT2IUd 8JVS+m6Xs95DShYUd2Xr2yqZrYNMUAOnNlzwYXVBk79OZDWwRhjwqd5WBwQQdrakFiiS 31U3grJDVkg6HjUfkHcwWYc8siPnbZCFIRRRdK9u0m0DIh3MnbWmIL9SHJOdWeh+gQyD G1tQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=bmensbdz; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=kd5tbAIK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id f4-20020a170902684400b001bdc664cd5fsi25497108pln.168.2023.10.02.12.10.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 12:10:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=bmensbdz; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=kd5tbAIK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id C0F918106878; Mon, 2 Oct 2023 05:00:42 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236933AbjJBMAO (ORCPT + 18 others); Mon, 2 Oct 2023 08:00:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236893AbjJBL77 (ORCPT ); Mon, 2 Oct 2023 07:59:59 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B3C0F2 for ; Mon, 2 Oct 2023 04:59:49 -0700 (PDT) Message-ID: <20231002115902.684026662@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1696247988; 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=Y5qxxKqecrle90S2dXSe1Mr+hVulDTSr+daYuKbLlV8=; b=bmensbdziZmshoPUC1vUh4BpkQ7Qnsg2EkOBQlm5HyU7L4/ktzCTe8Yk2lXP/W2a7+6EVa ZIorSy0pw079gFUXT99N7BKxo/L4HqkpNZ9Eh0AyvvIs9qjLDmmQkGkyqGGc/y7rP18D7P Vn4qgK9TUzbNh4vbhMWkJ4Gb3f2n4RO6b1N78duvH33LkyNpYUH/DrioDCHo+H3eyGzhCM 4UYPEY1ZWwUH7MYFTldwKtT1RFOH1EwZjKzfn1gVkIiCVvLhc15djX7k9M1kbE0C/A6HEY Zhc1ZGcGryBl18xMkDfk08vOdvcj7lzKFPWQFbWKSDfY6O91yYBrzZ3XjKNtMg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1696247988; 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=Y5qxxKqecrle90S2dXSe1Mr+hVulDTSr+daYuKbLlV8=; b=kd5tbAIKuoATrkVyfG8j5tt9s7V3FKK8wnxgaU6lE8ymh85ygPfCbzr2//n4sTrrwCYp49 ZN75/+FKo1YtP9Ag== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Borislav Petkov , "Chang S. Bae" , Arjan van de Ven , Nikolay Borisov Subject: [patch V4 11/30] x86/microcode/intel: Rework intel_cpu_collect_info() References: <20231002115506.217091296@linutronix.de> MIME-Version: 1.0 Date: Mon, 2 Oct 2023 13:59:47 +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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 02 Oct 2023 05:00:42 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778672021658190736 X-GMAIL-MSGID: 1778672021658190736 Nothing needs struct ucode_cpu_info. Make it take struct cpu_signature, let it return a boolean and simplify the implementation. Rename it now that the silly name clash with collect_cpu_info() is gone. Signed-off-by: Thomas Gleixner --- V2: New patch --- arch/x86/include/asm/cpu.h | 4 ++-- arch/x86/kernel/cpu/microcode/intel.c | 33 +++++++++------------------------ drivers/platform/x86/intel/ifs/load.c | 8 +++----- 3 files changed, 14 insertions(+), 31 deletions(-) --- a/arch/x86/include/asm/cpu.h +++ b/arch/x86/include/asm/cpu.h @@ -73,9 +73,9 @@ static inline void init_ia32_feat_ctl(st extern __noendbr void cet_disable(void); -struct ucode_cpu_info; +struct cpu_signature; -int intel_cpu_collect_info(struct ucode_cpu_info *uci); +void intel_collect_cpu_info(struct cpu_signature *sig); static inline bool intel_cpu_signatures_match(unsigned int s1, unsigned int p1, unsigned int s2, unsigned int p2) --- a/arch/x86/kernel/cpu/microcode/intel.c +++ b/arch/x86/kernel/cpu/microcode/intel.c @@ -66,36 +66,21 @@ static inline unsigned int exttable_size return et->count * EXT_SIGNATURE_SIZE + EXT_HEADER_SIZE; } -int intel_cpu_collect_info(struct ucode_cpu_info *uci) +void intel_collect_cpu_info(struct cpu_signature *sig) { - unsigned int val[2]; - unsigned int family, model; - struct cpu_signature csig = { 0 }; - unsigned int eax, ebx, ecx, edx; + sig->sig = cpuid_eax(1); + sig->pf = 0; + sig->rev = intel_get_microcode_revision(); - memset(uci, 0, sizeof(*uci)); + if (x86_model(sig->sig) >= 5 || x86_family(sig->sig) > 6) { + unsigned int val[2]; - eax = 0x00000001; - ecx = 0; - native_cpuid(&eax, &ebx, &ecx, &edx); - csig.sig = eax; - - family = x86_family(eax); - model = x86_model(eax); - - if (model >= 5 || family > 6) { /* get processor flags from MSR 0x17 */ native_rdmsr(MSR_IA32_PLATFORM_ID, val[0], val[1]); - csig.pf = 1 << ((val[1] >> 18) & 7); + sig->pf = 1 << ((val[1] >> 18) & 7); } - - csig.rev = intel_get_microcode_revision(); - - uci->cpu_sig = csig; - - return 0; } -EXPORT_SYMBOL_GPL(intel_cpu_collect_info); +EXPORT_SYMBOL_GPL(intel_collect_cpu_info); /* * Returns 1 if update has been found, 0 otherwise. @@ -377,7 +362,7 @@ static __init struct microcode_intel *ge if (!(cp.data && cp.size)) return NULL; - intel_cpu_collect_info(uci); + intel_collect_cpu_info(&uci->cpu_sig); return scan_microcode(cp.data, cp.size, uci); } --- a/drivers/platform/x86/intel/ifs/load.c +++ b/drivers/platform/x86/intel/ifs/load.c @@ -227,7 +227,7 @@ static int scan_chunks_sanity_check(stru static int image_sanity_check(struct device *dev, const struct microcode_header_intel *data) { - struct ucode_cpu_info uci; + struct cpu_signature sig; /* Provide a specific error message when loading an older/unsupported image */ if (data->hdrver != MC_HEADER_TYPE_IFS) { @@ -240,11 +240,9 @@ static int image_sanity_check(struct dev return -EINVAL; } - intel_cpu_collect_info(&uci); + intel_collect_cpu_info(&sig); - if (!intel_find_matching_signature((void *)data, - uci.cpu_sig.sig, - uci.cpu_sig.pf)) { + if (!intel_find_matching_signature((void *)data, sig.sig, sig.pf)) { dev_err(dev, "cpu signature, processor flags not matching\n"); return -EINVAL; }