aarch64: Recognize PAuth QARMA3
PATCH 1/1 aarch64: Recognize PAuth QARMA3
QARMA3 is relaxed version of the QARMA5 algorithm which expected to reduce the latency of calculation while still delivering a suitable level of security.
Support for QARMA3 can be discovered via ID_AA64ISAR2_EL1 [1]
APA3, bits [15:12] Indicates whether the QARMA3 algorithm is
implemented in the PE for address authentication in AArch64 state.
GPA3, bits [11:8] Indicates whether the QARMA3 algorithm is
implemented in the PE for generic code authentication in AArch64 state.
--- arch/aarch64/include/asm/cpu.h | 5 +++++ arch/aarch64/init.c | 14 +++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-)
arch/aarch64/include/asm/cpu.h +5 -0
@@ -63,6 +63,9 @@#define ID_AA64ISAR1_EL1_GPA BITS(27, 24)#define ID_AA64ISAR1_EL1_GPI BITS(31, 28) +#define ID_AA64ISAR2_EL1_GPA3 BITS(11, 8) +#define ID_AA64ISAR2_EL1_APA3 BITS(15, 12) +#define ID_AA64MMFR0_EL1_FGT BITS(59, 56)#define ID_AA64MMFR0_EL1_ECV BITS(63, 60)
@@ -104,6 +107,8 @@#define ZCR_EL3 s3_6_c1_c2_0#define ZCR_EL3_LEN_MAX 0xf +#define ID_AA64ISAR2_EL1 s3_0_c0_c6_2 +#define SCTLR_EL1_CP15BEN (1 << 5)#ifdef KERNEL_32
arch/aarch64/init.c +9 -5
@@ -30,12 +30,16 @@ static inline bool kernel_is_32bit(void)static inline bool cpu_has_pauth (void ) { -const unsigned long id_pauth =ID_AA64ISAR1_EL1_APA | -ID_AA64ISAR1_EL1_API | -ID_AA64ISAR1_EL1_GPA | -ID_AA64ISAR1_EL1_GPI ; +const unsigned long isar1_pauth =ID_AA64ISAR1_EL1_APA | +ID_AA64ISAR1_EL1_API | +ID_AA64ISAR1_EL1_GPA | +ID_AA64ISAR1_EL1_GPI ; -return mrs (ID_AA64ISAR1_EL1 ) & id_pauth; +const unsigned long isar2_pauth =ID_AA64ISAR2_EL1_APA3 | +ID_AA64ISAR2_EL1_GPA3 ; + +return (mrs (ID_AA64ISAR1_EL1 ) & isar1_pauth) || + (mrs (ID_AA64ISAR2_EL1 ) & isar2_pauth); }void cpu_init_el3 (void )
Signature · 7 lines
2.7.4 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 10 lines · Vladimir Murzin
QARMA3 is relaxed version of the QARMA5 algorithm which expected to reduce the latency of calculation while still delivering a suitable level of security.
Support for QARMA3 can be discovered via
ID_AA64ISAR2_EL1[1]APA3, bits [15:12] Indicates whether the QARMA3 algorithm is
implemented in the PE for address authentication in AArch64 state.
Quoted 7 lines
GPA3, bits [11:8] Indicates whether the QARMA3 algorithm is
implemented in the PE for generic code authentication in AArch64 state.Signed-off-by Vladimir Murzin <[email protected]>
Thanks; applied.
Mark.
Quoted 57 lines
--- arch/aarch64/include/asm/cpu.h | 5 +++++ arch/aarch64/init.c | 14 +++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-)arch/aarch64/include/asm/cpu.h +5
-0@@ -63,6 +63,9 @@#define ID_AA64ISAR1_EL1_GPA BITS(27, 24)#define ID_AA64ISAR1_EL1_GPI BITS(31, 28) +#define ID_AA64ISAR2_EL1_GPA3 BITS(11, 8) +#define ID_AA64ISAR2_EL1_APA3 BITS(15, 12) +#define ID_AA64MMFR0_EL1_FGT BITS(59, 56)#define ID_AA64MMFR0_EL1_ECV BITS(63, 60)@@ -104,6 +107,8 @@#define ZCR_EL3 s3_6_c1_c2_0#define ZCR_EL3_LEN_MAX 0xf +#define ID_AA64ISAR2_EL1 s3_0_c0_c6_2 +#define SCTLR_EL1_CP15BEN (1 << 5)#ifdef KERNEL_32 arch/aarch64/init.c +9
-5@@ -30,12 +30,16 @@ static inline bool kernel_is_32bit(void)static inline bool cpu_has_pauth (void ) { -const unsigned long id_pauth =ID_AA64ISAR1_EL1_APA | -ID_AA64ISAR1_EL1_API | -ID_AA64ISAR1_EL1_GPA | -ID_AA64ISAR1_EL1_GPI ; +const unsigned long isar1_pauth =ID_AA64ISAR1_EL1_APA | +ID_AA64ISAR1_EL1_API | +ID_AA64ISAR1_EL1_GPA | +ID_AA64ISAR1_EL1_GPI ; -return mrs (ID_AA64ISAR1_EL1 ) & id_pauth; +const unsigned long isar2_pauth =ID_AA64ISAR2_EL1_APA3 | +ID_AA64ISAR2_EL1_GPA3 ; + +return (mrs (ID_AA64ISAR1_EL1 ) & isar1_pauth) || + (mrs (ID_AA64ISAR2_EL1 ) & isar2_pauth); }void cpu_init_el3 (void )Signature · 1 line
2.7.4
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel