From nobody Mon Aug 24 14:46:30 2026 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 4hTDJ73tz0z6pTd7 for ; Mon, 24 Aug 2026 14:46:31 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hTDJ70kB5z3jy4 for ; Mon, 24 Aug 2026 14:46:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787582791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MY92BXmWD0f2q662l1YXSX2MXl4ruDfwMzrUqaIPiWY=; b=aPytWd6GpJNaifirzftBJQA44nQVfnHKTpkv4uS3x5Gx8qNr9+1PwwZ8XoW13evMeDyA3J BT1v1CNOPtsRPBchTJ7l5tRJ9NLzMO9E4zgDuZxggVdrVRTHpEfncRK+2qCUHgt/BHZ4bn eTWX2LQYgg/ok7O6SRpT5zaRY+kFJOosIxFJZY84o506+KMwFw1+2G+YFsw3UD5jeEC6sE 8hB1DrIYIZj9xQkbka+2zBpYDsGmgyTvos4IPnmDpb6CpRo7GxH1F9HR6mosEPjvK0FmIH vWodknPtYwayIYXa4BpF2vo51XDTacg54Qq7P2KICXbx91qLxqLMjcNBO1TqnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787582791; a=rsa-sha256; cv=none; b=um+CXWH+ep9+E3EQZRonBXd+UeiLpWEGQ9XRxxxBYuBIadSFKM1rEmsVSKm6jrJjLYBJRT gQJINQJyW7RRMi5dt8RLxSc2fhATlWSShw0TB/awnCpEx5vzOwX9W2WHqBvQ1keyyYhV4M FNVWqNFXStgv5FaGGaSWkY4SRq5LntEwIn1XIO4l3OZq46GhvtmPBKFUpeehptOy3zoBAu jSdiB2DIkLAN5tZVHopYqZO5I/AhdyBPhyPtP4ZzMvNRMRbhMRVG1vBGSWu7Yk7vPIZyc0 q3Uu3qEhESWm1TObD7LmOb5dG7xyquf5npL4IXpleRjUauN0/7iIfIA/5gJ7sw== 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=1787582791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MY92BXmWD0f2q662l1YXSX2MXl4ruDfwMzrUqaIPiWY=; b=mPF/RnDG3IjluOVXDEfrjwkIr/4rJ/tfus1MU+fUs2Fot4JvS2DHbUrvJ3zT2f6y25L6P/ U4DM13VwttMqOICKT4RePp5l5omGeGKPns7nRpKWJFSqymepCX5NjpTTmZJj0lJ+nw1tMK uj6Gxt+8FDYWsNzxA7ztEUtcqTL/v8hUiwrefoAu1a975JohNYmNe+tJZhzoha3AEGVju4 VWQqI3uGLrl0QcWL5mZ+G8ITDBYR+bUYfwfjKxwFONQgqydnQd2H24QOL+uUjmq+OCSqXv Zf08bzG6gehYV9vfD12IkchPGY5jCF9Ihbw5bHPJ3G9c5IKm5IwqYlnZSF279A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hTDJ65m6pz17xk for ; Mon, 24 Aug 2026 14:46:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46558 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 24 Aug 2026 14:46:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Kajetan Puchalski From: Andrew Turner Subject: git: 4b337dff0152 - main - arm64: Fix CNTHCTL_EL1PCTEN field definitions 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 4b337dff01528754648ae03a7cee8e94966ec1b5 Auto-Submitted: auto-generated Date: Mon, 24 Aug 2026 14:46:30 +0000 Message-Id: <6a8c5946.46558.6c28431d@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=4b337dff01528754648ae03a7cee8e94966ec1b5 commit 4b337dff01528754648ae03a7cee8e94966ec1b5 Author: Kajetan Puchalski AuthorDate: 2026-08-19 11:19:38 +0000 Commit: Andrew Turner CommitDate: 2026-08-24 14:45:19 +0000 arm64: Fix CNTHCTL_EL1PCTEN field definitions Fix the non-VHE register field definition of CNTHCTL_EL1PCTEN to use the correct non-VHE shift. Signed-off-by: Kajetan Puchalski Sponsored by: Arm Ltd Pull Request: https://github.com/freebsd/freebsd-src/pull/2378 --- sys/arm64/include/hypervisor.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm64/include/hypervisor.h b/sys/arm64/include/hypervisor.h index 0b6492785a0a..4fd6cb2bab55 100644 --- a/sys/arm64/include/hypervisor.h +++ b/sys/arm64/include/hypervisor.h @@ -40,8 +40,8 @@ /* CNTHCTL_EL2 - Counter-timer Hypervisor Control register */ /* Valid if HCR_EL2.E2H == 0 */ #define CNTHCTL_EL1PCTEN_SHIFT 0 -#define CNTHCTL_EL1PCTEN_MASK (0x1ul << CNTHCTL_E2H_EL1PCTEN_SHIFT) -#define CNTHCTL_EL1PCTEN_TRAP (0x0ul << CNTHCTL_E2H_EL1PCTEN_SHIFT) +#define CNTHCTL_EL1PCTEN_MASK (0x1ul << CNTHCTL_EL1PCTEN_SHIFT) +#define CNTHCTL_EL1PCTEN_TRAP (0x0ul << CNTHCTL_EL1PCTEN_SHIFT) #define CNTHCTL_EL1PCTEN_NOTRAP (0x1ul << CNTHCTL_EL1PCTEN_SHIFT) #define CNTHCTL_EL1PCEN_SHIFT 1 #define CNTHCTL_EL1PCEN_MASK (0x1ul << CNTHCTL_EL1PCEN_SHIFT)