From patchwork Tue Oct 17 21:23:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 154550 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp4406435vqb; Tue, 17 Oct 2023 14:24:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGpn5/YjlIQprGFw6/wZlDmfCEKCHx3JDKdFoBYlDvZzmPWzCTsPi+78lCC1aFQ2UXDk4+N X-Received: by 2002:a17:902:760d:b0:1c6:2b3d:d918 with SMTP id k13-20020a170902760d00b001c62b3dd918mr3601402pll.3.1697577890550; Tue, 17 Oct 2023 14:24:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697577890; cv=none; d=google.com; s=arc-20160816; b=Y5Rqfg167eBrxp3giPSfpdqVtnN552l7VfjxImXinOafVtS0aUnBKkc9tToGejJIy0 HnMc2+SMg/Nhkm+nzuesCuCHm549ZUxltKVRrdXTBYiV7+AEuAo2CBTpYYVGbn0UJCSS O+z/Umck83TQxKuqoLDokCyXxmK072J3epmn5/R5i5Oyxl5nZjO7scEFdtJhWNkxthXB IqAGTDT8xuqUhI3kH0tgu/sxkONuA0lTMhFHN/otjz1ryNu7Hn08nybdnO22BDNOmTI/ vmiTVikWhKlE2MzPrLievnTAM9wjkfUGHmQJC20ifdO/mKEi4FQ1R/ajBqH69+Rmv8Dj vIDw== 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=in5lcKaTOq2HRl8ZSeTrcUYrMkDHoeYPGl+VTJIKes4=; fh=8iy+GLBXZdpcs/hIddJ7mbUapYjefwP9Gb111pAzFms=; b=cyIdCUxiR2qxFFfEsKrgRHZRqZnWYtlp2X7sVFYkxEiZaHu/2O2wthdJt5/vSD7st2 EkRdc8Jv8Nm6hAFGvbwDPO9CAYskuKJxvWK0Mdp6q0zWZqqpOTEpER6cSZpPiaA6RdSy 7hAeA3yioLQNT9CTjNmrYcr8vbijXgxNIww5R89hgoFGDyJIpvG0+66CiYLYaS+zlN7O aYeX53bgFHwbSZEQH4c22o1cutFOh6pVCROmBQ7q6+NX2cOYNWPM1nu1JEIpQRgReAel WLIJIx98VeepW4PvLFvZXM676F3MqbdFjS3ygJg8XsOUyhqo/atj7naQGsVTP4UYiOgF 4MEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=gWD0lue8; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=NSMFh03M; 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 n14-20020a170903110e00b001bf01fee6bcsi2809521plh.610.2023.10.17.14.24.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 14:24:50 -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=gWD0lue8; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=NSMFh03M; 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 C86A48106596; Tue, 17 Oct 2023 14:24:49 -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 S1344346AbjJQVYj (ORCPT + 21 others); Tue, 17 Oct 2023 17:24:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344339AbjJQVYP (ORCPT ); Tue, 17 Oct 2023 17:24:15 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AED70D61 for ; Tue, 17 Oct 2023 14:23:47 -0700 (PDT) Message-ID: <20231017211722.851573238@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1697577825; 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=in5lcKaTOq2HRl8ZSeTrcUYrMkDHoeYPGl+VTJIKes4=; b=gWD0lue8AJsGoo3Y/f9fKOe0tceQEpea/1nTuArLacGMnesihAdO3oOm6hbY2k7UCXSo5O tV86JDLIc9/qUDMMPbyI+3Qr73vazqBoQr6tnD08uX4GUStQkhdNsBIXYwUiCCu10ANNqr w+H658VpJGBvIvCHC4aL2UdPmTkcCAOtFQO++A09MZVXhWvDWM2enfP+7HsNEIhZPwzDOF 5F11jKkItXBrnBKxbb6tmL1uoidWITzgFzFnpMI7y1LxqHrGvpPkW6EQL5xKzJm1nvd1Rh egDmjXI4ZtuSFk5cupFw3+nC7C2aE6eU30xnILmvchyFqsOsx+tRqrTJP8uoJw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1697577825; 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=in5lcKaTOq2HRl8ZSeTrcUYrMkDHoeYPGl+VTJIKes4=; b=NSMFh03MLvfkQPxlPk3XwByCUecGsitnqZV1otjx6vAWvGjq2wtB12X9b+Tr75RY2IeAYU gJUP07pTGbBiY6Bw== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Borislav Petkov Subject: [patch V5 16/39] x86/microcode/intel: Rework intel_cpu_collect_info() References: <20231017200758.877560658@linutronix.de> MIME-Version: 1.0 Date: Tue, 17 Oct 2023 23:23:45 +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]); Tue, 17 Oct 2023 14:24:49 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780039434154943859 X-GMAIL-MSGID: 1780039434154943859 From: Thomas Gleixner 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 --- 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. @@ -378,7 +363,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; }