From nobody Fri Sep 8 13:54:52 2023 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 4RhyKV0FQ7z4sn3y; Fri, 8 Sep 2023 13:54:54 +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 4RhyKS75RSz4XTg; Fri, 8 Sep 2023 13:54:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694181293; 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=B4n1eNABErp881lUCD05XV4RzCJSV5lcnhW5URDUvU4=; b=qXQYlFe2A6y6xeJ9gW8qcO6GZ/+JIWqB/L5MDqxbdvN18exvE4kNrseNUvcze8Fb6krTkC 6z/ThnCSlcDba94a3UfK9Qyk8u3aonEAySe5rAxUNbASomUdVnrCbI23tgaAwqisJB4PyI /tP/Y+zR9L427pNvXFzr8eWwPwPBnE0gtcJjPqW727AnSOWcw95TKJ+FIZUgxGB+nwpEOQ AufT5W2xsB4UZn8+KVDCGpwZg4GRwhZ795eC25QnokwcNgPT37Tk/+zUfiME6VuTZp+to+ LfEmujNJDxznuO80+A4qzSeUfPM7/soCzcKOSSNJsrzst138kLKXlVV8Z+NtuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694181293; a=rsa-sha256; cv=none; b=hc14WTtsQ1sdFCjZGuaUK0QbeWa0ik5KzONXH+rRwBWp6P5cN/veEODbWoECq8Fs8GNBVt lCt4zAE1b5Jhd2auEwv+AVzMJCvsF7Ydbh21hGiDCLCnjx38zsmavg9EN5mWIAB1YHQIsG n5A9bfIS7BPabR6fvhufyKTF/R128T0+5cTGLNhJK63KiBlGeOfVHdp8IRGiN1E7gHkppt 2/1JFG4IuW/AomYawdekpu6tcY/WPnrhPrrgpXcSxt2tQACviewhVR3rfUs3avPDlxXR9g okQZRG8YJo61NqaUaEzttzomiASbN9FLXtXUk9UoQIUxmNKCI2Ss974eXP84iw== 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=1694181293; 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=B4n1eNABErp881lUCD05XV4RzCJSV5lcnhW5URDUvU4=; b=SrT/fSY3Eq2Zbj4eN7AzzN5KZmHdhwFQiqNM7DZUmbFrW9jLk/RN68U8/MRjYHsyKlJOLu YpHxmScFcOOC/cOZH/Hw3odqfAhVaQQz6LP0cgzaZQ3KG+xwJoMCobcZO584FqVn6QDlfg 7Y7CEMZnFn/Ecs7LLAXIzk6D04jMFOX2+VyDE7kM4FqTR4pxQ8yC/LITRLwV/eG+lI/lxG n/UPSg3awEAlFyONENM7A80qIBfoQsPzUywGGRSvrOGOycsYDvaQo+lrnKKaMAMuplN3FU bRY0iUeIXG8ipQ/eY7nDhR0Tk75nq1sPulWdDEhX8N0qtoMRp222h5ks5U2Pdg== 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 4RhyKS4yJFzkK2; Fri, 8 Sep 2023 13:54:52 +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 388DsqNC005931; Fri, 8 Sep 2023 13:54:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388DsqrF005928; Fri, 8 Sep 2023 13:54:52 GMT (envelope-from git) Date: Fri, 8 Sep 2023 13:54:52 GMT Message-Id: <202309081354.388DsqrF005928@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: a35e47369f88 - main - arm64: Add TCR register masks 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: a35e47369f88e8c2e14b7371a1a5e1152680551f Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=a35e47369f88e8c2e14b7371a1a5e1152680551f commit a35e47369f88e8c2e14b7371a1a5e1152680551f Author: Andrew Turner AuthorDate: 2023-09-08 13:29:19 +0000 Commit: Andrew Turner CommitDate: 2023-09-08 13:31:26 +0000 arm64: Add TCR register masks These will be used by bhyve to implement page table walking. Sponsored by: Arm Ltd --- 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 3ae2f24c2a56..8251a687a5d1 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -2141,6 +2141,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) @@ -2155,8 +2156,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) @@ -2170,7 +2173,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))