Commit 60c868ef authored by Mark Brown's avatar Mark Brown Committed by Will Deacon
Browse files

arm64/cpufeature: Store elf_hwcaps as a bitmap rather than unsigned long 



When we added support for AT_HWCAP2 we took advantage of the fact that we
have limited hwcaps to the low 32 bits and stored it along with AT_HWCAP
in a single unsigned integer. Thanks to the ever expanding capabilities of
the architecture we have now allocated all 64 of the bits in an unsigned
long so in preparation for adding more hwcaps convert elf_hwcap to be a
bitmap instead, with 64 bits allocated to each AT_HWCAP.

There should be no functional change from this patch.

Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Reviewed-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Link: https://lore.kernel.org/r/20220707103632.12745-3-broonie@kernel.org


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent d3e4a9d3

arch/arm64/include/asm/cpufeature.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#include <asm/hwcap.h>

#include <asm/sysreg.h>



#define MAX_CPU_FEATURES	64

#define MAX_CPU_FEATURES	128

#define cpu_feature(x)		KERNEL_HWCAP_ ## x



#ifndef __ASSEMBLY__

arch/arm64/include/asm/hwcap.h

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ 
#define KERNEL_HWCAP_PACA		__khwcap_feature(PACA)

#define KERNEL_HWCAP_PACG		__khwcap_feature(PACG)



#define __khwcap2_feature(x)		(const_ilog2(HWCAP2_ ## x) + 32)

#define __khwcap2_feature(x)		(const_ilog2(HWCAP2_ ## x) + 64)

#define KERNEL_HWCAP_DCPODP		__khwcap2_feature(DCPODP)

#define KERNEL_HWCAP_SVE2		__khwcap2_feature(SVE2)

#define KERNEL_HWCAP_SVEAES		__khwcap2_feature(SVEAES)

arch/arm64/kernel/cpufeature.c

+5 −7
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ 
#include <asm/virt.h>



/* Kernel representation of AT_HWCAP and AT_HWCAP2 */

static unsigned long elf_hwcap __read_mostly;

static DECLARE_BITMAP(elf_hwcap, MAX_CPU_FEATURES) __read_mostly;



#ifdef CONFIG_COMPAT

#define COMPAT_ELF_HWCAP_DEFAULT	\
@@ -3116,14 +3116,12 @@ static bool __maybe_unused __system_matches_cap(unsigned int n) 


void cpu_set_feature(unsigned int num)

{

	WARN_ON(num >= MAX_CPU_FEATURES);

	elf_hwcap |= BIT(num);

	set_bit(num, elf_hwcap);

}



bool cpu_have_feature(unsigned int num)

{

	WARN_ON(num >= MAX_CPU_FEATURES);

	return elf_hwcap & BIT(num);

	return test_bit(num, elf_hwcap);

}

EXPORT_SYMBOL_GPL(cpu_have_feature);
@@ -3134,12 +3132,12 @@ unsigned long cpu_get_elf_hwcap(void) 
	 * note that for userspace compatibility we guarantee that bits 62

	 * and 63 will always be returned as 0.

	 */

	return lower_32_bits(elf_hwcap);

	return elf_hwcap[0];

}



unsigned long cpu_get_elf_hwcap2(void)

{

	return upper_32_bits(elf_hwcap);

	return elf_hwcap[1];

}



static void __init setup_system_capabilities(void)