From: Paul Elliott Date: Fri, 28 Feb 2025 17:39:50 +0000 (+0000) Subject: Enable AES-GCM unroll8/unroll12 for Neoverse N3/V3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b6dceb36e8f46c7f74db5882322eda062227ab6e;p=thirdparty%2Fopenssl.git Enable AES-GCM unroll8/unroll12 for Neoverse N3/V3 Reviewed-by: Paul Dale Reviewed-by: Tom Cosgrove (Merged from https://github.com/openssl/openssl/pull/27112) --- diff --git a/crypto/arm_arch.h b/crypto/arm_arch.h index acd8aee4d51..00586f212fa 100644 --- a/crypto/arm_arch.h +++ b/crypto/arm_arch.h @@ -112,6 +112,8 @@ extern unsigned int OPENSSL_armv8_rsa_neonized; # define ARM_CPU_PART_N2 0xD49 # define HISI_CPU_PART_KP920 0xD01 # define ARM_CPU_PART_V2 0xD4F +# define ARM_CPU_PART_N3 0xD8E +# define ARM_CPU_PART_V3 0xD84 # define APPLE_CPU_PART_M1_ICESTORM 0x022 # define APPLE_CPU_PART_M1_FIRESTORM 0x023 diff --git a/crypto/armcap.c b/crypto/armcap.c index 7c5a127523a..d42305b3d5e 100644 --- a/crypto/armcap.c +++ b/crypto/armcap.c @@ -422,11 +422,14 @@ void OPENSSL_cpuid_setup(void) MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_N2) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_MICROSOFT, MICROSOFT_CPU_PART_COBALT_100) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V2) || + MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_N3) || + MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V3) || MIDR_IMPLEMENTER(OPENSSL_arm_midr) == ARM_CPU_IMP_AMPERE) && (OPENSSL_armcap_P & ARMV8_SHA3)) OPENSSL_armcap_P |= ARMV8_UNROLL8_EOR3; if ((MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V1) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V2) || + MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V3) || MIDR_IMPLEMENTER(OPENSSL_arm_midr) == ARM_CPU_IMP_AMPERE) && (OPENSSL_armcap_P & ARMV8_SHA3)) OPENSSL_armcap_P |= ARMV8_UNROLL12_EOR3;