diff options
| author | Will Deacon <will@kernel.org> | 2022-03-14 19:01:32 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2022-03-14 19:01:32 +0000 |
| commit | 292ca2d8eedfe6580b2b5ce6a8a08b07c8562992 (patch) | |
| tree | aa35a7535a3e67c9b169da74f596bb5ff0755cd4 /arch/arm64/include/asm/asm_pointer_auth.h | |
| parent | bf587af2abd8c4ff630f260040f7d2722e37e054 (diff) | |
| parent | def8c222f054d18aac1fd065a50b9db5feaefa9d (diff) | |
| download | linux-292ca2d8eedfe6580b2b5ce6a8a08b07c8562992.tar.gz linux-292ca2d8eedfe6580b2b5ce6a8a08b07c8562992.tar.bz2 linux-292ca2d8eedfe6580b2b5ce6a8a08b07c8562992.zip | |
Merge branch 'for-next/pauth' into for-next/core
* for-next/pauth:
arm64: Add support of PAuth QARMA3 architected algorithm
arm64: cpufeature: Mark existing PAuth architected algorithm as QARMA5
arm64: cpufeature: Account min_field_value when cheking secondaries for PAuth
Diffstat (limited to 'arch/arm64/include/asm/asm_pointer_auth.h')
| -rw-r--r-- | arch/arm64/include/asm/asm_pointer_auth.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/asm_pointer_auth.h b/arch/arm64/include/asm/asm_pointer_auth.h index f1bba5fc61c4..ead62f7dd269 100644 --- a/arch/arm64/include/asm/asm_pointer_auth.h +++ b/arch/arm64/include/asm/asm_pointer_auth.h @@ -60,6 +60,9 @@ alternative_else_nop_endif .macro __ptrauth_keys_init_cpu tsk, tmp1, tmp2, tmp3 mrs \tmp1, id_aa64isar1_el1 ubfx \tmp1, \tmp1, #ID_AA64ISAR1_APA_SHIFT, #8 + mrs_s \tmp2, SYS_ID_AA64ISAR2_EL1 + ubfx \tmp2, \tmp2, #ID_AA64ISAR2_APA3_SHIFT, #4 + orr \tmp1, \tmp1, \tmp2 cbz \tmp1, .Lno_addr_auth\@ mov_q \tmp1, (SCTLR_ELx_ENIA | SCTLR_ELx_ENIB | \ SCTLR_ELx_ENDA | SCTLR_ELx_ENDB) |