From patchwork Wed Nov 29 11:22:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 171269 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a5a7:0:b0:403:3b70:6f57 with SMTP id d7csp267719vqn; Wed, 29 Nov 2023 03:22:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IEx2bakNRl9jvYrEUC2SrM3K7KyPEADaBWhq5YN/xlJEa5g4udpvKWu9r8SHo+5n1zokoV/ X-Received: by 2002:a05:6a20:840d:b0:18d:1e16:8017 with SMTP id c13-20020a056a20840d00b0018d1e168017mr536299pzd.8.1701256975970; Wed, 29 Nov 2023 03:22:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701256975; cv=none; d=google.com; s=arc-20160816; b=WtetNzwirS//HlP/ZzhXwgzUwz/eTrp7hjjeivU3OPlivPJ7qyrsHkGAZPpHh6fH4e lLFm7GkqZluPI+/QDXAxlyjuRYM6IRx+7IIkWuqL0oLUo0ick8IERcfJ3VoTRVpQFEdk 9Ql+evLBCKrVI4FfBzC9EB5PkZGJqYH5ch97kZlSzBJS0ww2WWhpJD+TW018zrXKP0dS gOa3TQjOBeb5Sl+o14vJzEJk1iitu99YB3/V4c0cdX4JY3Vh1PdxTUJKElM6V/AorJwy 9kLSNmGzsZu3eh+n5trldmUVc3LijviKr21TOK4q8NnYIVHpF4moPJfQnzXqF6ZBN0s5 uDww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=ltF6Izhg7GomhCmi/G40+Jhpg0cJILQoZKUjj7bMbO4=; fh=UD1ZRCSS/l4PYbuMk1gSsIJwAKOC33PKfkYvw4GUlo4=; b=d3+vldN9Ye/Ia2n821QmxIoCzWPvVblrSrD0WTTDiVTDytf+2Pxu68uDLiqZO4sOW6 pJVSwW9pY8WVEM58ZND0H1Ilb575zgawVMUIjZ7JtyQvJYaz4YciheqLGeRfInoZZvmr 88PfXCFcjgqVDUJOPmjaOnRvwKO1jL7np4vXUv+A0P8DT2n99ITRCikdcGlcualTFXXI 21iarTMtWKN5dRmW6OHDB0Inut6rN422zS4bq2T1VQ4hITdmtS/4i2Oeo6jQId6C2Z/G RiJ1UbPs/BLpp5t/JVV+OhmcjF9BQMuHfAT8nFxPIsefx+GnRvWIMsEjv5KMglPDC21O 8s+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=nNSQnhaK; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b="PHm3w/b4"; 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 k10-20020a634b4a000000b005c1ce5625cbsi13956077pgl.232.2023.11.29.03.22.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Nov 2023 03:22:55 -0800 (PST) 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=nNSQnhaK; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b="PHm3w/b4"; 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 647D280BBE8D; Wed, 29 Nov 2023 03:22:51 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232582AbjK2LWb (ORCPT + 99 others); Wed, 29 Nov 2023 06:22:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231682AbjK2LWX (ORCPT ); Wed, 29 Nov 2023 06:22:23 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD57E10C2; Wed, 29 Nov 2023 03:22:29 -0800 (PST) Date: Wed, 29 Nov 2023 11:22:27 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1701256947; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ltF6Izhg7GomhCmi/G40+Jhpg0cJILQoZKUjj7bMbO4=; b=nNSQnhaKz3OKB/OEol4ntx5kTJDRpIU7i6Pr9EISzkfjf69kSgol7r8p0l+j9tAgXBFet2 Cf4lVt1n/dn4nGGA+CBfEjjZqlxAzh5+lOG5GHsF7wevL4Qg8UKmsWPZwJUe/Qwzs2pQ9N 07/g0flb85A/mg5O9lDgCoTf0Lo4GO5+IaTt5vk8lSrNdR7uF+9vSpJLHh9s3/pCwps7qY ibCopbt+8aMjA0s8oljEa84KTexqxzuwLvTC0x2JMEAwNf03g0Ae1jKgQLgkij9MEhBczW Ct5mEAjeXjAy1TD2liFqe+iEFFlz0sdR+cGhdVQN4SlJGuMt1FOKNEvMdMK06w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1701256947; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ltF6Izhg7GomhCmi/G40+Jhpg0cJILQoZKUjj7bMbO4=; b=PHm3w/b4cS0jBNjZO7gYUqp6zSyvq5ECWsK7/+JJa7Wow15Av77AFP+IiXoNMXlp+SSSVP D1mQON7NbDk0MwDQ== From: "tip-bot2 for Borislav Petkov (AMD)" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/cpu] x86/CPU/AMD: Get rid of amd_erratum_383[] Cc: "Borislav Petkov (AMD)" , Nikolay Borisov , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20231120104152.13740-11-bp@alien8.de> References: <20231120104152.13740-11-bp@alien8.de> MIME-Version: 1.0 Message-ID: <170125694727.398.1026941985465358298.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails 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,T_SCC_BODY_TEXT_LINE 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]); Wed, 29 Nov 2023 03:22:52 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783079427811164544 X-GMAIL-MSGID: 1783897234857136823 The following commit has been merged into the x86/cpu branch of tip: Commit-ID: 1709528f73d475d3c9ec514bc0dee0b41cadd871 Gitweb: https://git.kernel.org/tip/1709528f73d475d3c9ec514bc0dee0b41cadd871 Author: Borislav Petkov (AMD) AuthorDate: Fri, 03 Nov 2023 19:58:53 +01:00 Committer: Borislav Petkov (AMD) CommitterDate: Wed, 29 Nov 2023 12:13:08 +01:00 x86/CPU/AMD: Get rid of amd_erratum_383[] Set it in init_amd_gh() unconditionally as that is the F10h init function. No functional changes. Signed-off-by: Borislav Petkov (AMD) Reviewed-by: Nikolay Borisov Link: http://lore.kernel.org/r/20231120104152.13740-11-bp@alien8.de --- arch/x86/kernel/cpu/amd.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 219ae7e..7ab7f98 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -63,9 +63,6 @@ static const int amd_erratum_400[] = AMD_OSVW_ERRATUM(1, AMD_MODEL_RANGE(0xf, 0x41, 0x2, 0xff, 0xf), AMD_MODEL_RANGE(0x10, 0x2, 0x1, 0xff, 0xf)); -static const int amd_erratum_383[] = - AMD_OSVW_ERRATUM(3, AMD_MODEL_RANGE(0x10, 0, 0, 0xff, 0xf)); - static const int amd_erratum_1485[] = AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x19, 0x10, 0x0, 0x1f, 0xf), AMD_MODEL_RANGE(0x19, 0x60, 0x0, 0xaf, 0xf)); @@ -876,8 +873,7 @@ static void init_amd_gh(struct cpuinfo_x86 *c) */ msr_clear_bit(MSR_AMD64_BU_CFG2, 24); - if (cpu_has_amd_erratum(c, amd_erratum_383)) - set_cpu_bug(c, X86_BUG_AMD_TLB_MMATCH); + set_cpu_bug(c, X86_BUG_AMD_TLB_MMATCH); } static void init_amd_ln(struct cpuinfo_x86 *c)