diff options
| author | Will Deacon <will@kernel.org> | 2022-03-14 22:01:32 +0300 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2022-03-14 22:01:32 +0300 |
| commit | 292ca2d8eedfe6580b2b5ce6a8a08b07c8562992 (patch) | |
| tree | aa35a7535a3e67c9b169da74f596bb5ff0755cd4 /arch/arm64/tools | |
| parent | bf587af2abd8c4ff630f260040f7d2722e37e054 (diff) | |
| parent | def8c222f054d18aac1fd065a50b9db5feaefa9d (diff) | |
| download | linux-292ca2d8eedfe6580b2b5ce6a8a08b07c8562992.tar.xz | |
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/tools')
| -rw-r--r-- | arch/arm64/tools/cpucaps | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm64/tools/cpucaps b/arch/arm64/tools/cpucaps index 9c65b1e25a96..162bc2443217 100644 --- a/arch/arm64/tools/cpucaps +++ b/arch/arm64/tools/cpucaps @@ -7,7 +7,8 @@ BTI HAS_32BIT_EL0_DO_NOT_USE HAS_32BIT_EL1 HAS_ADDRESS_AUTH -HAS_ADDRESS_AUTH_ARCH +HAS_ADDRESS_AUTH_ARCH_QARMA3 +HAS_ADDRESS_AUTH_ARCH_QARMA5 HAS_ADDRESS_AUTH_IMP_DEF HAS_AMU_EXTN HAS_ARMv8_4_TTL @@ -21,7 +22,8 @@ HAS_E0PD HAS_ECV HAS_EPAN HAS_GENERIC_AUTH -HAS_GENERIC_AUTH_ARCH +HAS_GENERIC_AUTH_ARCH_QARMA3 +HAS_GENERIC_AUTH_ARCH_QARMA5 HAS_GENERIC_AUTH_IMP_DEF HAS_IRQ_PRIO_MASKING HAS_LDAPR |