From nobody Wed Oct 25 20:06:34 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SG0Lg0gHwz4xylB; Wed, 25 Oct 2023 20:06:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SG0Lg0Fb3z3TFk; Wed, 25 Oct 2023 20:06:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698264395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6q2cdlK+nFXCRF1HLfat939oSkKF5prpzqoiTiLfG7o=; b=vstL3YJPw2ZFCossaNIg3qBx8W4hypcO4gn/KF7H5LbVrYhGSx9k9w74KPahiN0w+/F7ZC /L75Aup0Kto3FS+6cD8Gv2oEa8S1YKPsOtM59tRVWbYwESpY9CEKg9MpmHNmP6BXSfvEtn aDTFysxrYR/O2rlasg7WQKmD2c+1UMrNIVpaTnMgAeuGhz9779/z/gC5PTGg2Y3k06fhsb VW7tTuqo+/Fx8n9B/wofRqYRd7YUybfr/0PH4Me2C3UfGKC/rnY/TIzsKzmnk9IatDGYDP ljEy7AoydolOHIRjX+dECBvXyOlv5D2byXoKetTB2r3zcFMwJYuM1aIX9gKO6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698264395; a=rsa-sha256; cv=none; b=eOprJ1bGpO95ZSGnGtOw4D+1wHBF3GpytXGl3NuKVNO1F0H+VI6dzDMb+Q0XYwYrJ7llOx StoWaA2Em/6lInaYYraqCCixxNkc62IPjkjxqFNlshAPmwl/IHv3dh5ZxrtE/necQtSX6Y YBAUxhaeATOrJ65CsqKDQ7PuDgW7U3+xFTlUcpW3f0Tg7LqNexxmy5azVhbIZQqSi8PoX7 Wu8dhh2OvnpltHWV4nZ6LKcvIdMDB7AzgSY/w+pa9/+MDzj5TCnA16UAdxFvtXxqH/52jm 8Goo55j2Fqm+93TG+oNh4kAXhY7ee5ZltW5wPNdcE5HMxDSDsOT57JDaBOCtIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698264395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6q2cdlK+nFXCRF1HLfat939oSkKF5prpzqoiTiLfG7o=; b=V2e928B5Iasz2dUsfiArwm8Yx1ozgKSO1PiAdbW9GIM3BYOfBHvr6gd6xJ7yRyQu03lLHu VPDoJmUMrrfflHI8igATFZfmrxnaf+euPoWOex+1nLrzJ/H8ipfjcBYdWSGUmujFq7boyH iKx4e2Bv1XBpRnnkpTkL6RZxKTurhN4wpODwzVotDAUvDRPRUOAPBTY0KzOIZI36OwmZeU pKE1tDIbAK/aYfN2EToIWeAKbqw/KPaXFIG6GEcFhu7Ou6/zFYtjmXBzs97c1vrEVE5/63 C5TPRc+BmJRWZN+A4YifCrkzYPQcIwYIYSYn7OaLsl7Iq6+VLxszNEhF5a0qUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SG0Lf6Qpjz1H8Y; Wed, 25 Oct 2023 20:06:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39PK6Yo0040147; Wed, 25 Oct 2023 20:06:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39PK6YUw040144; Wed, 25 Oct 2023 20:06:34 GMT (envelope-from git) Date: Wed, 25 Oct 2023 20:06:34 GMT Message-Id: <202310252006.39PK6YUw040144@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 3acc60b4121f - releng/14.0 - ossl: Update arm_arch.h from OpenSSL 1.1.1 to 3.0 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 3acc60b4121f205b529039976a1f16f4db449190 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3acc60b4121f205b529039976a1f16f4db449190 commit 3acc60b4121f205b529039976a1f16f4db449190 Author: Andrew Turner AuthorDate: 2023-09-22 15:11:27 +0000 Commit: Ed Maste CommitDate: 2023-10-25 19:56:46 +0000 ossl: Update arm_arch.h from OpenSSL 1.1.1 to 3.0 Reviewed by: emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D41939 (cherry picked from commit 2f198d313b4894c1fc3649aa1e5ccfba2b6a2ef5) (cherry picked from commit b91858a32a3155ab36d3de54616ef81d47115a6a) Approved by: re (gjb) --- sys/crypto/openssl/aarch64/arm_arch.h | 49 +++++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/sys/crypto/openssl/aarch64/arm_arch.h b/sys/crypto/openssl/aarch64/arm_arch.h index 8b7105571d78..45d7e1556475 100644 --- a/sys/crypto/openssl/aarch64/arm_arch.h +++ b/sys/crypto/openssl/aarch64/arm_arch.h @@ -1,7 +1,7 @@ /* - * Copyright 2011-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2011-2022 The OpenSSL Project Authors. All Rights Reserved. * - * Licensed under the OpenSSL license (the "License"). You may not use + * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy * in the file LICENSE in the source distribution or at * https://www.openssl.org/source/license.html @@ -71,6 +71,8 @@ # ifndef __ASSEMBLER__ extern unsigned int OPENSSL_armcap_P; +extern unsigned int OPENSSL_arm_midr; +extern unsigned int OPENSSL_armv8_rsa_neonized; # endif # define ARMV7_NEON (1<<0) @@ -80,5 +82,48 @@ extern unsigned int OPENSSL_armcap_P; # define ARMV8_SHA256 (1<<4) # define ARMV8_PMULL (1<<5) # define ARMV8_SHA512 (1<<6) +# define ARMV8_CPUID (1<<7) +/* + * MIDR_EL1 system register + * + * 63___ _ ___32_31___ _ ___24_23_____20_19_____16_15__ _ __4_3_______0 + * | | | | | | | + * |RES0 | Implementer | Variant | Arch | PartNum |Revision| + * |____ _ _____|_____ _ _____|_________|_______ _|____ _ ___|________| + * + */ + +# define ARM_CPU_IMP_ARM 0x41 + +# define ARM_CPU_PART_CORTEX_A72 0xD08 +# define ARM_CPU_PART_N1 0xD0C + +# define MIDR_PARTNUM_SHIFT 4 +# define MIDR_PARTNUM_MASK (0xfffU << MIDR_PARTNUM_SHIFT) +# define MIDR_PARTNUM(midr) \ + (((midr) & MIDR_PARTNUM_MASK) >> MIDR_PARTNUM_SHIFT) + +# define MIDR_IMPLEMENTER_SHIFT 24 +# define MIDR_IMPLEMENTER_MASK (0xffU << MIDR_IMPLEMENTER_SHIFT) +# define MIDR_IMPLEMENTER(midr) \ + (((midr) & MIDR_IMPLEMENTER_MASK) >> MIDR_IMPLEMENTER_SHIFT) + +# define MIDR_ARCHITECTURE_SHIFT 16 +# define MIDR_ARCHITECTURE_MASK (0xfU << MIDR_ARCHITECTURE_SHIFT) +# define MIDR_ARCHITECTURE(midr) \ + (((midr) & MIDR_ARCHITECTURE_MASK) >> MIDR_ARCHITECTURE_SHIFT) + +# define MIDR_CPU_MODEL_MASK \ + (MIDR_IMPLEMENTER_MASK | \ + MIDR_PARTNUM_MASK | \ + MIDR_ARCHITECTURE_MASK) + +# define MIDR_CPU_MODEL(imp, partnum) \ + (((imp) << MIDR_IMPLEMENTER_SHIFT) | \ + (0xfU << MIDR_ARCHITECTURE_SHIFT) | \ + ((partnum) << MIDR_PARTNUM_SHIFT)) + +# define MIDR_IS_CPU_MODEL(midr, imp, partnum) \ + (((midr) & MIDR_CPU_MODEL_MASK) == MIDR_CPU_MODEL(imp, partnum)) #endif