From nobody Wed Sep 09 14:23:08 2026 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 4hg31m5gqtz6sB2Z for ; Wed, 09 Sep 2026 14:23:08 +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 4hg31m3bdCz3KHd for ; Wed, 09 Sep 2026 14:23:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788963788; 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=2CVxSoJLQDq+tiCanFcNrMijJgLPXjlUX7ijcEghQB4=; b=ipKVjCFg2w259Me1iCfqnEs6u1Q5kKlYilzgcDWI9Pn3z0H6cfCTbCKl/s2InvYhNjc07C f/XdI/Ny4DC2OSvdaezqw3iX+8OKuorhmbBNab6zY7J/5Z8x3MhxVagGgx8yQiRr5Juws4 3NJJe4bo8gphJ34pCcfzF7UnGv8/0ypxhsw/NewEXKWwvotVnBwlu9yJgzli6jD5hzyE9e pomOrQ7/s364v4H4QWdMB8r2cqUBXmeiFpkZ/wNUpeCNEkTgiYqGI0F3W6vnsDJynY6nUt NxmcM9eDHBtMqPaH1ZPibXqDxPLc8VcJX+0sT2cjXMHHJ1cpGied8Qi4JFnkdA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1788963788; b=x1eI7KC54V27kBT55LQ3WRoZ5ruEAdHn+o23mVsX4yBYinGOND0VfBNsOewM/vO5iM0vIW dIXVrA93CgXBVtukgql7w9FWH/d2sorYBD3mtqkZTq76NsCJGAlF6rKDmuVsTxkMI7aHqE yu2qrJVdLdXfOCag3TM6SYX4KLowKIzlbOkHJ5jx/5qCSRsUbUor9Os5YRmeUld4tMOsbr yabcWYDkCMjxQTH0qVjVHM7ymqQy2xErCqJNGMPfIUUHC415DE6GsFhUDJbyQlgj55WsRM z0Tfn7CvUF9zvvTOEEsadkt7Z67us2ODraMFKTGqGR505I0IDVRfrCFwnCkidg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788963788; 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=2CVxSoJLQDq+tiCanFcNrMijJgLPXjlUX7ijcEghQB4=; b=lsL6S6ZBl8IwPFsAKL/WS+KWpcG53bFJ08Y48uaJXhLZk3Bv9/q74Mpugha5IeuZ7vMLum BUHN4IE8UeTIwc6IYNYChqDsDEamcsDzmGIhkQ3LsMIqUJLSYk0qstQb/oKu+PATNzoRiz bV6sK+DDPcY6AEF7nRBlpgCKItMH4UW54sWH8CpNUEHvSeExr3cErqK4/efGeLTp+XO0Zn qGtounovwEZL1Lb487PXlzQLGcHEaazxg/wk8Y3TaTPP7r5I+fHGBOA3/d36DvfUEe1NEL 2ZF1M4nAQz1YPnINEST+qW3oRuVYw4gYd8qeUUWNbJERa7/pn/IsKOkHScRlVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hg31m2fqJz11FQ for ; Wed, 09 Sep 2026 14:23:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 479ed by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 09 Sep 2026 14:23:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 93a08bf12cf5 - main - arm64: Move the CNTV_CTL_EL0 fields to armreg.h 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 93a08bf12cf501d03f9938fb813466525b708eea Auto-Submitted: auto-generated Date: Wed, 09 Sep 2026 14:23:08 +0000 Message-Id: <6aa16bcc.479ed.7874583f@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=93a08bf12cf501d03f9938fb813466525b708eea commit 93a08bf12cf501d03f9938fb813466525b708eea Author: Andrew Turner AuthorDate: 2026-09-08 00:00:42 +0000 Commit: Andrew Turner CommitDate: 2026-09-08 03:05:27 +0000 arm64: Move the CNTV_CTL_EL0 fields to armreg.h They are architecturally defined, so should be in the common location. Reviewed by: emaste, Kajetan Puchalski Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D59181 --- sys/arm64/apple/apple_aic.c | 3 --- sys/arm64/include/armreg.h | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/arm64/apple/apple_aic.c b/sys/arm64/apple/apple_aic.c index 683339369a87..932571b1ec85 100644 --- a/sys/arm64/apple/apple_aic.c +++ b/sys/arm64/apple/apple_aic.c @@ -93,9 +93,6 @@ #define AIC_FIQ_VM_TIMER_PEN (1 << 1) #define AIC_FIQ_VM_TIMER_BITS (AIC_FIQ_VM_TIMER_VEN | AIC_FIQ_VM_TIMER_PEN) -#define CNTV_CTL_ENABLE (1 << 0) -#define CNTV_CTL_IMASK (1 << 1) -#define CNTV_CTL_ISTATUS (1 << 2) #define CNTV_CTL_BITS \ (CNTV_CTL_ENABLE | CNTV_CTL_IMASK | CNTV_CTL_ISTATUS) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index d8d695a39477..386869d6024d 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -314,6 +314,9 @@ #define CNTV_CTL_EL0_CRn 14 #define CNTV_CTL_EL0_CRm 3 #define CNTV_CTL_EL0_op2 1 +#define CNTV_CTL_ENABLE (1 << 0) +#define CNTV_CTL_IMASK (1 << 1) +#define CNTV_CTL_ISTATUS (1 << 2) /* CNTV_CTL_EL02 - Counter-timer Virtual Timer Control register */ #define CNTV_CTL_EL02_op0 3