Commit 0de9104ab2 for openssl.org
commit 0de9104ab28956b64bf98b102500e2f04a8a1fd9
Author: Sean V Kelley <skelley@nvidia.com>
Date: Fri Nov 20 21:19:51 2026 +0000
crypto/armcap.c: add NVIDIA Rigel CPU dispatch to enable optimal SHA3/EOR3 there
Enable the same SHA3 and EOR3 paths as for NVIDIA Olympus in [1].
Rigel part number seems to be 0x11[2][3].
[1] https://github.com/openssl/openssl/pull/30129
[2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cd2a6b71f974
[3] https://gcc.gnu.org/git/?p=gcc.git;a=blobdiff;f=gcc/config/aarch64/aarch64-cores.def;h=407f679e75f9;hp=0fce3204d1e;hb=2f7613d36fec;hpb=d15703b27aa4
CLA: trivial
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Daniel Kubec <kubec@openssl.foundation>
Merge-date: Sun Nov 22 16:47:13 2026
Merged-from: https://github.com/openssl/openssl/pull/33895
diff --git a/crypto/armcap.c b/crypto/armcap.c
index 815bc5bb0a..e4d6d4e305 100644
--- a/crypto/armcap.c
+++ b/crypto/armcap.c
@@ -458,7 +458,8 @@ 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_ARM, ARM_CPU_PART_N3)
|| MIDR_IMPLEMENTER(OPENSSL_arm_midr) == ARM_CPU_IMP_AMPERE
- || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_NVIDIA, NVIDIA_CPU_PART_OLYMPUS)))
+ || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_NVIDIA, NVIDIA_CPU_PART_OLYMPUS)
+ || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_NVIDIA, NVIDIA_CPU_PART_RIGEL)))
OPENSSL_armcap_P |= ARMV8_UNROLL12_EOR3;
if ((OPENSSL_armcap_P & ARMV8_SHA3)
@@ -476,6 +477,7 @@ void OPENSSL_cpuid_setup(void)
|| MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_APPLE, APPLE_CPU_PART_M2_BLIZZARD_MAX)
|| MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_QCOMM, QCOM_CPU_PART_ORYON_X1)
|| MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_NVIDIA, NVIDIA_CPU_PART_OLYMPUS)
+ || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_NVIDIA, NVIDIA_CPU_PART_RIGEL)
|| 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)))
OPENSSL_armcap_P |= ARMV8_HAVE_SHA3_AND_WORTH_USING;
diff --git a/include/arch/arm_arch.h b/include/arch/arm_arch.h
index 59fa554414..f27a4a67f6 100644
--- a/include/arch/arm_arch.h
+++ b/include/arch/arm_arch.h
@@ -116,6 +116,7 @@ extern unsigned int OPENSSL_armv8_rsa_neonized;
#define QCOM_CPU_PART_ORYON_X1 0x001
#define NVIDIA_CPU_PART_OLYMPUS 0x010
+#define NVIDIA_CPU_PART_RIGEL 0x011
#define APPLE_CPU_PART_M1_ICESTORM 0x022
#define APPLE_CPU_PART_M1_FIRESTORM 0x023