From: Borislav Petkov <bp@alien8.de>
To: X86 ML <x86@kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 09/13] x86/CPU/AMD: Get rid of amd_erratum_1054[]
Date: Mon, 20 Nov 2023 11:41:48 +0100 [thread overview]
Message-ID: <20231120104152.13740-10-bp@alien8.de> (raw)
In-Reply-To: <20231120104152.13740-1-bp@alien8.de>
From: "Borislav Petkov (AMD)" <bp@alien8.de>
No functional changes.
Signed-off-by: Borislav Petkov (AMD) <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 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);
--
2.42.0.rc0.25.ga82fb66fed25
next prev parent reply other threads:[~2023-11-20 10:43 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-20 10:41 [PATCH 00/13] x86/CPU/AMD: Rework Zen family detection and other fun Borislav Petkov
2023-11-20 10:41 ` [PATCH 01/13] x86/CPU/AMD: Add ZenX generations flags Borislav Petkov
2023-11-29 11:22 ` [tip: x86/cpu] " tip-bot2 for Borislav Petkov (AMD)
2023-11-30 17:05 ` [PATCH 01/13] " Tom Lendacky
2023-11-30 17:13 ` Borislav Petkov
2023-11-30 17:30 ` Brian Gerst
2023-11-30 18:17 ` Tom Lendacky
2023-11-30 18:50 ` Borislav Petkov
2023-12-02 12:49 ` [PATCH] x86/CPU/AMD: Add X86_FEATURE_ZEN1 Borislav Petkov
2023-12-04 14:36 ` Tom Lendacky
2023-12-04 15:32 ` Borislav Petkov
2023-12-12 10:33 ` [tip: x86/cpu] " tip-bot2 for Borislav Petkov (AMD)
2023-11-20 10:41 ` [PATCH 02/13] x86/CPU/AMD: Carve out the erratum 1386 fix Borislav Petkov
2023-11-29 11:22 ` [tip: x86/cpu] " tip-bot2 for Borislav Petkov (AMD)
2023-11-20 10:41 ` [PATCH 03/13] x86/CPU/AMD: Move the Zen3 BTC_NO detection to the Zen3 init function Borislav Petkov
2023-11-29 11:22 ` [tip: x86/cpu] " tip-bot2 for Borislav Petkov (AMD)
2023-11-20 10:41 ` [PATCH 04/13] x86/CPU/AMD: Move erratum 1076 fix into the Zen1 " Borislav Petkov
2023-11-29 11:22 ` [tip: x86/cpu] " tip-bot2 for Borislav Petkov (AMD)
2023-11-20 10:41 ` [PATCH 05/13] x86/CPU/AMD: Call the spectral chicken in the Zen2 " Borislav Petkov
2023-11-29 11:22 ` [tip: x86/cpu] " tip-bot2 for Borislav Petkov (AMD)
2023-11-20 10:41 ` [PATCH 06/13] x86/CPU/AMD: Rename init_amd_zn() to init_amd_zen_common() Borislav Petkov
2023-11-29 11:22 ` [tip: x86/cpu] " tip-bot2 for Borislav Petkov (AMD)
2023-11-20 10:41 ` [PATCH 07/13] x86/CPU/AMD: Move Zenbleed check to the Zen2 init function Borislav Petkov
2023-11-20 12:53 ` Nikolay Borisov
2023-11-21 10:41 ` Borislav Petkov
2023-11-29 11:22 ` [tip: x86/cpu] " tip-bot2 for Borislav Petkov (AMD)
2023-11-20 10:41 ` [PATCH 08/13] x86/CPU/AMD: Move the DIV0 bug detection to the Zen1 " Borislav Petkov
2023-11-29 11:22 ` [tip: x86/cpu] " tip-bot2 for Borislav Petkov (AMD)
2023-11-20 10:41 ` Borislav Petkov [this message]
2023-11-29 11:22 ` [tip: x86/cpu] x86/CPU/AMD: Get rid of amd_erratum_1054[] tip-bot2 for Borislav Petkov (AMD)
2023-11-20 10:41 ` [PATCH 10/13] x86/CPU/AMD: Get rid of amd_erratum_383[] Borislav Petkov
2023-11-29 11:22 ` [tip: x86/cpu] " tip-bot2 for Borislav Petkov (AMD)
2023-11-20 10:41 ` [PATCH 11/13] x86/CPU/AMD: Get rid of amd_erratum_400[] Borislav Petkov
2023-11-29 11:22 ` [tip: x86/cpu] " tip-bot2 for Borislav Petkov (AMD)
2023-11-20 10:41 ` [PATCH 12/13] x86/CPU/AMD: Get rid of amd_erratum_1485[] Borislav Petkov
2023-11-29 11:22 ` [tip: x86/cpu] " tip-bot2 for Borislav Petkov (AMD)
2023-11-20 10:41 ` [PATCH 13/13] x86/CPU/AMD: Drop now unused CPU erratum checking function Borislav Petkov
2023-11-29 11:22 ` [tip: x86/cpu] " tip-bot2 for Borislav Petkov (AMD)
2023-11-20 15:08 ` [PATCH 00/13] x86/CPU/AMD: Rework Zen family detection and other fun Nikolay Borisov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231120104152.13740-10-bp@alien8.de \
--to=bp@alien8.de \
--cc=linux-kernel@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox