From nobody Tue Nov 15 17:32:01 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 4NBYC56c2kz4hJp5; Tue, 15 Nov 2022 17:32:01 +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 4NBYC54Clvz429k; Tue, 15 Nov 2022 17:32:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668533521; 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=ihreQe19P6GOUubWD7ysMipKFf6fU0lCbu5NtlNzEVE=; b=H7yKseiRh+BvSRnNRX9kigZnHdfJdJnQZexgwhcSWtSLdB3VTJxG9mQGeeGCErQuKgfMpV ylTINKD2DeEoQileho/2DoHK9TjW+6zBYCu6tVRidy/LvSXSiZU/xH5JWKDhDlhoI8bQtk 5IrIfe2qPZQlp3FPaA0Vk5ksvXWuvwRF0fe1PZmkYLUOfKFTJIZ6vbBZB6nMHcoS+0Nxrl wbW21Sf8lM+nN5rb3qGF3439Ap0W0808ANkZdYvr3kEeTzpnzxsdT15WnNtjnEe4ZEYT/0 8S0784gODiZVM/xQm5WLIbhIfHBhb9IWm2BtCEsPMP2RbpwSuDuke5db68ICWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668533521; 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=ihreQe19P6GOUubWD7ysMipKFf6fU0lCbu5NtlNzEVE=; b=YrMhmrUUDlY4k/rVsVYzfj1SenFTZHvb36G9hUiwMLs2wuWJJ7HPXJjpeCA05ZgXyR0UOh kCV/Y8LgP82Ilv08VLLJiLEcl4hbg/PjYbk6T8FggmL+jzjy3ZijO+w21OH5RsEYyl76X+ 4opx18bDrQgoYCbQRNKHWsKo8nBjNZ090IslUQRIG4LWx8O+uZYhUuuo0+3ZQEJtlKQ0xA zTkpVx3vbWD4j3jHrg60p9ADJNIBhgesgw6pbzKRMcm3MNqcW9fHBj3NtvO/WcCJU+pPXB UdOvH8aNjYFneA17FigxHvFUHhREb/IeB0vsLu3Jflt8kJwBQ70T57CRl8Gbng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668533521; a=rsa-sha256; cv=none; b=MK7niIuMq+esoGu+MDRR1DzhhprkIgmUQAavVey2KK03mzpGUOBWCG5Li9DlVnmaP1kqp4 OPnpaSemuaWFISXzLe2X/QwU+1+Iu9hNBBYQ2E50VVa9BUvHrnxRTsRFq+4ncUS5qdG9Mb Aq0sy305lvVCguxYDeGSVAzrz+C+XMv1KUHtIWV76KaX5TPBp9YBNpPIvQwh8ZtkI24lzV 4Oi/j8BLaDpixjRdPTdBA9ZZLMwBI04o6p+aKnnI9jM5OtCzGg3ZThMUzycs3zooY1re9b NR1nJ3mZxs3/XkL51T2qN60r1KZSGdZeGIJUFllXgFv3cn5fPuJZzjd/yFvWDA== 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 4NBYC539BLzWFp; Tue, 15 Nov 2022 17:32:01 +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 2AFHW1YU013086; Tue, 15 Nov 2022 17:32:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AFHW1Ol013085; Tue, 15 Nov 2022 17:32:01 GMT (envelope-from git) Date: Tue, 15 Nov 2022 17:32:01 GMT Message-Id: <202211151732.2AFHW1Ol013085@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: 2468c61958f5 - main - Add more arm64 hypervisor registers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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/main X-Git-Reftype: branch X-Git-Commit: 2468c61958f5e50927775f0611b44402a461840d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=2468c61958f5e50927775f0611b44402a461840d commit 2468c61958f5e50927775f0611b44402a461840d Author: Andrew Turner AuthorDate: 2022-11-14 15:42:51 +0000 Commit: Andrew Turner CommitDate: 2022-11-15 17:26:52 +0000 Add more arm64 hypervisor registers These will be used by bhyve. Sponsored by: Innovate UK Sponsored by: The FreeBSD Foundation --- sys/arm64/include/hypervisor.h | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/sys/arm64/include/hypervisor.h b/sys/arm64/include/hypervisor.h index dc6ccbfe20a9..84abe17f310e 100644 --- a/sys/arm64/include/hypervisor.h +++ b/sys/arm64/include/hypervisor.h @@ -119,6 +119,11 @@ /* HPFAR_EL2 - Hypervisor IPA Fault Address Register */ #define HPFAR_EL2_FIPA_SHIFT 4 #define HPFAR_EL2_FIPA_MASK 0xfffffffff0 +#define HPFAR_EL2_FIPA_GET(x) \ + (((x) & HPFAR_EL2_FIPA_MASK) >> HPFAR_EL2_FIPA_SHIFT) +/* HPFAR_EL2_FIPA holds the 4k page address */ +#define HPFAR_EL2_FIPA_ADDR(x) \ + (HPFAR_EL2_FIPA_GET(x) << 12) /* ICC_SRE_EL2 */ #define ICC_SRE_EL2_SRE (1UL << 0) @@ -149,12 +154,18 @@ /* Bits 7:6 are reserved */ #define TCR_EL2_IRGN0_SHIFT 8 #define TCR_EL2_IRGN0_MASK (0x3UL << TCR_EL2_IRGN0_SHIFT) +#define TCR_EL2_IRGN0_WBWA (1UL << TCR_EL2_IRGN0_SHIFT) #define TCR_EL2_ORGN0_SHIFT 10 #define TCR_EL2_ORGN0_MASK (0x3UL << TCR_EL2_ORGN0_SHIFT) +#define TCR_EL2_ORGN0_WBWA (1UL << TCR_EL2_ORGN0_SHIFT) #define TCR_EL2_SH0_SHIFT 12 #define TCR_EL2_SH0_MASK (0x3UL << TCR_EL2_SH0_SHIFT) +#define TCR_EL2_SH0_IS (3UL << TCR_EL2_SH0_SHIFT) #define TCR_EL2_TG0_SHIFT 14 #define TCR_EL2_TG0_MASK (0x3UL << TCR_EL2_TG0_SHIFT) +#define TCR_EL2_TG0_4K (0x0UL << TCR_EL2_TG0_SHIFT) +#define TCR_EL2_TG0_64K (0x1UL << TCR_EL2_TG0_SHIFT) +#define TCR_EL2_TG0_16K (0x2UL << TCR_EL2_TG0_SHIFT) #define TCR_EL2_PS_SHIFT 16 #define TCR_EL2_PS_32BITS (0UL << TCR_EL2_PS_SHIFT) #define TCR_EL2_PS_36BITS (1UL << TCR_EL2_PS_SHIFT) @@ -163,6 +174,18 @@ #define TCR_EL2_PS_44BITS (4UL << TCR_EL2_PS_SHIFT) #define TCR_EL2_PS_48BITS (5UL << TCR_EL2_PS_SHIFT) #define TCR_EL2_PS_52BITS (6UL << TCR_EL2_PS_SHIFT) +#define TCR_EL2_HPD_SHIFT 24 +#define TCR_EL2_HPD (1UL << TCR_EL2_HPD_SHIFT) +#define TCR_EL2_HWU59_SHIFT 25 +#define TCR_EL2_HWU59 (1UL << TCR_EL2_HWU59_SHIFT) +#define TCR_EL2_HWU60_SHIFT 26 +#define TCR_EL2_HWU60 (1UL << TCR_EL2_HWU60_SHIFT) +#define TCR_EL2_HWU61_SHIFT 27 +#define TCR_EL2_HWU61 (1UL << TCR_EL2_HWU61_SHIFT) +#define TCR_EL2_HWU62_SHIFT 28 +#define TCR_EL2_HWU62 (1UL << TCR_EL2_HWU62_SHIFT) +#define TCR_EL2_HWU \ + (TCR_EL2_HWU59 | TCR_EL2_HWU60 | TCR_EL2_HWU61 | TCR_EL2_HWU62) /* VMPDIR_EL2 - Virtualization Multiprocessor ID Register */ #define VMPIDR_EL2_U 0x0000000040000000 @@ -171,11 +194,16 @@ /* VTCR_EL2 - Virtualization Translation Control Register */ #define VTCR_EL2_RES1 (0x1UL << 31) -#define VTCR_EL2_T0SZ_MASK 0x3f +#define VTCR_EL2_T0SZ_SHIFT 0 +#define VTCR_EL2_T0SZ_MASK (0x3fUL << VTCR_EL2_T0SZ_SHIFT) +#define VTCR_EL2_T0SZ(x) ((x) << VTCR_EL2_T0SZ_SHIFT) #define VTCR_EL2_SL0_SHIFT 6 #define VTCR_EL2_SL0_4K_LVL2 (0x0UL << VTCR_EL2_SL0_SHIFT) #define VTCR_EL2_SL0_4K_LVL1 (0x1UL << VTCR_EL2_SL0_SHIFT) #define VTCR_EL2_SL0_4K_LVL0 (0x2UL << VTCR_EL2_SL0_SHIFT) +#define VTCR_EL2_SL0_16K_LVL2 (0x1UL << VTCR_EL2_SL0_SHIFT) +#define VTCR_EL2_SL0_16K_LVL1 (0x2UL << VTCR_EL2_SL0_SHIFT) +#define VTCR_EL2_SL0_16K_LVL0 (0x3UL << VTCR_EL2_SL0_SHIFT) #define VTCR_EL2_IRGN0_SHIFT 8 #define VTCR_EL2_IRGN0_WBWA (0x1UL << VTCR_EL2_IRGN0_SHIFT) #define VTCR_EL2_ORGN0_SHIFT 10