From: Paul Elliott Date: Thu, 25 Sep 2025 10:41:33 +0000 (+0100) Subject: Add support for Arm V3_AE platform X-Git-Tag: 4.0-PRE-CLANG-FORMAT-WEBKIT~213 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32ff0ebb36a7a2bb47a5383470d8b81964e82be5;p=thirdparty%2Fopenssl.git Add support for Arm V3_AE platform Add cpu MIDR and ensure relevant optimisations are enabled. Signed-off-by: Paul Elliott Reviewed-by: Tom Cosgrove Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/29044) --- diff --git a/crypto/arm_arch.h b/crypto/arm_arch.h index 21bb0698f7b..fc780a7080a 100644 --- a/crypto/arm_arch.h +++ b/crypto/arm_arch.h @@ -114,6 +114,7 @@ extern unsigned int OPENSSL_armv8_rsa_neonized; # define HISI_CPU_PART_KP920 0xD01 # define ARM_CPU_PART_V2 0xD4F # define ARM_CPU_PART_N3 0xD8E +# define ARM_CPU_PART_V3_AE 0xD83 # define ARM_CPU_PART_V3 0xD84 # define QCOM_CPU_PART_ORYON_X1 0x001 diff --git a/crypto/armcap.c b/crypto/armcap.c index e294b1d44cd..9831162244a 100644 --- a/crypto/armcap.c +++ b/crypto/armcap.c @@ -420,12 +420,14 @@ void OPENSSL_cpuid_setup(void) 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_AE) || 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_AE) || 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))