From nobody Tue Feb 22 16:40:21 2022 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 8801319E095D; Tue, 22 Feb 2022 16:40:22 +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 4K34fG242Tz3KTb; Tue, 22 Feb 2022 16:40:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645548022; 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=68XTxyjDLmAoctxH0D1+c00NUDxaT8aH5lN+V4gXhqE=; b=dN80PYMPUSHLye9aFU96KhbBbPZvYhaELE/eCWKz6WAZZpC2JApY6nmFK5jajxlzbX2bPP DQzivRnxQe1ZxUtxCwG8kM05gKAGgan2Xpn/6rAGbvx99GHpYFMc+CngRyugbenObMdWeG y68HEcbCuY8KphqfzVQgGs8zr3HaPrJmJaSa6sA3wetQsvQjED78ejaXKWAv8v8BCgGgIn GRk5fgksWCofGH6LW0Ww7BtTUlWc9RFwAU7Zs1BnPMaCGrRX9q5+caL9PttY9wINl9qY2c hAMc/jrdnCQHp5YTYXWfJcI91xZbxNWoiMqi+XbSUhnuzHq21RmgEsBJ3qoyRQ== 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 F3E2327A1A; Tue, 22 Feb 2022 16:40:21 +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 21MGeLbZ063620; Tue, 22 Feb 2022 16:40:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21MGeL9a063614; Tue, 22 Feb 2022 16:40:21 GMT (envelope-from git) Date: Tue, 22 Feb 2022 16:40:21 GMT Message-Id: <202202221640.21MGeL9a063614@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 1633d17f6137 - stable/13 - Add the Armv8.3-SPE registers 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1633d17f613706733d7be8bf9ac303ea7848f544 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645548022; 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=68XTxyjDLmAoctxH0D1+c00NUDxaT8aH5lN+V4gXhqE=; b=GvwMfKm7hDB7aEcmSkdzk+zkuE3ayuAPVUdmf0RQqyBYKjAfeKFPaMs/L0eZVBnX8jNlJp Hvob2/OLJA46/ViMmS4pknmBi549kT9n3rPOPxMUT0HQM5e6hHnNNw+h27QsgxacgTL2SW UXkVCG7j1S45occ6iRKSloLNYsTrSYOfmJWGeBepMgv88Lq0zVA9e1BMAyf4CeeB9a5bTq dbShMNIJuYyrg1A+uzKO8yKHqJFQIWIOWUvnq2UhJO0JupmjAsh4EK4+6TnbsrOUlB/U3n HXCHtbD5fAbGqnGGiieG+90oGokx/bo81JevNIaUhB8RspYB7XcOhigwTEis5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645548022; a=rsa-sha256; cv=none; b=PQchIsLVQN0WCymWW+th+xZW3WUzS85pXn7NGEDtxJbWZVLJu9LkU78UJXOYCtckX1GK6b 1XlyOyHiPaZfgbNKJPdcCPtYR/yhOVyV3pVAmii9TSuZEELy/IXQN4QxiuaLSiAsZAWf/S SbTvGxsmlH5ec+nnrLSPlvFI+rtbg07txipo8JXkhV5aRtXQRccSUY57nPlB6O32auwUll KbrThVIpnznRGzbr0gGSXV3MBCtCfjfhcoUU8sYJl0O5lWlhc6UpGzjGAfT5hkPCIo4oqH CTukd1KbFEo0qspeaVCTqNl/Mctx3FkhN/K7Gn7E8eshWnc3q6tSDTF1IyqNmQ== 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=1633d17f613706733d7be8bf9ac303ea7848f544 commit 1633d17f613706733d7be8bf9ac303ea7848f544 Author: Andrew Turner AuthorDate: 2021-08-17 08:32:39 +0000 Commit: Andrew Turner CommitDate: 2022-02-22 16:23:07 +0000 Add the Armv8.3-SPE registers (cherry picked from commit 2ad1999722ecf3c1be5c2013af56fa5cb509e073) --- sys/arm64/include/armreg.h | 186 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 186 insertions(+) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index ba36183b25d3..8fb93da218c7 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -862,6 +862,192 @@ #define ID_ISAR5_VCMA_NONE (UL(0x0) << ID_ISAR5_VCMA_SHIFT) #define ID_ISAR5_VCMA_IMPL (UL(0x1) << ID_ISAR5_VCMA_SHIFT) +/* PMBIDR_EL1 */ +#define PMBIDR_EL1 MRS_REG(PMBIDR_EL1) +#define PMBIDR_EL1_op0 0x3 +#define PMBIDR_EL1_op1 0x0 +#define PMBIDR_EL1_CRn 0x9 +#define PMBIDR_EL1_CRm 0xa +#define PMBIDR_EL1_op2 0x7 +#define PMBIDR_Align_SHIFT 0 +#define PMBIDR_Align_MASK (UL(0xf) << PMBIDR_Align_SHIFT) +#define PMBIDR_P_SHIFT 4 +#define PMBIDR_P (UL(0x1) << PMBIDR_P_SHIFT) +#define PMBIDR_F_SHIFT 5 +#define PMBIDR_F (UL(0x1) << PMBIDR_F_SHIFT) + +/* PMBLIMITR_EL1 */ +#define PMBLIMITR_EL1 MRS_REG(PMBLIMITR_EL1) +#define PMBLIMITR_EL1_op0 0x3 +#define PMBLIMITR_EL1_op1 0x0 +#define PMBLIMITR_EL1_CRn 0x9 +#define PMBLIMITR_EL1_CRm 0xa +#define PMBLIMITR_EL1_op2 0x0 +#define PMBLIMITR_E_SHIFT 0 +#define PMBLIMITR_E (UL(0x1) << PMBLIMITR_E_SHIFT) +#define PMBLIMITR_FM_SHIFT 1 +#define PMBLIMITR_FM_MASK (UL(0x3) << PMBLIMITR_FM_SHIFT) +#define PMBLIMITR_PMFZ_SHIFT 5 +#define PMBLIMITR_PMFZ (UL(0x1) << PMBLIMITR_PMFZ_SHIFT) +#define PMBLIMITR_LIMIT_SHIFT 12 +#define PMBLIMITR_LIMIT_MASK \ + (UL(0xfffffffffffff) << PMBLIMITR_LIMIT_SHIFT) + +/* PMBPTR_EL1 */ +#define PMBPTR_EL1 MRS_REG(PMBPTR_EL1) +#define PMBPTR_EL1_op0 0x3 +#define PMBPTR_EL1_op1 0x0 +#define PMBPTR_EL1_CRn 0x9 +#define PMBPTR_EL1_CRm 0xa +#define PMBPTR_EL1_op2 0x1 +#define PMBPTR_PTR_SHIFT 0 +#define PMBPTR_PTR_MASK \ + (UL(0xffffffffffffffff) << PMBPTR_PTR_SHIFT) + +/* PMBSR_EL1 */ +#define PMBSR_EL1 MRS_REG(PMBSR_EL1) +#define PMBSR_EL1_op0 0x3 +#define PMBSR_EL1_op1 0x0 +#define PMBSR_EL1_CRn 0x9 +#define PMBSR_EL1_CRm 0xa +#define PMBSR_EL1_op2 0x3 +#define PMBSR_MSS_SHIFT 0 +#define PMBSR_MSS_MASK (UL(0xffff) << PMBSR_MSS_SHIFT) +#define PMBSR_COLL_SHIFT 16 +#define PMBSR_COLL (UL(0x1) << PMBSR_COLL_SHIFT) +#define PMBSR_S_SHIFT 17 +#define PMBSR_S (UL(0x1) << PMBSR_S_SHIFT) +#define PMBSR_EA_SHIFT 18 +#define PMBSR_EA (UL(0x1) << PMBSR_EA_SHIFT) +#define PMBSR_DL_SHIFT 19 +#define PMBSR_DL (UL(0x1) << PMBSR_DL_SHIFT) +#define PMBSR_EC_SHIFT 26 +#define PMBSR_EC_MASK (UL(0x3f) << PMBSR_EC_SHIFT) + +/* PMSCR_EL1 */ +#define PMSCR_EL1 MRS_REG(PMSCR_EL1) +#define PMSCR_EL1_op0 0x3 +#define PMSCR_EL1_op1 0x0 +#define PMSCR_EL1_CRn 0x9 +#define PMSCR_EL1_CRm 0x9 +#define PMSCR_EL1_op2 0x0 +#define PMSCR_E0SPE_SHIFT 0 +#define PMSCR_E0SPE (UL(0x1) << PMSCR_E0SPE_SHIFT) +#define PMSCR_E1SPE_SHIFT 1 +#define PMSCR_E1SPE (UL(0x1) << PMSCR_E1SPE_SHIFT) +#define PMSCR_CX_SHIFT 3 +#define PMSCR_CX (UL(0x1) << PMSCR_CX_SHIFT) +#define PMSCR_PA_SHIFT 4 +#define PMSCR_PA (UL(0x1) << PMSCR_PA_SHIFT) +#define PMSCR_TS_SHIFT 5 +#define PMSCR_TS (UL(0x1) << PMSCR_TS_SHIFT) +#define PMSCR_PCT_SHIFT 6 +#define PMSCR_PCT_MASK (UL(0x3) << PMSCR_PCT_SHIFT) + +/* PMSEVFR_EL1 */ +#define PMSEVFR_EL1 MRS_REG(PMSEVFR_EL1) +#define PMSEVFR_EL1_op0 0x3 +#define PMSEVFR_EL1_op1 0x0 +#define PMSEVFR_EL1_CRn 0x9 +#define PMSEVFR_EL1_CRm 0x9 +#define PMSEVFR_EL1_op2 0x5 + +/* PMSFCR_EL1 */ +#define PMSFCR_EL1 MRS_REG(PMSFCR_EL1) +#define PMSFCR_EL1_op0 0x3 +#define PMSFCR_EL1_op1 0x0 +#define PMSFCR_EL1_CRn 0x9 +#define PMSFCR_EL1_CRm 0x9 +#define PMSFCR_EL1_op2 0x4 +#define PMSFCR_FE_SHIFT 0 +#define PMSFCR_FE (UL(0x1) << PMSFCR_FE_SHIFT) +#define PMSFCR_FT_SHIFT 1 +#define PMSFCR_FT (UL(0x1) << PMSFCR_FT_SHIFT) +#define PMSFCR_FL_SHIFT 2 +#define PMSFCR_FL (UL(0x1) << PMSFCR_FL_SHIFT) +#define PMSFCR_FnE_SHIFT 3 +#define PMSFCR_FnE (UL(0x1) << PMSFCR_FnE_SHIFT) +#define PMSFCR_B_SHIFT 16 +#define PMSFCR_B (UL(0x1) << PMSFCR_B_SHIFT) +#define PMSFCR_LD_SHIFT 17 +#define PMSFCR_LD (UL(0x1) << PMSFCR_LD_SHIFT) +#define PMSFCR_ST_SHIFT 18 +#define PMSFCR_ST (UL(0x1) << PMSFCR_ST_SHIFT) + +/* PMSICR_EL1 */ +#define PMSICR_EL1 MRS_REG(PMSICR_EL1) +#define PMSICR_EL1_op0 0x3 +#define PMSICR_EL1_op1 0x0 +#define PMSICR_EL1_CRn 0x9 +#define PMSICR_EL1_CRm 0x9 +#define PMSICR_EL1_op2 0x2 +#define PMSICR_COUNT_SHIFT 0 +#define PMSICR_COUNT_MASK (UL(0xffffffff) << PMSICR_COUNT_SHIFT) +#define PMSICR_ECOUNT_SHIFT 56 +#define PMSICR_ECOUNT_MASK (UL(0xff) << PMSICR_ECOUNT_SHIFT) + +/* PMSIDR_EL1 */ +#define PMSIDR_EL1 MRS_REG(PMSIDR_EL1) +#define PMSIDR_EL1_op0 0x3 +#define PMSIDR_EL1_op1 0x0 +#define PMSIDR_EL1_CRn 0x9 +#define PMSIDR_EL1_CRm 0x9 +#define PMSIDR_EL1_op2 0x7 +#define PMSIDR_FE_SHIFT 0 +#define PMSIDR_FE (UL(0x1) << PMSIDR_FE_SHIFT) +#define PMSIDR_FT_SHIFT 1 +#define PMSIDR_FT (UL(0x1) << PMSIDR_FT_SHIFT) +#define PMSIDR_FL_SHIFT 2 +#define PMSIDR_FL (UL(0x1) << PMSIDR_FL_SHIFT) +#define PMSIDR_ArchInst_SHIFT 3 +#define PMSIDR_ArchInst (UL(0x1) << PMSIDR_ArchInst_SHIFT) +#define PMSIDR_LDS_SHIFT 4 +#define PMSIDR_LDS (UL(0x1) << PMSIDR_LDS_SHIFT) +#define PMSIDR_ERnd_SHIFT 5 +#define PMSIDR_ERnd (UL(0x1) << PMSIDR_ERnd_SHIFT) +#define PMSIDR_FnE_SHIFT 6 +#define PMSIDR_FnE (UL(0x1) << PMSIDR_FnE_SHIFT) +#define PMSIDR_Interval_SHIFT 8 +#define PMSIDR_Interval_MASK (UL(0xf) << PMSIDR_Interval_SHIFT) +#define PMSIDR_MaxSize_SHIFT 12 +#define PMSIDR_MaxSize_MASK (UL(0xf) << PMSIDR_MaxSize_SHIFT) +#define PMSIDR_CountSize_SHIFT 16 +#define PMSIDR_CountSize_MASK (UL(0xf) << PMSIDR_CountSize_SHIFT) +#define PMSIDR_Format_SHIFT 20 +#define PMSIDR_Format_MASK (UL(0xf) << PMSIDR_Format_SHIFT) +#define PMSIDR_PBT_SHIFT 24 +#define PMSIDR_PBT (UL(0x1) << PMSIDR_PBT_SHIFT) + +/* PMSIRR_EL1 */ +#define PMSIRR_EL1 MRS_REG(PMSIRR_EL1) +#define PMSIRR_EL1_op0 0x3 +#define PMSIRR_EL1_op1 0x0 +#define PMSIRR_EL1_CRn 0x9 +#define PMSIRR_EL1_CRm 0x9 +#define PMSIRR_EL1_op2 0x3 +#define PMSIRR_RND_SHIFT 0 +#define PMSIRR_RND (UL(0x1) << PMSIRR_RND_SHIFT) +#define PMSIRR_INTERVAL_SHIFT 8 +#define PMSIRR_INTERVAL_MASK (UL(0xffffff) << PMSIRR_INTERVAL_SHIFT) + +/* PMSLATFR_EL1 */ +#define PMSLATFR_EL1 MRS_REG(PMSLATFR_EL1) +#define PMSLATFR_EL1_op0 0x3 +#define PMSLATFR_EL1_op1 0x0 +#define PMSLATFR_EL1_CRn 0x9 +#define PMSLATFR_EL1_CRm 0x9 +#define PMSLATFR_EL1_op2 0x6 +#define PMSLATFR_MINLAT_SHIFT 0 +#define PMSLATFR_MINLAT_MASK (UL(0xfff) << PMSLATFR_MINLAT_SHIFT) + +/* PMSNEVFR_EL1 */ +#define PMSNEVFR_EL1 MRS_REG(PMSNEVFR_EL1) +#define PMSNEVFR_EL1_op0 0x3 +#define PMSNEVFR_EL1_op1 0x0 +#define PMSNEVFR_EL1_CRn 0x9 +#define PMSNEVFR_EL1_CRm 0x9 +#define PMSNEVFR_EL1_op2 0x1 + /* MAIR_EL1 - Memory Attribute Indirection Register */ #define MAIR_ATTR_MASK(idx) (0xff << ((n)* 8)) #define MAIR_ATTR(attr, idx) ((attr) << ((idx) * 8))