From: "tip-bot2 for Tony Luck" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Tony Luck <tony.luck@intel.com>,
Thomas Gleixner <tglx@linutronix.de>, x86 <x86@kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [tip: x86/urgent] x86/split_lock: Update to use X86_MATCH_INTEL_FAM6_MODEL()
Date: Fri, 17 Apr 2020 10:20:14 -0000 [thread overview]
Message-ID: <158711881435.28353.9813486883264323804.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20200416205754.21177-2-tony.luck@intel.com>
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 3ab0762d1edfda6ccbc08f636acab42c103c299f
Gitweb: https://git.kernel.org/tip/3ab0762d1edfda6ccbc08f636acab42c103c299f
Author: Tony Luck <tony.luck@intel.com>
AuthorDate: Thu, 16 Apr 2020 13:57:52 -07:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Fri, 17 Apr 2020 12:14:12 +02:00
x86/split_lock: Update to use X86_MATCH_INTEL_FAM6_MODEL()
The SPLIT_LOCK_CPU() macro escaped the tree-wide sweep for old-style
initialization. Update to use X86_MATCH_INTEL_FAM6_MODEL().
Fixes: 6650cdd9a8cc ("x86/split_lock: Enable split lock detection by kernel")
Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20200416205754.21177-2-tony.luck@intel.com
---
arch/x86/kernel/cpu/intel.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index bf08d45..ec0d8c7 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -1119,8 +1119,6 @@ void switch_to_sld(unsigned long tifn)
sld_update_msr(!(tifn & _TIF_SLD));
}
-#define SPLIT_LOCK_CPU(model) {X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY}
-
/*
* The following processors have the split lock detection feature. But
* since they don't have the IA32_CORE_CAPABILITIES MSR, the feature cannot
@@ -1128,8 +1126,8 @@ void switch_to_sld(unsigned long tifn)
* processors.
*/
static const struct x86_cpu_id split_lock_cpu_ids[] __initconst = {
- SPLIT_LOCK_CPU(INTEL_FAM6_ICELAKE_X),
- SPLIT_LOCK_CPU(INTEL_FAM6_ICELAKE_L),
+ X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X, 0),
+ X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L, 0),
{}
};
next prev parent reply other threads:[~2020-04-17 10:20 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-16 20:57 [PATCH 0/3] Split lock enumeration cleanup and fixes Tony Luck
2020-04-16 20:57 ` [PATCH 1/3] x86/split_lock: Update to use X86_MATCH_INTEL_FAM6_MODEL() Tony Luck
2020-04-17 10:20 ` tip-bot2 for Tony Luck [this message]
2020-04-16 20:57 ` [PATCH 2/3] x86/split_lock: Bits in IA32_CORE_CAPABILITIES are not architectural Tony Luck
2020-04-16 22:06 ` Thomas Gleixner
2020-04-16 22:33 ` Luck, Tony
2020-04-17 9:48 ` Thomas Gleixner
2020-04-17 10:04 ` Thomas Gleixner
2020-04-17 17:06 ` Luck, Tony
2020-04-17 19:29 ` Thomas Gleixner
2020-04-17 19:56 ` Luck, Tony
2020-04-17 20:48 ` Thomas Gleixner
2020-04-17 21:07 ` Thomas Gleixner
2020-04-17 21:19 ` Luck, Tony
2020-04-17 22:18 ` Thomas Gleixner
2020-04-18 4:15 ` Xiaoyao Li
2020-04-18 4:35 ` Sean Christopherson
2020-04-18 9:27 ` Thomas Gleixner
2020-04-18 10:54 ` [tip: x86/urgent] " tip-bot2 for Tony Luck
2020-04-16 20:57 ` [PATCH 3/3] x86/split_lock: Add Tremont family CPU models Tony Luck
2020-04-18 10:54 ` [tip: x86/urgent] " tip-bot2 for Tony Luck
2020-04-16 21:35 ` [PATCH 0/3] Split lock enumeration cleanup and fixes Thomas Gleixner
2020-04-16 21:39 ` Luck, Tony
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=158711881435.28353.9813486883264323804.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--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;
as well as URLs for NNTP newsgroup(s).