mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-28 11:18:45 +07:00
ffed15d3ce
The number of CPU feature keys is meant to map 1:1 to the number of CPU feature flags defined in cputable.h, and the latter must fit in an unsigned long. In commit4db7327194("powerpc: Add option to use jump label for cpu_has_feature()"), I incorrectly defined NUM_CPU_FTR_KEYS to 64. There should be no real adverse consequences of this bug, other than us allocating too many keys. Fix it by using BITS_PER_LONG. Fixes:4db7327194("powerpc: Add option to use jump label for cpu_has_feature()") Tested-by: Meelis Roos <mroos@linux.ee> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
54 lines
1.2 KiB
C
54 lines
1.2 KiB
C
#ifndef __ASM_POWERPC_CPUFEATURES_H
|
|
#define __ASM_POWERPC_CPUFEATURES_H
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
#include <linux/bug.h>
|
|
#include <asm/cputable.h>
|
|
|
|
static inline bool early_cpu_has_feature(unsigned long feature)
|
|
{
|
|
return !!((CPU_FTRS_ALWAYS & feature) ||
|
|
(CPU_FTRS_POSSIBLE & cur_cpu_spec->cpu_features & feature));
|
|
}
|
|
|
|
#ifdef CONFIG_JUMP_LABEL_FEATURE_CHECKS
|
|
#include <linux/jump_label.h>
|
|
|
|
#define NUM_CPU_FTR_KEYS BITS_PER_LONG
|
|
|
|
extern struct static_key_true cpu_feature_keys[NUM_CPU_FTR_KEYS];
|
|
|
|
static __always_inline bool cpu_has_feature(unsigned long feature)
|
|
{
|
|
int i;
|
|
|
|
BUILD_BUG_ON(!__builtin_constant_p(feature));
|
|
|
|
#ifdef CONFIG_JUMP_LABEL_FEATURE_CHECK_DEBUG
|
|
if (!static_key_initialized) {
|
|
printk("Warning! cpu_has_feature() used prior to jump label init!\n");
|
|
dump_stack();
|
|
return early_cpu_has_feature(feature);
|
|
}
|
|
#endif
|
|
|
|
if (CPU_FTRS_ALWAYS & feature)
|
|
return true;
|
|
|
|
if (!(CPU_FTRS_POSSIBLE & feature))
|
|
return false;
|
|
|
|
i = __builtin_ctzl(feature);
|
|
return static_branch_likely(&cpu_feature_keys[i]);
|
|
}
|
|
#else
|
|
static inline bool cpu_has_feature(unsigned long feature)
|
|
{
|
|
return early_cpu_has_feature(feature);
|
|
}
|
|
#endif
|
|
|
|
#endif /* __ASSEMBLY__ */
|
|
#endif /* __ASM_POWERPC_CPUFEATURE_H */
|