From nobody Mon Oct 21 15:05:06 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 4XXJWk6fDWz5ZNw6; Mon, 21 Oct 2024 15:05:06 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XXJWk5NtVz4fDq; Mon, 21 Oct 2024 15:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523106; 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=MktgX0QqmvEtNr+RjbQi58ZBP4ZG/Bh+G4tFVSKiVcA=; b=SMt6tPza3n11KDsQYB8I2mOQ2AOY6Un6SdC/MfZ8osaziUhhSyy+lFxpfBvcORUHLp1kSE 3ZPFL3TJnD1miu6oNDDggLqqlMc4RyPQwYkyPvZLtwUktzsL2izuwtsc1NwY+wCMKYsQ+r vwHyHdwHoEHm3SN6gNg5O9CciKkyrhBdONWWF/ytHdVj5Vzk/xIPlQvZzhfGA5KtDZTQT7 ukEPdFg/Hab2xqfqVm5/01Wi6ZPz1C457oCVG9+UdT7yNFrHHTY/X5TIwtRN0bX8yykKwG 0jIqGt6iRm2KC/DP68xhDoYTeQFNfbkNe8EOpP2OzBNo1DRk7hn/zB2HArfASw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729523106; 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=MktgX0QqmvEtNr+RjbQi58ZBP4ZG/Bh+G4tFVSKiVcA=; b=IRtAFlkGn1iaTkVgb21XGjtxkaNFUCuraIMCQqXqhA+lULycoKZet9y0wnQlx1GwxS3Dye YdBw5x9wj98x+jUxP8BK3An1L3jFWww0eKDbE/glsoIpwj1TKQAnAxh6zMZvoMU7ylLGk+ GhiO078GJvLgvfzwsLPQbfh3XGF0W4xmcysWYaVJVqVU2bO/gdrjhgBpybUZQGu8Axm3d4 lUCUZu1laQSaslgW9qpica59CXNE3Fp1MPEtGAvdbBaf5OYGotIl0QLG4Y1ShS24jiH/4W 11W0aLkIsKvvrfY7+X21Ywzg9WrLq7BfHrCBsVQfeX1Jjs/Ewg9+zBWb2Z7uqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729523106; a=rsa-sha256; cv=none; b=eSSdG69MmOua2L3KYS/vP8sNH9hOGF9nE7MxVhZzQM+x1JDGMsysnKpf6RQLWZ4U3kg7NG zJwvRUdATF9GRh660iiOVAqvPYilZvTRpHslall5dAyQm7eXH2QK+teSrUbj0++IdSJ/Jf TreYfzGOfdiH1XLk2Jm48vXOkvtzSRvLp+qiLGHwOr5hoOUszwurH+gkN45NmbDYgWZzk6 wBxpnPYyCEha7gqFpaVuof2SgjvdGhnZuPoRgKovV5Os8BpQdI4vVtBGDWByjmp7ZCKQ+N YEJfnz02p9844pH24ysEZOtcZxzbgE/pHuLeSqR6gF5rxkghT1RjQudIvy73tQ== 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 4XXJWk4xbQzZjk; Mon, 21 Oct 2024 15:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49LF56wu046759; Mon, 21 Oct 2024 15:05:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LF56bk046756; Mon, 21 Oct 2024 15:05:06 GMT (envelope-from git) Date: Mon, 21 Oct 2024 15:05:06 GMT Message-Id: <202410211505.49LF56bk046756@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: 2db6ffac2497 - stable/14 - arm64: Adjust the indentation of CPTR_EL2 values 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 2db6ffac249731a6ffc10cbf4072d850d5d7e274 Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=2db6ffac249731a6ffc10cbf4072d850d5d7e274 commit 2db6ffac249731a6ffc10cbf4072d850d5d7e274 Author: Andrew Turner AuthorDate: 2024-09-11 09:38:08 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 15:03:26 +0000 arm64: Adjust the indentation of CPTR_EL2 values Reviewed by: emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D46513 (cherry picked from commit 7a488d83b3af4d59946319b251a3a2060f18df40) --- sys/arm64/include/hypervisor.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/arm64/include/hypervisor.h b/sys/arm64/include/hypervisor.h index 49689347d399..602436d2a725 100644 --- a/sys/arm64/include/hypervisor.h +++ b/sys/arm64/include/hypervisor.h @@ -49,14 +49,14 @@ /* CPTR_EL2 - Architecture feature trap register */ /* Valid if HCR_EL2.E2H == 0 */ -#define CPTR_RES0 0x7fefc800 -#define CPTR_RES1 0x000033ff -#define CPTR_TFP 0x00000400 +#define CPTR_RES0 0x7fefc800 +#define CPTR_RES1 0x000033ff +#define CPTR_TFP 0x00000400 /* Valid if HCR_EL2.E2H == 1 */ -#define CPTR_FPEN 0x00300000 +#define CPTR_FPEN 0x00300000 /* Unconditionally valid */ -#define CPTR_TTA 0x00100000 -#define CPTR_TCPAC 0x80000000 +#define CPTR_TTA 0x00100000 +#define CPTR_TCPAC 0x80000000 /* HCR_EL2 - Hypervisor Config Register */ #define HCR_VM (UL(0x1) << 0)