From nobody Mon Jan 23 12:37:41 2023 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 4P0qPf4Ypnz3bT7y; Mon, 23 Jan 2023 12:37:42 +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 4P0qPf14Bjz3ChT; Mon, 23 Jan 2023 12:37:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674477462; 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=JSxvO2p0euzX3TILzLsSwb3/oq/IHpRco7A/uIzV+XE=; b=XsnXSNcmTyirlaK6VqHl1s1XYsDhluxSJZx9llx0vv1jBIuTJ8oFUB6i3TaHV9+eyZarE7 iwHJU3UcfVnA4FXvxyfwH6SIWxsGDR110dqlnEd4N8RtCYHTLzsin8MC8zUSkV7ZAXmLuA 6mBg+ojzt81KmMedRsxLeBLqsyMYKvYQ+Twr61ZUXxMyjNShYNyMqJLMt7N2G81EX8b+VD fl6nc5qpCzgWafIG39UrkYgSJB33oW+zndsm7H2K39MOXop35xMkkYi3zZbf8/L/ZUGr/a QIc/G5nVBIG2jWVd55byAtVBS+4Y/UtFHKnBKopkycO18lDpdrklDYW/UR0nxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674477462; 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=JSxvO2p0euzX3TILzLsSwb3/oq/IHpRco7A/uIzV+XE=; b=GubLooJKPH2CntxZluQtxdXugcA2HlUCBB+vj8l0XvpGbe6wgUfLnsAAMY0RZuLQDURq8h DMIS6rKqBfIPGFGdRVhfWedJ6NGthEuLhloFtp8MXftzGIG3MJJzpfXE1ScwQt2hrcMx4b i62P/vuN/BeYENa5yK/6Ms7f8ydHrg60W/I+hRgCr17+5kBTfxeHVTG+XYkLMf9o0j3BZE LFCfKtx/nSHIdq/RPlu4a+v5RtIZsUU+a4XM72nHbCpDqaF6PUyL6BvRU6mP1ndx34i3Wa EykMfPWaD2xEWjRvTKL62E64f2Qv4N//tU/7y7dxq+q+pbrwJs0VZURr3bYm1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674477462; a=rsa-sha256; cv=none; b=CUO9UeFVlwsEF53k/0I2RED4bLuNxwR97TDWw8NT+Sm2P7wyxA++/tr+zW5BHOJX2qxQ+K W0UMkzgPjJLGKl7tcs0/Z/6fyHvyzcFQp51RSObMjKsf1dOr4FSzsU852Fkgha4OLbUD3h iKrDg+ijT27hHFe4838ZFui/SMnL+l9SkFgZfs2LppkhcNt4w/dJGMACOwIq2BvcYYUlwR 0h1XSIBF9MABQD2eTN+CdUTZ2zoOaPyUCdWz2nJIVzqecgrr5YaFpZ/e5Qg4WAT4Rk8Ald 0AdIE0N7RMmNkhrhE6/LJBtIGRZh5f5UxLfHip3C/ggy9TTyxMaAqCGuA2CVRw== 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 4P0qPf053szVDZ; Mon, 23 Jan 2023 12:37:42 +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 30NCbfCn085449; Mon, 23 Jan 2023 12:37:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30NCbfm3085448; Mon, 23 Jan 2023 12:37:41 GMT (envelope-from git) Date: Mon, 23 Jan 2023 12:37:41 GMT Message-Id: <202301231237.30NCbfm3085448@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: 7fcb2a0b7932 - stable/13 - Add more arm64 hypervisor 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: 7fcb2a0b7932f01804a79a7cbb8b09180c16720e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=7fcb2a0b7932f01804a79a7cbb8b09180c16720e commit 7fcb2a0b7932f01804a79a7cbb8b09180c16720e Author: Andrew Turner AuthorDate: 2022-11-14 15:42:51 +0000 Commit: Andrew Turner CommitDate: 2023-01-23 12:36:28 +0000 Add more arm64 hypervisor registers These will be used by bhyve. Sponsored by: Innovate UK Sponsored by: The FreeBSD Foundation (cherry picked from commit 2468c61958f5e50927775f0611b44402a461840d) --- 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