From: Dave Hansen <dave@sr71.net>
To: linux-kernel@vger.kernel.org
Cc: x86@kernel.org, Dave Hansen <dave@sr71.net>, dave.hansen@linux.intel.com
Subject: [PATCH 1/3] x86, cpufeatures: update cpufeaure macros
Date: Wed, 29 Jun 2016 13:01:07 -0700 [thread overview]
Message-ID: <20160629200107.8D3C9A31@viggo.jf.intel.com> (raw)
From: Dave Hansen <dave.hansen@linux.intel.com>
We had a new CPUID "NCAPINT" word added, but the REQUIRED_MASK and
DISABLED_MASK macros did not get updated. Update them.
None of the features was needed in these masks, so there was no
harm, but we should keep them updated anyway.
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
---
b/arch/x86/include/asm/cpufeature.h | 6 ++++--
b/arch/x86/include/asm/disabled-features.h | 1 +
b/arch/x86/include/asm/required-features.h | 1 +
3 files changed, 6 insertions(+), 2 deletions(-)
diff -puN arch/x86/include/asm/cpufeature.h~update-macros arch/x86/include/asm/cpufeature.h
--- a/arch/x86/include/asm/cpufeature.h~update-macros 2016-06-29 12:59:57.742501943 -0700
+++ b/arch/x86/include/asm/cpufeature.h 2016-06-29 12:59:57.748502214 -0700
@@ -66,7 +66,8 @@ extern const char * const x86_bug_flags[
(((bit)>>5)==13 && (1UL<<((bit)&31) & REQUIRED_MASK13)) || \
(((bit)>>5)==14 && (1UL<<((bit)&31) & REQUIRED_MASK14)) || \
(((bit)>>5)==15 && (1UL<<((bit)&31) & REQUIRED_MASK15)) || \
- (((bit)>>5)==16 && (1UL<<((bit)&31) & REQUIRED_MASK16)) )
+ (((bit)>>5)==16 && (1UL<<((bit)&31) & REQUIRED_MASK16)) || \
+ (((bit)>>5)==17 && (1UL<<((bit)&31) & REQUIRED_MASK17)))
#define DISABLED_MASK_BIT_SET(bit) \
( (((bit)>>5)==0 && (1UL<<((bit)&31) & DISABLED_MASK0 )) || \
@@ -85,7 +86,8 @@ extern const char * const x86_bug_flags[
(((bit)>>5)==13 && (1UL<<((bit)&31) & DISABLED_MASK13)) || \
(((bit)>>5)==14 && (1UL<<((bit)&31) & DISABLED_MASK14)) || \
(((bit)>>5)==15 && (1UL<<((bit)&31) & DISABLED_MASK15)) || \
- (((bit)>>5)==16 && (1UL<<((bit)&31) & DISABLED_MASK16)) )
+ (((bit)>>5)==16 && (1UL<<((bit)&31) & DISABLED_MASK16)) || \
+ (((bit)>>5)==17 && (1UL<<((bit)&31) & DISABLED_MASK17)))
#define cpu_has(c, bit) \
(__builtin_constant_p(bit) && REQUIRED_MASK_BIT_SET(bit) ? 1 : \
diff -puN arch/x86/include/asm/disabled-features.h~update-macros arch/x86/include/asm/disabled-features.h
--- a/arch/x86/include/asm/disabled-features.h~update-macros 2016-06-29 12:59:57.744502033 -0700
+++ b/arch/x86/include/asm/disabled-features.h 2016-06-29 12:59:57.749502259 -0700
@@ -56,5 +56,6 @@
#define DISABLED_MASK14 0
#define DISABLED_MASK15 0
#define DISABLED_MASK16 (DISABLE_PKU|DISABLE_OSPKE)
+#define DISABLED_MASK17 0
#endif /* _ASM_X86_DISABLED_FEATURES_H */
diff -puN arch/x86/include/asm/required-features.h~update-macros arch/x86/include/asm/required-features.h
--- a/arch/x86/include/asm/required-features.h~update-macros 2016-06-29 12:59:57.745502078 -0700
+++ b/arch/x86/include/asm/required-features.h 2016-06-29 12:59:57.749502259 -0700
@@ -99,5 +99,6 @@
#define REQUIRED_MASK14 0
#define REQUIRED_MASK15 0
#define REQUIRED_MASK16 0
+#define REQUIRED_MASK17 0
#endif /* _ASM_X86_REQUIRED_FEATURES_H */
_
next reply other threads:[~2016-06-29 20:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-29 20:01 Dave Hansen [this message]
2016-06-29 20:01 ` [PATCH 2/3] x86, cpufeatures: make sure DISABLED/REQUIRED macros are updated Dave Hansen
2016-06-30 21:34 ` [tip:x86/cpu] x86/cpufeature: Make " tip-bot for Dave Hansen
2016-06-29 20:01 ` [PATCH 3/3] x86, cpufeatures: add helper macro for mask check macros Dave Hansen
2016-06-30 21:35 ` [tip:x86/cpu] x86/cpufeature: Add " tip-bot for Dave Hansen
2016-06-30 21:34 ` [tip:x86/cpu] x86/cpufeature: Update cpufeaure macros tip-bot for Dave Hansen
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=20160629200107.8D3C9A31@viggo.jf.intel.com \
--to=dave@sr71.net \
--cc=dave.hansen@linux.intel.com \
--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
Powered by JetHome