From: "tip-bot2 for Qiuxu Zhuo" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Sohil Mehta <sohil.mehta@intel.com>,
Dave Hansen <dave.hansen@intel.com>,
Qiuxu Zhuo <qiuxu.zhuo@intel.com>,
"Borislav Petkov (AMD)" <bp@alien8.de>,
Tony Luck <tony.luck@intel.com>,
Yazen Ghannam <yazen.ghannam@amd.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: ras/core] x86/mce: Convert family/model mixed checks to VFM-based checks
Date: Wed, 01 Jan 2025 11:44:07 -0000 [thread overview]
Message-ID: <173573184786.399.17877739928527396215.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20241212140103.66964-6-qiuxu.zhuo@intel.com>
The following commit has been merged into the ras/core branch of tip:
Commit-ID: 359d7a98e3e3f88dbf45411427b284bb3bbbaea5
Gitweb: https://git.kernel.org/tip/359d7a98e3e3f88dbf45411427b284bb3bbbaea5
Author: Qiuxu Zhuo <qiuxu.zhuo@intel.com>
AuthorDate: Thu, 12 Dec 2024 22:01:01 +08:00
Committer: Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Tue, 31 Dec 2024 11:11:08 +01:00
x86/mce: Convert family/model mixed checks to VFM-based checks
Convert family/model mixed checks to VFM-based checks to make the code
more compact. Simplify.
[ bp: Drop the "what" from the commit message - it should be visible from
the diff alone. ]
Suggested-by: Sohil Mehta <sohil.mehta@intel.com>
Suggested-by: Dave Hansen <dave.hansen@intel.com>
Signed-off-by: Qiuxu Zhuo <qiuxu.zhuo@intel.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: Tony Luck <tony.luck@intel.com>
Reviewed-by: Sohil Mehta <sohil.mehta@intel.com>
Reviewed-by: Yazen Ghannam <yazen.ghannam@amd.com>
Link: https://lore.kernel.org/r/20241212140103.66964-6-qiuxu.zhuo@intel.com
---
arch/x86/kernel/cpu/mce/core.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
index 3855ec2..f90cbcb 100644
--- a/arch/x86/kernel/cpu/mce/core.c
+++ b/arch/x86/kernel/cpu/mce/core.c
@@ -1936,7 +1936,7 @@ static void apply_quirks_amd(struct cpuinfo_x86 *c)
* Various K7s with broken bank 0 around. Always disable
* by default.
*/
- if (c->x86 == 6 && this_cpu_read(mce_num_banks) > 0)
+ if (c->x86 == 6 && this_cpu_read(mce_num_banks))
mce_banks[0].ctl = 0;
/*
@@ -1954,6 +1954,10 @@ static void apply_quirks_intel(struct cpuinfo_x86 *c)
{
struct mce_bank *mce_banks = this_cpu_ptr(mce_banks_array);
+ /* Older CPUs (prior to family 6) don't need quirks. */
+ if (c->x86_vfm < INTEL_PENTIUM_PRO)
+ return;
+
/*
* SDM documents that on family 6 bank 0 should not be written
* because it aliases to another special BIOS controlled
@@ -1962,22 +1966,21 @@ static void apply_quirks_intel(struct cpuinfo_x86 *c)
* Don't ignore bank 0 completely because there could be a
* valid event later, merely don't write CTL0.
*/
- if (c->x86 == 6 && c->x86_model < 0x1A && this_cpu_read(mce_num_banks) > 0)
+ if (c->x86_vfm < INTEL_NEHALEM_EP && this_cpu_read(mce_num_banks))
mce_banks[0].init = false;
/*
* All newer Intel systems support MCE broadcasting. Enable
* synchronization with a one second timeout.
*/
- if ((c->x86 > 6 || (c->x86 == 6 && c->x86_model >= 0xe)) &&
- mca_cfg.monarch_timeout < 0)
+ if (c->x86_vfm >= INTEL_CORE_YONAH && mca_cfg.monarch_timeout < 0)
mca_cfg.monarch_timeout = USEC_PER_SEC;
/*
* There are also broken BIOSes on some Pentium M and
* earlier systems:
*/
- if (c->x86 == 6 && c->x86_model <= 13 && mca_cfg.bootlog < 0)
+ if (c->x86_vfm < INTEL_CORE_YONAH && mca_cfg.bootlog < 0)
mca_cfg.bootlog = 0;
if (c->x86_vfm == INTEL_SANDYBRIDGE_X)
next prev parent reply other threads:[~2025-01-01 11:44 UTC|newest]
Thread overview: 142+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-10 15:31 [PATCH 00/10] Clean up some x86/mce code Qiuxu Zhuo
2024-10-10 15:31 ` [PATCH 01/10] x86/mce/dev-mcelog: Use xchg() to get and clear the flags Qiuxu Zhuo
2024-10-10 15:31 ` [PATCH 02/10] x86/mce/intel: Use MCG_BANKCNT_MASK instead of 0xff Qiuxu Zhuo
2024-10-10 15:31 ` [PATCH 03/10] x86/mce: Make several functions return bool Qiuxu Zhuo
2024-10-10 15:31 ` [PATCH 04/10] x86/mce/threshold: Remove the redundant this_cpu_dec_return() Qiuxu Zhuo
2024-10-10 15:31 ` [PATCH 05/10] x86/mce/genpool: Make mce_gen_pool_create() return explicit error codes Qiuxu Zhuo
2024-11-02 14:31 ` Thomas Gleixner
2024-11-03 0:42 ` Zhuo, Qiuxu
2024-10-10 15:31 ` [PATCH 06/10] x86/mce: Convert multiple if () statements into a switch() statement Qiuxu Zhuo
2024-10-10 15:31 ` [PATCH 07/10] x86/mce: Remove the unnecessary {} Qiuxu Zhuo
2024-10-10 15:32 ` [PATCH 08/10] x86/mce: Remove the redundant zeroing assignments Qiuxu Zhuo
2024-10-10 15:32 ` [PATCH 09/10] x86/mce/amd: Remove unnecessary NULL pointer initializations Qiuxu Zhuo
2024-10-11 20:55 ` Luck, Tony
2024-10-10 15:32 ` [PATCH 10/10] x86/mce: Fix typos in comments Qiuxu Zhuo
2024-10-11 20:57 ` [PATCH 00/10] Clean up some x86/mce code Luck, Tony
2024-10-16 12:30 ` [PATCH v2 00/10] x86/mce: " Qiuxu Zhuo
2024-10-16 12:30 ` [PATCH v2 01/10] x86/mce/dev-mcelog: Use xchg() to get and clear the flags Qiuxu Zhuo
2024-10-16 12:30 ` [PATCH v2 02/10] x86/mce/intel: Use MCG_BANKCNT_MASK instead of 0xff Qiuxu Zhuo
2024-10-16 12:30 ` [PATCH v2 03/10] x86/mce: Make several functions return bool Qiuxu Zhuo
2024-10-18 19:02 ` Sohil Mehta
2024-10-19 3:00 ` Zhuo, Qiuxu
2024-10-16 12:30 ` [PATCH v2 04/10] x86/mce/threshold: Remove the redundant this_cpu_dec_return() Qiuxu Zhuo
2024-10-16 12:30 ` [PATCH v2 05/10] x86/mce/genpool: Make mce_gen_pool_create() return explicit error codes Qiuxu Zhuo
2024-10-18 19:20 ` Sohil Mehta
2024-10-19 3:29 ` Zhuo, Qiuxu
2024-10-16 12:30 ` [PATCH v2 06/10] x86/mce: Convert multiple if () statements into a switch() statement Qiuxu Zhuo
2024-10-18 19:44 ` Sohil Mehta
2024-10-18 20:14 ` Tony Luck
2024-10-19 0:04 ` Sohil Mehta
2024-10-19 5:46 ` Zhuo, Qiuxu
2024-10-21 16:06 ` Luck, Tony
2024-10-21 16:31 ` Dave Hansen
2024-10-23 8:20 ` Zhuo, Qiuxu
2024-10-24 13:05 ` Zhuo, Qiuxu
2024-10-24 16:42 ` Luck, Tony
2024-10-24 21:31 ` Sohil Mehta
2024-10-24 21:41 ` Luck, Tony
2024-10-24 22:18 ` Dave Hansen
2024-10-21 17:38 ` Sohil Mehta
2024-10-21 17:51 ` Luck, Tony
2024-10-21 18:26 ` Sohil Mehta
2024-10-21 18:40 ` Luck, Tony
2024-10-21 22:57 ` Sohil Mehta
2024-10-21 23:31 ` Luck, Tony
2024-10-22 0:07 ` Sohil Mehta
2024-10-22 0:17 ` Dave Hansen
2024-10-22 18:12 ` Sohil Mehta
2024-10-23 2:08 ` Zhuo, Qiuxu
2024-10-23 6:48 ` Sohil Mehta
2024-10-23 7:57 ` Zhuo, Qiuxu
2024-10-23 6:47 ` Sohil Mehta
2024-10-23 7:43 ` Zhuo, Qiuxu
2024-10-19 4:39 ` Zhuo, Qiuxu
2024-10-16 12:30 ` [PATCH v2 07/10] x86/mce: Remove the unnecessary {} Qiuxu Zhuo
2024-10-16 12:30 ` [PATCH v2 08/10] x86/mce: Remove the redundant zeroing assignments Qiuxu Zhuo
2024-10-18 20:25 ` Sohil Mehta
2024-10-19 7:37 ` Zhuo, Qiuxu
2024-10-19 7:40 ` H. Peter Anvin
2024-10-19 8:30 ` Zhuo, Qiuxu
2024-10-20 0:25 ` H. Peter Anvin
2024-10-21 6:29 ` Zhuo, Qiuxu
2024-10-16 12:30 ` [PATCH v2 09/10] x86/mce/amd: Remove unnecessary NULL pointer initializations Qiuxu Zhuo
2024-10-18 20:34 ` Sohil Mehta
2024-10-19 7:40 ` Zhuo, Qiuxu
2024-10-16 12:30 ` [PATCH v2 10/10] x86/mce: Fix typos in comments Qiuxu Zhuo
2024-10-18 20:36 ` Sohil Mehta
2024-10-19 8:02 ` Zhuo, Qiuxu
2024-10-17 15:30 ` [PATCH v2 00/10] x86/mce: Clean up some x86/mce code Nikolay Borisov
2024-10-18 20:40 ` Sohil Mehta
2024-10-25 2:45 ` [PATCH v3 " Qiuxu Zhuo
2024-10-25 2:45 ` [PATCH v3 01/10] x86/mce/dev-mcelog: Use xchg() to get and clear the flags Qiuxu Zhuo
2024-10-28 14:03 ` [tip: ras/core] x86/mce/mcelog: " tip-bot2 for Qiuxu Zhuo
2024-10-25 2:45 ` [PATCH v3 02/10] x86/mce/intel: Use MCG_BANKCNT_MASK instead of 0xff Qiuxu Zhuo
2024-10-28 14:03 ` [tip: ras/core] " tip-bot2 for Qiuxu Zhuo
2024-10-25 2:45 ` [PATCH v3 03/10] x86/mce: Make several functions return bool and rename a function Qiuxu Zhuo
2024-10-28 13:06 ` Borislav Petkov
2024-10-29 3:32 ` Zhuo, Qiuxu
2024-10-30 10:24 ` Borislav Petkov
2024-10-31 3:23 ` Zhuo, Qiuxu
2024-10-25 2:45 ` [PATCH v3 04/10] x86/mce/threshold: Remove the redundant this_cpu_dec_return() Qiuxu Zhuo
2024-10-25 2:45 ` [PATCH v3 05/10] x86/mce/genpool: Make mce_gen_pool_create() return explicit error codes Qiuxu Zhuo
2024-11-02 13:13 ` Borislav Petkov
2024-10-25 2:45 ` [PATCH v3 06/10] x86/mce: Break up __mcheck_cpu_apply_quirks() Qiuxu Zhuo
2024-10-29 21:39 ` Yazen Ghannam
2024-10-30 1:39 ` Zhuo, Qiuxu
2024-10-30 14:16 ` Yazen Ghannam
2024-10-31 5:18 ` Zhuo, Qiuxu
2024-10-25 2:45 ` [PATCH v3 07/10] x86/mce: Convert family/model mixed checks to VFM-based checks Qiuxu Zhuo
2024-10-25 2:46 ` [PATCH v3 08/10] x86/mce: Remove the unnecessary {} Qiuxu Zhuo
2024-10-25 2:46 ` [PATCH v3 09/10] x86/mce/amd: Remove unnecessary NULL pointer initializations Qiuxu Zhuo
2024-10-25 2:46 ` [PATCH v3 10/10] x86/mce: Fix typos Qiuxu Zhuo
2024-11-11 6:04 ` [PATCH v4 0/8] x86/mce: Clean up some x86/mce code Qiuxu Zhuo
2024-11-11 6:04 ` [PATCH v4 1/8] x86/mce: Make several functions return bool Qiuxu Zhuo
2024-11-11 6:04 ` [PATCH v4 2/8] x86/mce/threshold: Remove the redundant this_cpu_dec_return() Qiuxu Zhuo
2024-11-11 6:04 ` [PATCH v4 3/8] x86/mce: Make four functions return bool Qiuxu Zhuo
2024-11-12 2:30 ` Sohil Mehta
2024-11-11 6:04 ` [PATCH v4 4/8] x86/mce: Break up __mcheck_cpu_apply_quirks() Qiuxu Zhuo
2024-11-12 2:31 ` Sohil Mehta
2024-11-11 6:04 ` [PATCH v4 5/8] x86/mce: Convert family/model mixed checks to VFM-based checks Qiuxu Zhuo
2024-11-12 2:31 ` Sohil Mehta
2024-11-12 15:27 ` Yazen Ghannam
2024-11-13 12:10 ` Zhuo, Qiuxu
2024-11-13 14:25 ` Yazen Ghannam
2024-11-14 1:11 ` Zhuo, Qiuxu
2024-11-11 6:04 ` [PATCH v4 6/8] x86/mce: Remove the unnecessary {} Qiuxu Zhuo
2024-11-12 15:43 ` Yazen Ghannam
2024-11-13 13:32 ` Zhuo, Qiuxu
2024-11-13 14:26 ` Yazen Ghannam
2024-11-13 16:11 ` Borislav Petkov
2024-11-14 1:23 ` Zhuo, Qiuxu
2024-11-11 6:04 ` [PATCH v4 7/8] x86/mce/amd: Remove unnecessary NULL pointer initializations Qiuxu Zhuo
2024-11-12 15:48 ` Yazen Ghannam
2024-11-11 6:04 ` [PATCH v4 8/8] x86/mce: Fix typos Qiuxu Zhuo
2024-11-12 2:36 ` Sohil Mehta
2024-11-12 15:38 ` Yazen Ghannam
2024-11-12 22:35 ` Sohil Mehta
2024-11-13 14:31 ` Yazen Ghannam
2024-11-14 1:20 ` Zhuo, Qiuxu
2024-11-13 14:48 ` Zhuo, Qiuxu
2024-12-12 14:00 ` [PATCH v5 0/7] Clean up some x86/mce code Qiuxu Zhuo
2024-12-12 14:00 ` [PATCH v5 1/7] x86/mce: Make several functions return bool Qiuxu Zhuo
2024-12-18 15:20 ` Yazen Ghannam
2024-12-19 15:19 ` Zhuo, Qiuxu
2025-01-01 11:44 ` [tip: ras/core] " tip-bot2 for Qiuxu Zhuo
2024-12-12 14:00 ` [PATCH v5 2/7] x86/mce/threshold: Remove the redundant this_cpu_dec_return() Qiuxu Zhuo
2024-12-18 15:36 ` Yazen Ghannam
2025-01-01 11:44 ` [tip: ras/core] " tip-bot2 for Qiuxu Zhuo
2024-12-12 14:00 ` [PATCH v5 3/7] x86/mce: Make four functions return bool Qiuxu Zhuo
2024-12-18 15:48 ` Yazen Ghannam
2025-01-01 11:44 ` [tip: ras/core] " tip-bot2 for Qiuxu Zhuo
2024-12-12 14:01 ` [PATCH v5 4/7] x86/mce: Break up __mcheck_cpu_apply_quirks() Qiuxu Zhuo
2024-12-18 15:54 ` Yazen Ghannam
2025-01-01 11:44 ` [tip: ras/core] " tip-bot2 for Tony Luck
2024-12-12 14:01 ` [PATCH v5 5/7] x86/mce: Convert family/model mixed checks to VFM-based checks Qiuxu Zhuo
2025-01-01 11:44 ` tip-bot2 for Qiuxu Zhuo [this message]
2024-12-12 14:01 ` [PATCH v5 6/7] x86/mce: Remove the redundant mce_hygon_feature_init() Qiuxu Zhuo
2024-12-12 18:08 ` Sohil Mehta
2024-12-18 16:02 ` Yazen Ghannam
2025-01-01 11:44 ` [tip: ras/core] " tip-bot2 for Qiuxu Zhuo
2024-12-12 14:01 ` [PATCH v5 7/7] x86/mce/amd: Remove unnecessary NULL pointer initializations Qiuxu Zhuo
2025-01-01 11:44 ` [tip: ras/core] " tip-bot2 for Qiuxu Zhuo
2025-01-03 18:10 ` Borislav Petkov
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=173573184786.399.17877739928527396215.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@alien8.de \
--cc=dave.hansen@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=qiuxu.zhuo@intel.com \
--cc=sohil.mehta@intel.com \
--cc=tony.luck@intel.com \
--cc=x86@kernel.org \
--cc=yazen.ghannam@amd.com \
/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
all inboxes | Powered by JetHome®