Skip to content

Commit

Permalink
arm64: add cpu_capabilities bitmap
Browse files Browse the repository at this point in the history
For taking note if at least one CPU in the system needs a bug
workaround or would benefit from a code optimization, we create a new
bitmap to hold (artificial) feature bits.
Since elf_hwcap is part of the userland ABI, we keep it alone and
introduce a new data structure for that (along with some accessors).

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
  • Loading branch information
Andre-ARM authored and wildea01 committed Nov 25, 2014
1 parent 9096339 commit 930da09
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 0 deletions.
20 changes: 20 additions & 0 deletions arch/arm64/include/asm/cpufeature.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,29 @@
#define MAX_CPU_FEATURES (8 * sizeof(elf_hwcap))
#define cpu_feature(x) ilog2(HWCAP_ ## x)

#define NCAPS 0

extern DECLARE_BITMAP(cpu_hwcaps, NCAPS);

static inline bool cpu_have_feature(unsigned int num)
{
return elf_hwcap & (1UL << num);
}

static inline bool cpus_have_cap(unsigned int num)
{
if (num >= NCAPS)
return false;
return test_bit(num, cpu_hwcaps);
}

static inline void cpus_set_cap(unsigned int num)
{
if (num >= NCAPS)
pr_warn("Attempt to set an illegal CPU capability (%d >= %d)\n",
num, NCAPS);
else
__set_bit(num, cpu_hwcaps);
}

#endif
3 changes: 3 additions & 0 deletions arch/arm64/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
#include <asm/cputype.h>
#include <asm/elf.h>
#include <asm/cputable.h>
#include <asm/cpufeature.h>
#include <asm/cpu_ops.h>
#include <asm/sections.h>
#include <asm/setup.h>
Expand Down Expand Up @@ -79,6 +80,8 @@ unsigned int compat_elf_hwcap __read_mostly = COMPAT_ELF_HWCAP_DEFAULT;
unsigned int compat_elf_hwcap2 __read_mostly;
#endif

DECLARE_BITMAP(cpu_hwcaps, NCAPS);

static const char *cpu_name;
phys_addr_t __fdt_pointer __initdata;

Expand Down

0 comments on commit 930da09

Please sign in to comment.