From patchwork Mon Nov 20 10:41:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 167039 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp2109906vqn; Mon, 20 Nov 2023 02:43:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IH+GfTD3ksXvBqVYva4sGbd4FNwwjkMAej/g7vrbOoyS9X8MUTtzSgB6LgNVYm8p6le0Zn1 X-Received: by 2002:a05:6a21:61c:b0:186:bd68:facc with SMTP id ll28-20020a056a21061c00b00186bd68faccmr4112809pzb.28.1700477039410; Mon, 20 Nov 2023 02:43:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700477039; cv=none; d=google.com; s=arc-20160816; b=Tt5GkKigyrrs8SBsi9679vJc/yqeboNK6Nd8AJ4HcqimixXVeWpEa3sddnFp50bxad o8tcYkk90ErdrREipgVkZt4Hk08Ne5+ACcsxpRtAMtU69E4IrV2kcF40H7DH3yiS0cOD XAIYmBuOnozxyaGvkh6AVq3DCcK6TtverG6qdk0lG8RG4G6R2/YKoZzn74hfKVN6aVl/ WZk+l1LQCaByaHsLcqRqN3O8EZSj5ltPWzmhas9QfVoptnqhILR3Vr1uN2US1qd0HmcI v7Stsy+1mQ5kcELdI2X36vGLwMRZU+zVg+gsEZDPJDC+a3VLC4P0Fr2R4YPpp32vQnjj WtAA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=PA71RerdbJUJbqGvGRfLJbNb71FHnpkYHCts9qIgUXU=; fh=yRofEPOsMYSFYi/7/f3tXB782BWAy0107oR1j5aafGk=; b=0GAz7oDO4Ul5Lj1K6EV2OqxRLLREDSBTw3WvEL2A3w8zqGBPUuGrYA6eVBowY85Hhi pEjefKhv40GfI3btRml81anIkgtP2rlDmLjN0g6UXuvtojraavkqRtp80aDqa40zIPvg di6mCLCkkJ0v9YVsPS3bGi7B5i5jDT03v9jcVSSRNnqyH5rlk0Ln3WM+hZfd3Vi5YaRu UamrbO4KhO0WizlrY4NtiFyGXhobLiOLBZeSNTUNW/YM+rsKggNkPJfKkFTitbjzt+Be 11/tTR7DIkF9FxHmyz7qK88qm3UhX0RTFq9xYJlSLWWcyRrW4SoZeyIStkuIotPZ7cm6 cSiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@alien8.de header.s=alien8 header.b=bH0Xce1A; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alien8.de Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id g17-20020a63fa51000000b005b902b61cbbsi7755445pgk.125.2023.11.20.02.43.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 02:43:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@alien8.de header.s=alien8 header.b=bH0Xce1A; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alien8.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id C64808046BF1; Mon, 20 Nov 2023 02:43:56 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232924AbjKTKnp (ORCPT + 27 others); Mon, 20 Nov 2023 05:43:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232773AbjKTKnI (ORCPT ); Mon, 20 Nov 2023 05:43:08 -0500 Received: from mail.alien8.de (mail.alien8.de [65.109.113.108]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F3650171B for ; Mon, 20 Nov 2023 02:42:44 -0800 (PST) Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.alien8.de (SuperMail on ZX Spectrum 128k) with ESMTP id CC9C140E01C0; Mon, 20 Nov 2023 10:42:42 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at mail.alien8.de Authentication-Results: mail.alien8.de (amavisd-new); dkim=fail (4096-bit key) reason="fail (body has been altered)" header.d=alien8.de Received: from mail.alien8.de ([127.0.0.1]) by localhost (mail.alien8.de [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 0ZD5UI-0_Or2; Mon, 20 Nov 2023 10:42:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alien8.de; s=alien8; t=1700476955; bh=zlnuWah+IyiMw2epMX+2lNNaMtlKVBskdmzvqDoHxY4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bH0Xce1ArzTXJW1shOuFJBd/VnbluNCajFllQTaNX+GWIQc4RMqXvXtmZBvKWKjG5 1QNd//zwd0rHMY6YRJftMN7mjVyFCchcJ2nBUl41kfMi3gCzFYmHT6qH0v20mDKDUx p23kWb2qqSHjURVakzL3PTo0XBFHacE2pi000xPmQYdWKVC0GdzuJW9wSdSgWw4Vea Xtyrr4nQfBxkcCw5f0xjOGBTTuvaauvxYySY9kxZ0MN29jZ1i4Tyak+UyTrhKDrV24 x/YOjLu7TbxBuqeRtEaGq+twVXZrZt3Oi27hBXt58x3TTIWoPl0rBcjFSHlAUBUc82 Zr0ll/77YOtM2SeW8uRrygyiBImK2CyK+Rczi2vEdWRmy3UyaElSUp0VCTsvT3vPBD eff4ZG/UyEM29wyFKRjU1Ky6Bf/XJlRfZ8WC+G21ayl77MJLnof50znZBxgXyeGAGP KP69HVqTCG7IvmoFt96Yy9oOeE5VCW/1L9zVuAvm6jVf2FsYZe+e11UIa/aUKMTOeS QFxEdoyfRgJ7n0GNOtiFiZLlcphCwZz8cIzT0/Wgzi2ZD6hDdI7MluAH1Xy0P8dVgI pANL0V7H59zs5er8VQPQEakid70KTZsO71WVeU6iINt32rdMrK4l8QfZd+E9zVF9FH aafZpkFXZWn/dQByN5jBu2uw= Received: from zn.tnic (pd95304da.dip0.t-ipconnect.de [217.83.4.218]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature ECDSA (P-256) server-digest SHA256) (No client certificate requested) by mail.alien8.de (SuperMail on ZX Spectrum 128k) with ESMTPSA id 2C4DA40E0176; Mon, 20 Nov 2023 10:42:33 +0000 (UTC) From: Borislav Petkov To: X86 ML Cc: LKML Subject: [PATCH 09/13] x86/CPU/AMD: Get rid of amd_erratum_1054[] Date: Mon, 20 Nov 2023 11:41:48 +0100 Message-ID: <20231120104152.13740-10-bp@alien8.de> X-Mailer: git-send-email 2.42.0.rc0.25.ga82fb66fed25 In-Reply-To: <20231120104152.13740-1-bp@alien8.de> References: <20231120104152.13740-1-bp@alien8.de> MIME-Version: 1.0 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.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 (lipwig.vger.email [0.0.0.0]); Mon, 20 Nov 2023 02:43:56 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783079411818781060 X-GMAIL-MSGID: 1783079411818781060 From: "Borislav Petkov (AMD)" No functional changes. Signed-off-by: Borislav Petkov (AMD) --- 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 43d6a6da7591..62aa99b5d6c8 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -66,10 +66,6 @@ static const int amd_erratum_400[] = static const int amd_erratum_383[] = AMD_OSVW_ERRATUM(3, AMD_MODEL_RANGE(0x10, 0, 0, 0xff, 0xf)); -/* #1054: Instructions Retired Performance Counter May Be Inaccurate */ -static const int amd_erratum_1054[] = - AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x17, 0, 0, 0x2f, 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)); @@ -1201,7 +1197,7 @@ static void init_amd(struct cpuinfo_x86 *c) * Counter May Be Inaccurate". */ if (cpu_has(c, X86_FEATURE_IRPERF) && - !cpu_has_amd_erratum(c, amd_erratum_1054)) + (boot_cpu_has(X86_FEATURE_ZEN) && c->x86_model > 0x2f)) msr_set_bit(MSR_K7_HWCR, MSR_K7_HWCR_IRPERF_EN_BIT); check_null_seg_clears_base(c);