Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba62b301 authored by Suzuki K Poulose's avatar Suzuki K Poulose Committed by Mark Salyzyn
Browse files

BACKPORT: arm64: Expose support for optional ARMv8-A features 



ARMv8-A adds a few optional features for ARMv8.2 and ARMv8.3.
Expose them to the userspace via HWCAPs and mrs emulation.

SHA2-512  - Instruction support for SHA512 Hash algorithm (e.g SHA512H,
	    SHA512H2, SHA512U0, SHA512SU1)
SHA3 	  - SHA3 crypto instructions (EOR3, RAX1, XAR, BCAX).
SM3	  - Instruction support for Chinese cryptography algorithm SM3
SM4 	  - Instruction support for Chinese cryptography algorithm SM4
DP	  - Dot Product instructions (UDOT, SDOT).

Cc: Will Deacon <will.deacon@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Dave Martin <dave.martin@arm.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Reviewed-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>

(cherry picked from commit f5e035f8694c3bdddc66ea46ecda965ee6853718)
Signed-off-by: default avatarKevin Brodsky <Kevin.Brodsky@arm.com>
Backport-by: default avatarKevin Brodsky <Kevin.Brodsky@arm.com>
Tested-by: default avatarKevin Brodsky <Kevin.Brodsky@arm.com>
Bug: 119112014
Change-Id: Ic723fc8c743376d96a3cc2fea1f4855d0178a503
parent 80af4336

arch/arm64/include/asm/sysreg.h

+4 −0
Original line number Diff line number Diff line
@@ -109,6 +109,10 @@ 
#define SCTLR_EL1_CP15BEN	(1 << 5)



/* id_aa64isar0 */

#define ID_AA64ISAR0_DP_SHIFT		44

#define ID_AA64ISAR0_SM4_SHIFT		40

#define ID_AA64ISAR0_SM3_SHIFT		36

#define ID_AA64ISAR0_SHA3_SHIFT		32

#define ID_AA64ISAR0_RDM_SHIFT		28

#define ID_AA64ISAR0_ATOMICS_SHIFT	20

#define ID_AA64ISAR0_CRC32_SHIFT	16

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

+5 −0
Original line number Diff line number Diff line
@@ -30,5 +30,10 @@ 
#define HWCAP_ATOMICS		(1 << 8)

#define HWCAP_FPHP		(1 << 9)

#define HWCAP_ASIMDHP		(1 << 10)

#define HWCAP_SHA3		(1 << 17)

#define HWCAP_SM3		(1 << 18)

#define HWCAP_SM4		(1 << 19)

#define HWCAP_ASIMDDP		(1 << 20)

#define HWCAP_SHA512		(1 << 21)



#endif /* _UAPI__ASM_HWCAP_H */

arch/arm64/kernel/cpufeature.c

+9 −1
Original line number Diff line number Diff line
@@ -82,7 +82,10 @@ cpufeature_pan_not_uao(const struct arm64_cpu_capabilities *entry, int __unused) 




static const struct arm64_ftr_bits ftr_id_aa64isar0[] = {

	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 32, 32, 0),

	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64ISAR0_DP_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64ISAR0_SM4_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64ISAR0_SM3_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64ISAR0_SHA3_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64ISAR0_RDM_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, 24, 4, 0),

	ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR0_ATOMICS_SHIFT, 4, 0),
@@ -960,8 +963,13 @@ static const struct arm64_cpu_capabilities arm64_elf_hwcaps[] = { 
	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_AES_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, HWCAP_AES),

	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_SHA1_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, HWCAP_SHA1),

	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_SHA2_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, HWCAP_SHA2),

	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_SHA2_SHIFT, FTR_UNSIGNED, 2, CAP_HWCAP, HWCAP_SHA512),

	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_CRC32_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, HWCAP_CRC32),

	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_ATOMICS_SHIFT, FTR_UNSIGNED, 2, CAP_HWCAP, HWCAP_ATOMICS),

	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_SHA3_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, HWCAP_SHA3),

	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_SM3_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, HWCAP_SM3),

	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_SM4_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, HWCAP_SM4),

	HWCAP_CAP(SYS_ID_AA64ISAR0_EL1, ID_AA64ISAR0_DP_SHIFT, FTR_UNSIGNED, 1, CAP_HWCAP, HWCAP_ASIMDDP),

	HWCAP_CAP(SYS_ID_AA64PFR0_EL1, ID_AA64PFR0_FP_SHIFT, FTR_SIGNED, 0, CAP_HWCAP, HWCAP_FP),

	HWCAP_CAP(SYS_ID_AA64PFR0_EL1, ID_AA64PFR0_FP_SHIFT, FTR_SIGNED, 1, CAP_HWCAP, HWCAP_FPHP),

	HWCAP_CAP(SYS_ID_AA64PFR0_EL1, ID_AA64PFR0_ASIMD_SHIFT, FTR_SIGNED, 0, CAP_HWCAP, HWCAP_ASIMD),

arch/arm64/kernel/cpuinfo.c

+11 −0
Original line number Diff line number Diff line
@@ -63,6 +63,17 @@ static const char *const hwcap_str[] = { 
	"atomics",

	"fphp",

	"asimdhp",

	"cpuid",

	"asimdrdm",

	"jscvt",

	"fcma",

	"lrcpc",

	"dcpop",

	"sha3",

	"sm3",

	"sm4",

	"asimddp",

	"sha512",

	NULL

};