Received: by 2002:a05:7412:d8a:b0:e2:908c:2ebd with SMTP id b10csp3421648rdg; Tue, 17 Oct 2023 14:26:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEL1rVIIAUwiDpCzNniX9U9WlQjMMcy8bbeldcXCuChenYBrTKfP46E6heYgfclDgniH274 X-Received: by 2002:a05:6359:5e02:b0:134:e301:2c21 with SMTP id pw2-20020a0563595e0200b00134e3012c21mr3624729rwb.15.1697577988170; Tue, 17 Oct 2023 14:26:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697577988; cv=none; d=google.com; s=arc-20160816; b=l4rH+lblvXrgqQeg/OrLVkl820IlULFQ/HbFnByfRCpwCCK5a44o09OUySJDzfJncv JDTTQLYRdOYDiFX5UZ1voJ9zxrsjPUHeT+1snxi3sQERrFYUQ00tXepYnvR9Grk/JNpa U2lNSzN9Li8IgZt+zR21CfxLcD04j0Y+HKNky5rhyA1u0YJxkOP1w/rzIrDbzVYbjfsZ upBc/ooHUGU1IuIXPoa86H2vNSKyAwH1+hpyHaT4a7uSAypJZl4lE/aKKM4WgjEipcDt E/v0YYCbCgWZu0Z0aMY7DgQ445lSlzHdHHsjco8slI57+t7X4M/9+WCqT5yqgVNXrTaX CHhw== 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=ADl+tJKDMR2begbrrA6j9nZiECrMHsdLH4cmpVlI80c=; fh=8iy+GLBXZdpcs/hIddJ7mbUapYjefwP9Gb111pAzFms=; b=bU9fewA+lAVIl6sPuhCuGiW81DxRtqx2uUJTJZSKNBpSuHQEfor9tB/Czqpb1hHeT3 HPRwhDMAlIdRuNBgGIZQADoqg+ZSh5e/K/L5Pp7i6QhrYbttUdh0wd3uAFdCwod3xnD9 7FMz6RQnKbM/73RyfwCWn8jJNw7eD1eCcWnDT9BzCa5m7mh6bk/I/iWQs7Yxl+4fYxuJ qVS8C2XRsfWyqjCbmcJRx3vSxP8JZdoAWwUs5rpCGvCyoU8DuGzpb1mp9jmSmqxWGYN8 WSBrTH1ue8fecXrmw4G1ZySk0ZvrU2MLVf/u/rdxc6m2kuZyaYC8Jj1VUpVLyUS3XTsO ViFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=VpueM5HD; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id m16-20020a63fd50000000b005ab2613a571si652192pgj.495.2023.10.17.14.26.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 14:26:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=VpueM5HD; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (Postfix) with ESMTP id 7E3F180C7134; Tue, 17 Oct 2023 14:26:08 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235074AbjJQVYt (ORCPT + 99 others); Tue, 17 Oct 2023 17:24:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33684 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235099AbjJQVYR (ORCPT ); Tue, 17 Oct 2023 17:24:17 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 16600109 for ; Tue, 17 Oct 2023 14:23:49 -0700 (PDT) Message-ID: <20231017211722.906846627@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1697577827; 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=ADl+tJKDMR2begbrrA6j9nZiECrMHsdLH4cmpVlI80c=; b=VpueM5HDqoiK3sCXhwPD6b0fiPdVfrHugBHN7qhHb+lqxjjg5iZs3MZdP3nfVpTS5CBGJ2 Qoz2G5mg3fPS+1gHSp4DPUB9IvawsSK3MZy+/qdk4Gv9CoUQQEkY0DpU1a+qcntGJWn5Qm CovYxLc1w1z1MY36YxkcTYYzmKugmE4UKH27sstOUzPv+NuaGhY49A3pM/bl0qUgFY/kVR VBtdd3RMvJRJCSfXCDFLpHc/yw9aFnif8orGuPmwXNvQhQRMPOljT1VPgZJINTA1n60jDJ WXX1cNio81VqipAwJNxbJl8RYgu5YzMD9DMq/kDonk3KpBmEaMTdMrHDSEhKzg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1697577827; 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=ADl+tJKDMR2begbrrA6j9nZiECrMHsdLH4cmpVlI80c=; b=JfbmqsMHChDAPl3sxuOtQzJeb4BqdGbG7mBqTOHEFsSw4Bs9IsIvs0ifCVFpfMtotA6Jim IPTzli7NFvmsRDAg== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Borislav Petkov Subject: [patch V5 17/39] x86/microcode/intel: Reuse intel_cpu_collect_info() References: <20231017200758.877560658@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Date: Tue, 17 Oct 2023 23:23:46 +0200 (CEST) X-Spam-Status: No, score=-0.8 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 howler.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 (howler.vger.email [0.0.0.0]); Tue, 17 Oct 2023 14:26:09 -0700 (PDT) From: Thomas Gleixner No point for an almost duplicate function. Signed-off-by: Thomas Gleixner --- arch/x86/kernel/cpu/microcode/intel.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) --- --- a/arch/x86/kernel/cpu/microcode/intel.c +++ b/arch/x86/kernel/cpu/microcode/intel.c @@ -419,21 +419,7 @@ void reload_ucode_intel(void) static int collect_cpu_info(int cpu_num, struct cpu_signature *csig) { - struct cpuinfo_x86 *c = &cpu_data(cpu_num); - unsigned int val[2]; - - memset(csig, 0, sizeof(*csig)); - - csig->sig = cpuid_eax(0x00000001); - - if ((c->x86_model >= 5) || (c->x86 > 6)) { - /* get processor flags from MSR 0x17 */ - rdmsr(MSR_IA32_PLATFORM_ID, val[0], val[1]); - csig->pf = 1 << ((val[1] >> 18) & 7); - } - - csig->rev = c->microcode; - + intel_collect_cpu_info(csig); return 0; }