From nobody Mon Apr  4 11:05:59 2022
X-Original-To: dev-commits-src-all@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 E3AEE1A96FDE;
	Mon,  4 Apr 2022 11:05:59 +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 4KX7HW3fKpz3NFx;
	Mon,  4 Apr 2022 11:05:59 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
	t=1649070359;
	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=XvfAKtg//ZHVBfSsVP4kysCGtYgMZSAzb1+1/LQRKNY=;
	b=SWl/N5lxuATVvOvjogJ4KxjPSU8j2xinHlG8gboN6C/Ts0R4nOJw0Wyfi6D7BQnzIGhzbp
	GdBrLop5NVN10qLTGND8jl+9kwD7Zbg83wnbGP2fH62k9wNlJXXeETLO446Ougthr/3BNM
	TkmMs5gZdDPYqPPQMYr0Gqkuqv5Kflqg3LQgoBnyVrvNFkq6ZioPtgJrWLcUVcejwttfHu
	PcQKt+npt8cSHzCAag2kV2yGY3avTevMFbaDH0wz+XnAGeNYLXezVfxTedon3uLWwqhOi2
	QPc0sIx0aXteGXd5nWUWO0PDimiFS+tggsrkO5ascpSEOMPPybQb1lZXG6Nd0w==
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 34CB110DF9;
	Mon,  4 Apr 2022 11:05:59 +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 234B5xuH086470;
	Mon, 4 Apr 2022 11:05:59 GMT
	(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
	by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 234B5xfK086469;
	Mon, 4 Apr 2022 11:05:59 GMT
	(envelope-from git)
Date: Mon, 4 Apr 2022 11:05:59 GMT
Message-Id: <202204041105.234B5xfK086469@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
        dev-commits-src-branches@FreeBSD.org
From: Andrew Turner <andrew@FreeBSD.org>
Subject: git: 722273ba668a - stable/13 - Add more arm64 PAC identification fields
List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all
List-Help: <mailto:dev-commits-src-all+help@freebsd.org>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-all@freebsd.org
X-BeenThere: dev-commits-src-all@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/stable/13
X-Git-Reftype: branch
X-Git-Commit: 722273ba668a0c20053c11df89e31b42db7955b1
Auto-Submitted: auto-generated
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
	s=dkim; t=1649070359;
	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=XvfAKtg//ZHVBfSsVP4kysCGtYgMZSAzb1+1/LQRKNY=;
	b=lMAcZtCQzmAoLv5tSLd0E6CjZ2JJuff5NxkB7D19lkIWJ4Ye/GpP9MVfZhas+ZRHn4xbXR
	JqvLnsHj0BBsibWen8VOJ/iOSVwif/nTyswjglwgP5f+EnII2zWO4QtBvJtfKjbDlKp5A5
	srmv8C9EHqzulSFSPaikBi1meWD84LIC5li13t74Snv9FsJLbsTArhr3J0WR9gYsSmf9I1
	eRiAuJCGXGjCQhYJrZ0ta0Erd+csNFJOJ2wIhKrndnXHaWE8vThz3QrgA3JifJep7d5P8K
	Spqa6ZlfGP4B4JUhuB4sBZMEbgJob5Uf1MWcUZmGQKKRq1eXzniX9WbkscVpsA==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649070359; a=rsa-sha256; cv=none;
	b=m2TysWwGRwLWMjrnu/u+NSwRibxuNwXRcZ3Lnzoj0ar/hCZ/9S/k/G6AFNBUBvu2xA2Hnf
	oBh/jgQkbaU6X3S5tqYfxj77HWE2zIPJtUbZ+RVT23QYNOVJXUxXITUcP9LUlyNB1EM3dO
	p60z0ZWnyNiZbD3tzRvrbpMwgCjF4MOrbpf/YZg0d28vQrq3F2Wwj2P2Za1b8mUjImdNkq
	Pk9i+TweB6wXyAD3Q+GrqUkxkPYADf8dsTrWAr8Zw37dPOsQHcw77m0IypAYAriTB2EHgE
	oNjGgC5nJxjp83KAcu6vKQD2Cf4f1VRrAt5jDDBtawrFFzHg9fCJR/Ica+E/Ug==
ARC-Authentication-Results: i=1;
	mx1.freebsd.org;
	none
X-ThisMailContainsUnwantedMimeParts: N

The branch stable/13 has been updated by andrew:

URL: https://cgit.FreeBSD.org/src/commit/?id=722273ba668a0c20053c11df89e31b42db7955b1

commit 722273ba668a0c20053c11df89e31b42db7955b1
Author:     Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2022-03-08 12:46:47 +0000
Commit:     Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2022-04-04 09:37:05 +0000

    Add more arm64 PAC identification fields
    
    Sponsored by:   The FreeBSD Foundation
    
    (cherry picked from commit e3f7087489c55decf54161b25a5db20c2c93ff42)
---
 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 e360a61a2010..8cbe483dc1c6 100644
--- a/sys/arm64/arm64/identcpu.c
+++ b/sys/arm64/arm64/identcpu.c
@@ -698,6 +698,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,
 };
 
@@ -705,6 +709,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 1404ca8cd727..bd024a0f4d0d 100644
--- a/sys/arm64/include/armreg.h
+++ b/sys/arm64/include/armreg.h
@@ -460,12 +460,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)