Commit 7d5d8601 authored by Mark Brown's avatar Mark Brown Committed by Catalin Marinas
Browse files

arm64/sme: Add hwcaps for SME 2 and 2.1 features 



In order to allow userspace to discover the presence of the new SME features
add hwcaps for them.

Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20221208-arm64-sme2-v4-13-f2fa0aef982f@kernel.org


Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent f90b529b

Documentation/arm64/elf_hwcaps.rst

+18 −0
Original line number Diff line number Diff line
@@ -284,6 +284,24 @@ HWCAP2_RPRFM 
HWCAP2_SVE2P1

    Functionality implied by ID_AA64ZFR0_EL1.SVEver == 0b0010.



HWCAP2_SME2

    Functionality implied by ID_AA64SMFR0_EL1.SMEver == 0b0001.



HWCAP2_SME2P1

    Functionality implied by ID_AA64SMFR0_EL1.SMEver == 0b0010.



HWCAP2_SMEI16I32

    Functionality implied by ID_AA64SMFR0_EL1.I16I32 == 0b0101



HWCAP2_SMEBI32I32

    Functionality implied by ID_AA64SMFR0_EL1.BI32I32 == 0b1



HWCAP2_SMEB16B16

    Functionality implied by ID_AA64SMFR0_EL1.B16B16 == 0b1



HWCAP2_SMEF16F16

    Functionality implied by ID_AA64SMFR0_EL1.F16F16 == 0b1



4. Unused AT_HWCAP bits

-----------------------

arch/arm64/include/asm/hwcap.h

+6 −0
Original line number Diff line number Diff line
@@ -123,6 +123,12 @@ 
#define KERNEL_HWCAP_CSSC		__khwcap2_feature(CSSC)

#define KERNEL_HWCAP_RPRFM		__khwcap2_feature(RPRFM)

#define KERNEL_HWCAP_SVE2P1		__khwcap2_feature(SVE2P1)

#define KERNEL_HWCAP_SME2		__khwcap2_feature(SME2)

#define KERNEL_HWCAP_SME2P1		__khwcap2_feature(SME2P1)

#define KERNEL_HWCAP_SME_I16I32		__khwcap2_feature(SME_I16I32)

#define KERNEL_HWCAP_SME_BI32I32	__khwcap2_feature(SME_BI32I32)

#define KERNEL_HWCAP_SME_B16B16		__khwcap2_feature(SME_B16B16)

#define KERNEL_HWCAP_SME_F16F16		__khwcap2_feature(SME_F16F16)



/*

 * This yields a mask that user programs can use to figure out what

arch/arm64/include/uapi/asm/hwcap.h

+6 −0
Original line number Diff line number Diff line
@@ -96,5 +96,11 @@ 
#define HWCAP2_CSSC		(1UL << 34)

#define HWCAP2_RPRFM		(1UL << 35)

#define HWCAP2_SVE2P1		(1UL << 36)

#define HWCAP2_SME2		(1UL << 37)

#define HWCAP2_SME2P1		(1UL << 38)

#define HWCAP2_SME_I16I32	(1UL << 39)

#define HWCAP2_SME_BI32I32	(1UL << 40)

#define HWCAP2_SME_B16B16	(1UL << 41)

#define HWCAP2_SME_F16F16	(1UL << 42)



#endif /* _UAPI__ASM_HWCAP_H */

arch/arm64/kernel/cpufeature.c

+14 −0
Original line number Diff line number Diff line
@@ -288,12 +288,20 @@ static const struct arm64_ftr_bits ftr_id_aa64smfr0[] = { 
		       FTR_STRICT, FTR_EXACT, ID_AA64SMFR0_EL1_I16I64_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_SME),

		       FTR_STRICT, FTR_EXACT, ID_AA64SMFR0_EL1_F64F64_SHIFT, 1, 0),

	ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_SME),

		       FTR_STRICT, FTR_EXACT, ID_AA64SMFR0_EL1_I16I32_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_SME),

		       FTR_STRICT, FTR_EXACT, ID_AA64SMFR0_EL1_B16B16_SHIFT, 1, 0),

	ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_SME),

		       FTR_STRICT, FTR_EXACT, ID_AA64SMFR0_EL1_F16F16_SHIFT, 1, 0),

	ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_SME),

		       FTR_STRICT, FTR_EXACT, ID_AA64SMFR0_EL1_I8I32_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_SME),

		       FTR_STRICT, FTR_EXACT, ID_AA64SMFR0_EL1_F16F32_SHIFT, 1, 0),

	ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_SME),

		       FTR_STRICT, FTR_EXACT, ID_AA64SMFR0_EL1_B16F32_SHIFT, 1, 0),

	ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_SME),

		       FTR_STRICT, FTR_EXACT, ID_AA64SMFR0_EL1_BI32I32_SHIFT, 1, 0),

	ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_SME),

		       FTR_STRICT, FTR_EXACT, ID_AA64SMFR0_EL1_F32F32_SHIFT, 1, 0),

	ARM64_FTR_END,
@@ -2841,11 +2849,17 @@ static const struct arm64_cpu_capabilities arm64_elf_hwcaps[] = { 
#ifdef CONFIG_ARM64_SME

	HWCAP_CAP(SYS_ID_AA64PFR1_EL1, ID_AA64PFR1_EL1_SME_SHIFT, 4, FTR_UNSIGNED, ID_AA64PFR1_EL1_SME_IMP, CAP_HWCAP, KERNEL_HWCAP_SME),

	HWCAP_CAP(SYS_ID_AA64SMFR0_EL1, ID_AA64SMFR0_EL1_FA64_SHIFT, 1, FTR_UNSIGNED, ID_AA64SMFR0_EL1_FA64_IMP, CAP_HWCAP, KERNEL_HWCAP_SME_FA64),

	HWCAP_CAP(SYS_ID_AA64SMFR0_EL1, ID_AA64SMFR0_EL1_SMEver_SHIFT, 4, FTR_UNSIGNED, ID_AA64SMFR0_EL1_SMEver_SME2p1, CAP_HWCAP, KERNEL_HWCAP_SME2P1),

	HWCAP_CAP(SYS_ID_AA64SMFR0_EL1, ID_AA64SMFR0_EL1_SMEver_SHIFT, 4, FTR_UNSIGNED, ID_AA64SMFR0_EL1_SMEver_SME2, CAP_HWCAP, KERNEL_HWCAP_SME2),

	HWCAP_CAP(SYS_ID_AA64SMFR0_EL1, ID_AA64SMFR0_EL1_I16I64_SHIFT, 4, FTR_UNSIGNED, ID_AA64SMFR0_EL1_I16I64_IMP, CAP_HWCAP, KERNEL_HWCAP_SME_I16I64),

	HWCAP_CAP(SYS_ID_AA64SMFR0_EL1, ID_AA64SMFR0_EL1_F64F64_SHIFT, 1, FTR_UNSIGNED, ID_AA64SMFR0_EL1_F64F64_IMP, CAP_HWCAP, KERNEL_HWCAP_SME_F64F64),

	HWCAP_CAP(SYS_ID_AA64SMFR0_EL1, ID_AA64SMFR0_EL1_I16I32_SHIFT, 1, FTR_UNSIGNED, ID_AA64SMFR0_EL1_I16I32_IMP, CAP_HWCAP, KERNEL_HWCAP_SME_I16I32),

	HWCAP_CAP(SYS_ID_AA64SMFR0_EL1, ID_AA64SMFR0_EL1_B16B16_SHIFT, 1, FTR_UNSIGNED, ID_AA64SMFR0_EL1_B16B16_IMP, CAP_HWCAP, KERNEL_HWCAP_SME_B16B16),

	HWCAP_CAP(SYS_ID_AA64SMFR0_EL1, ID_AA64SMFR0_EL1_F16F16_SHIFT, 1, FTR_UNSIGNED, ID_AA64SMFR0_EL1_F16F16_IMP, CAP_HWCAP, KERNEL_HWCAP_SME_F16F16),

	HWCAP_CAP(SYS_ID_AA64SMFR0_EL1, ID_AA64SMFR0_EL1_I8I32_SHIFT, 4, FTR_UNSIGNED, ID_AA64SMFR0_EL1_I8I32_IMP, CAP_HWCAP, KERNEL_HWCAP_SME_I8I32),

	HWCAP_CAP(SYS_ID_AA64SMFR0_EL1, ID_AA64SMFR0_EL1_F16F32_SHIFT, 1, FTR_UNSIGNED, ID_AA64SMFR0_EL1_F16F32_IMP, CAP_HWCAP, KERNEL_HWCAP_SME_F16F32),

	HWCAP_CAP(SYS_ID_AA64SMFR0_EL1, ID_AA64SMFR0_EL1_B16F32_SHIFT, 1, FTR_UNSIGNED, ID_AA64SMFR0_EL1_B16F32_IMP, CAP_HWCAP, KERNEL_HWCAP_SME_B16F32),

	HWCAP_CAP(SYS_ID_AA64SMFR0_EL1, ID_AA64SMFR0_EL1_BI32I32_SHIFT, 1, FTR_UNSIGNED, ID_AA64SMFR0_EL1_BI32I32_IMP, CAP_HWCAP, KERNEL_HWCAP_SME_BI32I32),

	HWCAP_CAP(SYS_ID_AA64SMFR0_EL1, ID_AA64SMFR0_EL1_F32F32_SHIFT, 1, FTR_UNSIGNED, ID_AA64SMFR0_EL1_F32F32_IMP, CAP_HWCAP, KERNEL_HWCAP_SME_F32F32),

#endif /* CONFIG_ARM64_SME */

	{},

arch/arm64/kernel/cpuinfo.c

+6 −0
Original line number Diff line number Diff line
@@ -119,6 +119,12 @@ static const char *const hwcap_str[] = { 
	[KERNEL_HWCAP_CSSC]		= "cssc",

	[KERNEL_HWCAP_RPRFM]		= "rprfm",

	[KERNEL_HWCAP_SVE2P1]		= "sve2p1",

	[KERNEL_HWCAP_SME2]		= "sme2",

	[KERNEL_HWCAP_SME2P1]		= "sme2p1",

	[KERNEL_HWCAP_SME_I16I32]	= "smei16i32",

	[KERNEL_HWCAP_SME_BI32I32]	= "smebi32i32",

	[KERNEL_HWCAP_SME_B16B16]	= "smeb16b16",

	[KERNEL_HWCAP_SME_F16F16]	= "smef16f16",

};



#ifdef CONFIG_COMPAT