[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20241128222948.579920-9-darwi@linutronix.de>
Date: Thu, 28 Nov 2024 23:29:43 +0100
From: "Ahmed S. Darwish" <darwi@...utronix.de>
To: Borislav Petkov <bp@...en8.de>,
Dave Hansen <dave.hansen@...ux.intel.com>,
"H. Peter Anvin" <hpa@...or.com>
Cc: Thomas Gleixner <tglx@...utronix.de>,
John Ogness <john.ogness@...utronix.de>,
linux-kernel@...r.kernel.org,
x86@...nel.org,
x86-cpuid@...ts.linux.dev,
"Ahmed S. Darwish" <darwi@...utronix.de>
Subject: [PATCH v1 08/13] tools/x86/kcpuid: Extend index mask macro
Extend the cpuid index mask macro from 0x80000000 to 0xffff0000, as
Centaur indices in the range (0x80860000+) will be later added to the
CSV file.
This automatically sets the cpuid function mask macro to 0x0000ffff, its
negation, which is the more correct value in general. Use that function
mask macro in other places in the code as needed.
Signed-off-by: Ahmed S. Darwish <darwi@...utronix.de>
---
tools/arch/x86/kcpuid/kcpuid.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/arch/x86/kcpuid/kcpuid.c b/tools/arch/x86/kcpuid/kcpuid.c
index 245f55aa3170..bf0b4dd5b4e3 100644
--- a/tools/arch/x86/kcpuid/kcpuid.c
+++ b/tools/arch/x86/kcpuid/kcpuid.c
@@ -71,7 +71,7 @@ enum range_index {
RANGE_EXT = 0x80000000, /* Extended */
};
-#define CPUID_INDEX_MASK 0x80000000
+#define CPUID_INDEX_MASK 0xffff0000
#define CPUID_FUNCTION_MASK (~CPUID_INDEX_MASK)
struct cpuid_range {
@@ -205,7 +205,7 @@ static bool cpuid_store(struct cpuid_range *range, u32 f, int subleaf,
* Cut off vendor-prefix from CPUID function as we're using it as an
* index into ->funcs.
*/
- func = &range->funcs[f & 0xffff];
+ func = &range->funcs[f & CPUID_FUNCTION_MASK];
if (!func->leafs) {
func->leafs = malloc(sizeof(struct subleaf));
@@ -267,7 +267,7 @@ void setup_cpuid_range(struct cpuid_range *range)
cpuid(&eax, &ebx, &ecx, &edx);
max_func = eax;
- idx_func = (max_func & 0xffff) + 1;
+ idx_func = (max_func & CPUID_FUNCTION_MASK) + 1;
range->funcs = malloc(sizeof(struct cpuid_func) * idx_func);
if (!range->funcs)
@@ -579,7 +579,7 @@ static inline struct cpuid_func *index_to_func(u32 index)
if (!range)
return NULL;
- func_idx = index & 0xffff;
+ func_idx = index & CPUID_FUNCTION_MASK;
if ((func_idx + 1) > (u32)range->nr) {
pr_err("ERR: invalid input index (0x%x)\n", index);
return NULL;
--
2.46.2
Powered by blists - more mailing lists