From nobody Thu Mar 10 10:44:16 2022 X-Original-To: dev-commits-src-main@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 6603619F1BDF; Thu, 10 Mar 2022 10:44:16 +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 4KDm002PJ6z4pVs; Thu, 10 Mar 2022 10:44:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646909056; 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=NSH/Yfm2D7LWUJxlx+wG+5LYUSqlYe/AkCHXyRxUS2s=; b=vHvNmkYR/OXrAX7gOj0Cg1vWDpN/6LfyETQVThQkZTSG4eTUaaEVnDblX6FdLxDoRBlx/J CZI4iyK3GUjHsgWYI5TV6w28r5R61T6kus85vdcWIn0/fGB4BEQ+c2we83KvP2a77s/8lB kRUY2FV/TR9Rwc7oSz1Hi68hcD3+uEU/xKY/QeUYSO9RtnJ4EuD8Goz99zIQkzojv1mScQ kDte63+pn1o/eYCEdiBZSjoA6x3A/74gK+oHVhlP3vaPMzB7adjpiHRVBEkiETieBdYzWs 86iFr/FtqG7YPqUsoKYzbJkAWgdhez4PKXUfqC/8cPafbFzkRDh4PkhRjvkY0g== 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 32E4223982; Thu, 10 Mar 2022 10:44:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22AAiG8P077486; Thu, 10 Mar 2022 10:44:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22AAiGlX077485; Thu, 10 Mar 2022 10:44:16 GMT (envelope-from git) Date: Thu, 10 Mar 2022 10:44:16 GMT Message-Id: <202203101044.22AAiGlX077485@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: e3f7087489c5 - main - Add more arm64 PAC identification fields List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e3f7087489c55decf54161b25a5db20c2c93ff42 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646909056; 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=NSH/Yfm2D7LWUJxlx+wG+5LYUSqlYe/AkCHXyRxUS2s=; b=uvI2KONjCT3JeqbQhX5oSNKBwP2Brqvxx8/LdvzY0QKWqDziXflYRO2ixAe09o0dDLnChf i58vfi98lejdoGu+gdyx2viOo9ykolZiFKrdp/habEa7FJ1r+tXOIfO3JQvJtihvdhwHig gPvlevXnazielVF6Ff0dOUCKV7hoBkQ7o5v0dmTHiC9i4YMCb5epJhGQEVBP5dWgKg8MyR ouH7MU1IbhzumJaBjjl6cIYd9COYX+Wbj5BFez8hNDpIXAzFujr3e4Tx00wUhdBwxD96bG QfZ0DstBVXfjuDTSy/quJ63Y2IHjzZ1So10Kuhov2n/mXrjTU5whe0YSIPNSDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646909056; a=rsa-sha256; cv=none; b=xn1w4XPzwYT1sW6Bgm8POGxw2ZdmncN2YoRF2oVl4Br8JqSsGYzd5d5Cd15KV1vCLVHVt7 VcJF2yz7DE8ofX81dHoq54Ql3HwOMKU8Wj+mp0KsUwcPJIn/IpgDFl5DIv16Jqp5VZoQxq iT3z5KHuhhfNFA9QXrRlhlebLmySnd1WjnpsAKbXuXpeY8Rld6URjYieSG4k2StP5vzhht 09PXczNPGCX27bVfk1jVQsOK1ohTgM0rOwqKzVzGmB1u/DMvxOHD7nkDB20XBw3ThlSQni WWCzaMJhLrOcvkFExs2iFGGkuDYSTnruK1JBbUV/W+mwSaguKoo8iU3f2xdcSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=e3f7087489c55decf54161b25a5db20c2c93ff42 commit e3f7087489c55decf54161b25a5db20c2c93ff42 Author: Andrew Turner AuthorDate: 2022-03-08 12:46:47 +0000 Commit: Andrew Turner CommitDate: 2022-03-10 10:43:48 +0000 Add more arm64 PAC identification fields Sponsored by: The FreeBSD Foundation --- sys/arm64/arm64/identcpu.c | 8 ++++++++ sys/arm64/include/armreg.h | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index 1a1c80baddf0..f466055e0084 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -706,6 +706,10 @@ static struct mrs_field_value id_aa64isar1_api[] = { MRS_FIELD_VALUE(ID_AA64ISAR1_API_NONE, ""), MRS_FIELD_VALUE(ID_AA64ISAR1_API_PAC, "API PAC"), MRS_FIELD_VALUE(ID_AA64ISAR1_API_EPAC, "API EPAC"), + MRS_FIELD_VALUE(ID_AA64ISAR1_API_EPAC2, "Impl PAuth+EPAC2"), + MRS_FIELD_VALUE(ID_AA64ISAR1_API_FPAC, "Impl PAuth+FPAC"), + MRS_FIELD_VALUE(ID_AA64ISAR1_API_FPAC_COMBINED, + "Impl PAuth+FPAC+Combined"), MRS_FIELD_VALUE_END, }; @@ -718,6 +722,10 @@ static struct mrs_field_value id_aa64isar1_apa[] = { MRS_FIELD_VALUE(ID_AA64ISAR1_APA_NONE, ""), MRS_FIELD_VALUE(ID_AA64ISAR1_APA_PAC, "APA PAC"), MRS_FIELD_VALUE(ID_AA64ISAR1_APA_EPAC, "APA EPAC"), + MRS_FIELD_VALUE(ID_AA64ISAR1_APA_EPAC2, "PAuth+EPAC2"), + MRS_FIELD_VALUE(ID_AA64ISAR1_APA_FPAC, "PAuth+FPAC"), + MRS_FIELD_VALUE(ID_AA64ISAR1_APA_FPAC_COMBINED, + "PAuth+FPAC+Combined"), MRS_FIELD_VALUE_END, }; diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index c1da3abbde0f..cd09807ec4be 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -462,12 +462,18 @@ #define ID_AA64ISAR1_APA_NONE (UL(0x0) << ID_AA64ISAR1_APA_SHIFT) #define ID_AA64ISAR1_APA_PAC (UL(0x1) << ID_AA64ISAR1_APA_SHIFT) #define ID_AA64ISAR1_APA_EPAC (UL(0x2) << ID_AA64ISAR1_APA_SHIFT) +#define ID_AA64ISAR1_APA_EPAC2 (UL(0x3) << ID_AA64ISAR1_APA_SHIFT) +#define ID_AA64ISAR1_APA_FPAC (UL(0x4) << ID_AA64ISAR1_APA_SHIFT) +#define ID_AA64ISAR1_APA_FPAC_COMBINED (UL(0x5) << ID_AA64ISAR1_APA_SHIFT) #define ID_AA64ISAR1_API_SHIFT 8 #define ID_AA64ISAR1_API_MASK (UL(0xf) << ID_AA64ISAR1_API_SHIFT) #define ID_AA64ISAR1_API_VAL(x) ((x) & ID_AA64ISAR1_API_MASK) #define ID_AA64ISAR1_API_NONE (UL(0x0) << ID_AA64ISAR1_API_SHIFT) #define ID_AA64ISAR1_API_PAC (UL(0x1) << ID_AA64ISAR1_API_SHIFT) #define ID_AA64ISAR1_API_EPAC (UL(0x2) << ID_AA64ISAR1_API_SHIFT) +#define ID_AA64ISAR1_API_EPAC2 (UL(0x3) << ID_AA64ISAR1_API_SHIFT) +#define ID_AA64ISAR1_API_FPAC (UL(0x4) << ID_AA64ISAR1_API_SHIFT) +#define ID_AA64ISAR1_API_FPAC_COMBINED (UL(0x5) << ID_AA64ISAR1_API_SHIFT) #define ID_AA64ISAR1_JSCVT_SHIFT 12 #define ID_AA64ISAR1_JSCVT_MASK (UL(0xf) << ID_AA64ISAR1_JSCVT_SHIFT) #define ID_AA64ISAR1_JSCVT_VAL(x) ((x) & ID_AA64ISAR1_JSCVT_MASK)