From nobody Mon Feb 19 16:44:48 2024 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 4TdpKs6mtsz5C8v8; Mon, 19 Feb 2024 16:44:49 +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 4TdpKr3Z2pz4Zyv; Mon, 19 Feb 2024 16:44:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708361088; 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=0DpbtCbyxGGqgPCDH/yuBi5zTSXR+OHWLnAzMzJtBqc=; b=ZZcndlylw6+MgznPaBfmpnm6TDZCkFfEWO6FSQgowiIjB4iooW6WUVKwSn2KPlufvVQiuC y77wnzY/XV8/PBd7p2CchYQSno9g59fw7UzCb1d29M483UGF64pr6K4MEUZIOetXCCcpdP aKftFLIdys2zE9yx7pfdR1+gX+aqQ6d2Fh7NZ2FVAbY3vo6qNBjJ58On8kezyGyoJmyBn3 As21gE71yCg36xIqGD1V85HqFlSTccgEIjF6+Wt43s0BV3HUJD3xtmIrknBXE17wzSNrQc cYVBiIDqABwwQPOSBYlrJBj5TaWfVHu3v/1TyG9FYbVgHRlLHrscf6KUEP4GcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708361088; 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=0DpbtCbyxGGqgPCDH/yuBi5zTSXR+OHWLnAzMzJtBqc=; b=TbY6UfgWiqt6XMcbWZpzOP2c/XefrHxc5Dx7k+ovOW/G8qiQ0y24AmamVfa2Iy43m+UVtt qbiYeMMy2yqRxITrDvvgar8hyFzb0puSKP+SGZMkfdTDieA22U6IHs8Lej6DIjTFe9TFcf fzSwnnfe3p3MAAKEHjq7V1FFaXNdgtir4zrbp8cZvYsyQ4atuvXIjFdyF0+RTDzHAUlZu9 4MdJJvgjOetkclRhax2PpJYRQYIhCipf+fP1q5m1WLBpufDMAcOjWCFVIwb0w6pKq1tvnI QSeG+T8ZPPlZ77+nGrmZ4TNmP1MGBnvzBfnbIsrpLCGjUa26EOh2kNI+cY6WCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708361088; a=rsa-sha256; cv=none; b=UrosdR+K7EUM3YDG00J5AHvAb0aKGx0w5X7Wz1sCwbEgW85E5a+KJmZ0HjLemBbUYd9cTC tIjatRk7xeGCMSlwaReJWIzpLjA3EdoTP3JdIVM3HkpZRAMyHLgMnLdW0wmdA/fb/9Y4QK iTBzKzsteD6ywPVUg3zNTnu9NLm+TO/Bd9qsugPeEjQ3PtWEP6b7frDBwJVbupl3OAeC7W cnhOnxAZl+J9Airkt184kPCR82P2KNJgRGCr1ppO9r4bD3Jio8eiHlFASB2lSXbWejGOIC KdNeGR5OBh/uWPW/n+UFB2MmKmpJiTPu8utOCEDDXIJVYG260Zxu5xc140X1Kw== 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 4TdpKr2Z33zjSL; Mon, 19 Feb 2024 16:44:48 +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 41JGimXh093917; Mon, 19 Feb 2024 16:44:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41JGim8f093914; Mon, 19 Feb 2024 16:44:48 GMT (envelope-from git) Date: Mon, 19 Feb 2024 16:44:48 GMT Message-Id: <202402191644.41JGim8f093914@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: db5176875809 - stable/13 - arm64: Add TCR register masks 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: db51768758097c64d5a99b5efd210f57ea22c122 Auto-Submitted: auto-generated The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=db51768758097c64d5a99b5efd210f57ea22c122 commit db51768758097c64d5a99b5efd210f57ea22c122 Author: Andrew Turner AuthorDate: 2023-09-08 13:29:19 +0000 Commit: Andrew Turner CommitDate: 2024-02-19 12:38:31 +0000 arm64: Add TCR register masks These will be used by bhyve to implement page table walking. Sponsored by: Arm Ltd (cherry picked from commit a35e47369f88e8c2e14b7371a1a5e1152680551f) --- sys/arm64/include/armreg.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index be070a451691..e2395951f524 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -2100,6 +2100,7 @@ #define TCR_IPS_44BIT (4UL << TCR_IPS_SHIFT) #define TCR_IPS_48BIT (5UL << TCR_IPS_SHIFT) #define TCR_TG1_SHIFT 30 +#define TCR_TG1_MASK (3UL << TCR_TG1_SHIFT) #define TCR_TG1_16K (1UL << TCR_TG1_SHIFT) #define TCR_TG1_4K (2UL << TCR_TG1_SHIFT) #define TCR_TG1_64K (3UL << TCR_TG1_SHIFT) @@ -2114,8 +2115,10 @@ #define TCR_A1_SHIFT 22 #define TCR_A1 (0x1UL << TCR_A1_SHIFT) #define TCR_T1SZ_SHIFT 16 +#define TCR_T1SZ_MASK (0x3fUL << TCR_T1SZ_SHIFT) #define TCR_T1SZ(x) ((x) << TCR_T1SZ_SHIFT) #define TCR_TG0_SHIFT 14 +#define TCR_TG0_MASK (3UL << TCR_TG0_SHIFT) #define TCR_TG0_4K (0UL << TCR_TG0_SHIFT) #define TCR_TG0_64K (1UL << TCR_TG0_SHIFT) #define TCR_TG0_16K (2UL << TCR_TG0_SHIFT) @@ -2129,7 +2132,7 @@ #define TCR_EPD0 (1UL << TCR_EPD0_SHIFT) /* Bit 6 is reserved */ #define TCR_T0SZ_SHIFT 0 -#define TCR_T0SZ_MASK 0x3f +#define TCR_T0SZ_MASK (0x3fUL << TCR_T0SZ_SHIFT) #define TCR_T0SZ(x) ((x) << TCR_T0SZ_SHIFT) #define TCR_TxSZ(x) (TCR_T1SZ(x) | TCR_T0SZ(x))