From nobody Tue Jan 13 16:27:18 2026 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 4drF5M1cmmz6NMcS for ; Tue, 13 Jan 2026 16:27:19 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4drF5L6LJxz3Kbf for ; Tue, 13 Jan 2026 16:27:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768321638; 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=ueA2bOzlxnT5cRXwEFenjUZxFOrioxmsd2PobAwIqMA=; b=DwzJJTjSmd0QeaxoTOkjE7SNAsbhNrozA79Vxjhli7f6CJ7cQwgWwKweSaCH7L/hdpM8Tx t+rn9oVAuyZh4pBkMtWYagBIXI2u59At4J7M+mFQ/Om1bWtRsvevFmf7srIRwkc4CxyMD0 XVxaiNYKNKzW0pncEJoaFMFumUOSg/MYU9MVwnXzVoJDeZ5mjJym3AHLSn2Or82aDt1S4s 90odyJ+GXCXta6knnQaeWlkpHm4TOtcrI2w3xWEO8PDURkwGu0Vqq7RV6CLfOZN/1QKIWb qSXbUBYobXt161BTkRl25eCImyTGdAJ1cDkA+PbC23JIYA5cB+Vy2k3VqEt16w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768321638; 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=ueA2bOzlxnT5cRXwEFenjUZxFOrioxmsd2PobAwIqMA=; b=bXt0GbpuE+GNhlaQjPkZFqrVRpGyvZDE5l7i/qAIUNIRZDKsz6dA6N7M7GJHs8I73Hobol Ba7ApfF+0cmiNnE3VmzVLGz2UGhCiZ6F8mA52WTV4lj0yhYqPvuYoQuHodCjqJTRiNKLZK 638rrvVwlA5rqjRKUCYUrMnk0pTOKgiN0QNK77U6JMu43AhVzAO1MEFhjazUkDlwPTqJY0 zXVZgbMSabmjqctRYY5RMu2Bl2oaCHyZaEpHZ7cCV6mSregLA1hyuL8HV8N8eV2eedM50K jPZGd/ziDr/+KsV/RR07tSJHa4kstf/7Wcz/wzdIMz9kpwqdUeigOuMlXuTp7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768321638; a=rsa-sha256; cv=none; b=b5TDxoWa/yePK+dkcdfOX/ggIGAd1zSibabszHwqRxVySkdzN+2ux+PZyBu04FVxKnVH7i 42CT3SpJcKdkblwuDbym9f8IrHG4rLYpsdft6B8eYPNc1jePL+8gEuUN/W49iJKk0V3wH9 J/x4pVTowCVgP7WwDNySOtqoFW24hcPIAnZjLw1FsS8xOXh9oKbrbCS7UQ+nJ5w12z/IaO SpzszrwIi4WzdtjxOc9fCZUKx8QyBSDQOlrq9PBWyD07FzuOSjE6A2qUc1+OVBFG6I+CAa rfdfQgS0gIuYps7N2zwYaREiVIhjA5nJ/yR6HtVA0O9oo0zpTS4Ru6ZOMe7h5A== 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 4drF5L5vc4z4P5 for ; Tue, 13 Jan 2026 16:27:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3050d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 13 Jan 2026 16:27:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 2b22c6f9cdf6 - stable/15 - arm64/vmm: Remove support for reading CNTHCTL_EL2 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/15 X-Git-Reftype: branch X-Git-Commit: 2b22c6f9cdf6c32dbdc905d746f42281a315adc4 Auto-Submitted: auto-generated Date: Tue, 13 Jan 2026 16:27:18 +0000 Message-Id: <69667266.3050d.1f4fa4d3@gitrepo.freebsd.org> The branch stable/15 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=2b22c6f9cdf6c32dbdc905d746f42281a315adc4 commit 2b22c6f9cdf6c32dbdc905d746f42281a315adc4 Author: Andrew Turner AuthorDate: 2025-09-22 17:08:14 +0000 Commit: Andrew Turner CommitDate: 2026-01-13 14:06:18 +0000 arm64/vmm: Remove support for reading CNTHCTL_EL2 This is now unused as we just set the register value directly. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D51818 (cherry picked from commit b3d30be6ed7108b97ed628f7ec9497a112d49fd6) --- sys/arm64/vmm/hyp.h | 1 - sys/arm64/vmm/io/vtimer.c | 5 +---- sys/arm64/vmm/io/vtimer.h | 2 +- sys/arm64/vmm/vmm_arm64.c | 4 +--- sys/arm64/vmm/vmm_hyp.c | 2 -- 5 files changed, 3 insertions(+), 11 deletions(-) diff --git a/sys/arm64/vmm/hyp.h b/sys/arm64/vmm/hyp.h index 0b2977c73960..0c8d0fb28b18 100644 --- a/sys/arm64/vmm/hyp.h +++ b/sys/arm64/vmm/hyp.h @@ -80,7 +80,6 @@ #define HYP_ENTER_GUEST 0x00000002 #define HYP_READ_REGISTER 0x00000003 #define HYP_REG_ICH_VTR 0x1 -#define HYP_REG_CNTHCTL 0x2 #define HYP_CLEAN_S2_TLBI 0x00000004 #define HYP_DC_CIVAC 0x00000005 #define HYP_EL2_TLBI 0x00000006 diff --git a/sys/arm64/vmm/io/vtimer.c b/sys/arm64/vmm/io/vtimer.c index 51b21110d42c..ddc9e6e840a5 100644 --- a/sys/arm64/vmm/io/vtimer.c +++ b/sys/arm64/vmm/io/vtimer.c @@ -55,7 +55,6 @@ #define timer_enabled(ctl) \ (!((ctl) & CNTP_CTL_IMASK) && ((ctl) & CNTP_CTL_ENABLE)) -static uint64_t cnthctl_el2_reg; static uint32_t tmr_frq; #define timer_condition_met(ctl) ((ctl) & CNTP_CTL_ISTATUS) @@ -111,9 +110,8 @@ out: } int -vtimer_init(uint64_t cnthctl_el2) +vtimer_init(void) { - cnthctl_el2_reg = cnthctl_el2; /* * The guest *MUST* use the same timer frequency as the host. The * register CNTFRQ_EL0 is accessible to the guest and a different value @@ -129,7 +127,6 @@ vtimer_vminit(struct hyp *hyp) { uint64_t now; - hyp->vtimer.cnthctl_el2 = cnthctl_el2_reg; /* * Configure the Counter-timer Hypervisor Control Register for the VM. diff --git a/sys/arm64/vmm/io/vtimer.h b/sys/arm64/vmm/io/vtimer.h index 71a20344d05e..92ce025968d2 100644 --- a/sys/arm64/vmm/io/vtimer.h +++ b/sys/arm64/vmm/io/vtimer.h @@ -66,7 +66,7 @@ struct vtimer_cpu { uint32_t cntkctl_el1; }; -int vtimer_init(uint64_t cnthctl_el2); +int vtimer_init(void); void vtimer_vminit(struct hyp *); void vtimer_cpuinit(struct hypctx *); void vtimer_cpucleanup(struct hypctx *); diff --git a/sys/arm64/vmm/vmm_arm64.c b/sys/arm64/vmm/vmm_arm64.c index 8e3d8d5220ec..3736e8406712 100644 --- a/sys/arm64/vmm/vmm_arm64.c +++ b/sys/arm64/vmm/vmm_arm64.c @@ -238,7 +238,6 @@ vmmops_modinit(int ipinum) vm_offset_t next_hyp_va; vm_paddr_t vmm_base; uint64_t id_aa64mmfr0_el1, pa_range_bits, pa_range_field; - uint64_t cnthctl_el2; int cpu, i; bool rv __diagused; @@ -444,10 +443,9 @@ vmmops_modinit(int ipinum) vmem_add(el2_mem_alloc, next_hyp_va, HYP_VM_MAX_ADDRESS - next_hyp_va, M_WAITOK); } - cnthctl_el2 = vmm_read_reg(HYP_REG_CNTHCTL); vgic_init(); - vtimer_init(cnthctl_el2); + vtimer_init(); return (0); } diff --git a/sys/arm64/vmm/vmm_hyp.c b/sys/arm64/vmm/vmm_hyp.c index eb066e23363b..7b5968cb4fb4 100644 --- a/sys/arm64/vmm/vmm_hyp.c +++ b/sys/arm64/vmm/vmm_hyp.c @@ -626,8 +626,6 @@ VMM_HYP_FUNC(read_reg)(uint64_t reg) switch (reg) { case HYP_REG_ICH_VTR: return (READ_SPECIALREG(ich_vtr_el2)); - case HYP_REG_CNTHCTL: - return (READ_SPECIALREG(cnthctl_el2)); } return (0);