From patchwork Mon Feb 27 16:03:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 61991 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2515487wrd; Mon, 27 Feb 2023 08:28:14 -0800 (PST) X-Google-Smtp-Source: AK7set+FpXrIqSBNcDzxB90eYIBswec6WnMWoQUegNfX1uuxxELC1Th5xw3cZYbCoOPhI4ztSleu X-Received: by 2002:a17:906:f289:b0:881:f2f:6633 with SMTP id gu9-20020a170906f28900b008810f2f6633mr32197323ejb.50.1677515294363; Mon, 27 Feb 2023 08:28:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677515294; cv=none; d=google.com; s=arc-20160816; b=RMX/Mnzt44G4kGRovTV9x8/lY/kaXSznoV4rMErKOjaiucoHp1gB1olai/dRdeayEX DQ217BTlsnJWcnIILVFdaT3LnCDEWFZG5wKSYo+YIuNfVAnb2qgagZXPPwi44HIlNsBP 5BX+10kH5scK5GNhAdL/cHEFuwLc4rv9VomJxvScCXgBA2M7XT4vyWWOM7cFZZuWFJNV x5V/mBXKj8qBx3hKsPvLAou+YWGRQhepWaZbKd/p6iUPY3C0IYk4HViV6NJpf8ip3Ahh DCkbyMtsXQqB7oapa+EarjgFVisehf/j9ni0ZzKxBRZMSgcHvCgEMas32DJ8F1E6/Dmn 3q5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=xb92flm1mV65M/epWOlUCTlYcJPYupP7yUsQn3lXFys=; b=r0eUWw8m6g6t3SlTNyfuNqjdecG7DQYha5SOapdyLHVIwlffnC26MSDhNdpvtbUISr D7MzpOusufbu3LUG67E7AZOKD4ErxuF6pgGoe/BY/hBFAimjBnpMiJysBYE384wUb80h 53F+CJfou7GxiffdFMUheSHA3kvKNEt3k4or3T2svGogCNYk45UJGzdNPtAsAADfRk+2 UX4hd05AIiqCgKV1hi2R1GidehAlW1fOvp3U8Whutfwiut1m7q2euRqFvUGEy1mP4oW7 guLsHzUuY2mwyrQBKupL0NGe++deNkkmZNI65YjOJLN+xG9EIiyF/rKF2dFH+400bMiR VSBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@alien8.de header.s=dkim header.b=FmFpvGOx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=alien8.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w8-20020a17090633c800b008eb27de1fa6si8634801eja.8.2023.02.27.08.27.51; Mon, 27 Feb 2023 08:28:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@alien8.de header.s=dkim header.b=FmFpvGOx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=alien8.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229990AbjB0QED (ORCPT + 99 others); Mon, 27 Feb 2023 11:04:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230001AbjB0QEB (ORCPT ); Mon, 27 Feb 2023 11:04:01 -0500 Received: from mail.skyhub.de (mail.skyhub.de [5.9.137.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC5B6211DB for ; Mon, 27 Feb 2023 08:03:59 -0800 (PST) Received: from zn.tnic (p5de8e9fe.dip0.t-ipconnect.de [93.232.233.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.skyhub.de (SuperMail on ZX Spectrum 128k) with ESMTPSA id 585B81EC0445; Mon, 27 Feb 2023 17:03:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alien8.de; s=dkim; t=1677513838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references; bh=xb92flm1mV65M/epWOlUCTlYcJPYupP7yUsQn3lXFys=; b=FmFpvGOxijWN46kpo9qSF+Mg1YcnP02RT6us2kwo8duEAC34WP/qGV3A3t+svFtKqwTIhX iAzcpHv7bxvdspc8w2b+MmfHVcxBebpsPeAzkBmku2P3KirGDS1tvJEsyI9ZuTlYmX3PZ+ iq3f4PHdoxRVF95CYfMOMpNl2AAqiv4= From: Borislav Petkov To: X86 ML Cc: LKML Subject: [PATCH] x86/microcode/AMD: Get rid of __find_equiv_id() Date: Mon, 27 Feb 2023 17:03:52 +0100 Message-Id: <20230227160352.7260-1-bp@alien8.de> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759002277196459653?= X-GMAIL-MSGID: =?utf-8?q?1759002277196459653?= From: "Borislav Petkov (AMD)" Merge it into its only call site. No functional changes. Signed-off-by: Borislav Petkov (AMD) --- arch/x86/kernel/cpu/microcode/amd.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c index 9eb457b10341..394a9e16d5ee 100644 --- a/arch/x86/kernel/cpu/microcode/amd.c +++ b/arch/x86/kernel/cpu/microcode/amd.c @@ -596,11 +596,6 @@ void reload_ucode_amd(unsigned int cpu) } } } -static u16 __find_equiv_id(unsigned int cpu) -{ - struct ucode_cpu_info *uci = ucode_cpu_info + cpu; - return find_equiv_id(&equiv_table, uci->cpu_sig.sig); -} /* * a small, trivial cache of per-family ucode patches @@ -651,9 +646,11 @@ static void free_cache(void) static struct ucode_patch *find_patch(unsigned int cpu) { + struct ucode_cpu_info *uci = ucode_cpu_info + cpu; u16 equiv_id; - equiv_id = __find_equiv_id(cpu); + + equiv_id = find_equiv_id(&equiv_table, uci->cpu_sig.sig); if (!equiv_id) return NULL;