From nobody Tue Sep 23 17:09:34 2025 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 4cWRKq1ttnz68tWN; Tue, 23 Sep 2025 17:09:35 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cWRKq0FgRz46lQ; Tue, 23 Sep 2025 17:09:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758647375; 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=5HqPwY5yd1XfX0HxzGtYa+kfY7mpm4X69mfSV5epuc8=; b=XSUFh98zfCpiyyUNuRqoIdCpir+8X3Y2uskgdyhLyXrnzprbDrJHXoTo1bG8QfXCkpQFQI geLictALpVNna8GXQR4+Az9VAaCfMSZL3NFNm9Mivs/knVDK5vIXshZVimmzKE7JhRAZ4J w8b4AH/oIR4/c1oDggYzcespLN1YXntwdI5KoFDhVfq3BE9LcS+MJkRbGB6kqFk06pSfqe xLzSqsvMt8Qxrfc+xDmSX3ikCcd+wXImeHe7C5LStuIUmwIjmdvWPlqiS7wX7XgSWicxFt PIWbUF56KllM9XkzAbWPqJFLShdpQp0B9OMOMGzeKcpshUWYSMIyOuW71+NhOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758647375; 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=5HqPwY5yd1XfX0HxzGtYa+kfY7mpm4X69mfSV5epuc8=; b=Sd32lb4OpA4jQh9GOVsrkLKdzX6tstYBaxHVP7HDTOY0UX8pDdOyFiqxVPlpdNhXmdAzeu IcMOCUHSdlhl0Ut27DoEfnh/8EskAqh2G9Z0jFJPlunKMolTyzi92xDZTX9xScb6vHfyKQ XqjwMPmX+OBGJl60BwYnjXNLaoY9zLK4EdJ787VshzmwolSHU+hzhES/Tw/Tkf5srJt+CE J9HG8TE3pv8xKfum5d4PhurMn43m8EwJicerzQrRTV3hZdat9c3oTrq1lgJABOrLdZdxVv D2tOnKAyXVjVYuqO3fIA61wkhyM6Ldvw5ZyvXmRa9ub9cjJzrzjzuQEHo9slMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758647375; a=rsa-sha256; cv=none; b=CL8NwpZdj585R8fN8jEOz1YNjMwQEtN0dPncNFQ7QseqFWvxcwTKHiJphTvZJ7EtBlFqXV gFm5wpQDO32hJXtwF1v315C9+oeWFDM6YC/F3iFKgvGNqZhe53yoCgrvfzicrYESnXTe7e jD4mbvADucQTSc5F9Jzc6QcmY/eOGROfyL/9hhcIiOY6RBJByndCXLdbAf+P3t0FLE/OSC qBEN5ahQi5CVk0t6mtCrW16fvB4Xtexj2bvL+3ys7Pb6zhEUoauuJUXVklISckxg3lUXKw HvdjD2NYBfqz/6Ix92m7ZUTiRb5MajkNCJW1KhZ05tHQXMyruODbz4tnwbAiHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cWRKp6QlZzvSC; Tue, 23 Sep 2025 17:09:34 +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 58NH9Yw6077289; Tue, 23 Sep 2025 17:09:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58NH9YwQ077286; Tue, 23 Sep 2025 17:09:34 GMT (envelope-from git) Date: Tue, 23 Sep 2025 17:09:34 GMT Message-Id: <202509231709.58NH9YwQ077286@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: b3d30be6ed71 - main - arm64/vmm: Remove support for reading CNTHCTL_EL2 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 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: b3d30be6ed7108b97ed628f7ec9497a112d49fd6 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=b3d30be6ed7108b97ed628f7ec9497a112d49fd6 commit b3d30be6ed7108b97ed628f7ec9497a112d49fd6 Author: Andrew Turner AuthorDate: 2025-09-22 17:08:14 +0000 Commit: Andrew Turner CommitDate: 2025-09-23 17:08:36 +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 --- 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 70bb914d68c6..fa13fc76677a 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 475ad79f63cc..6bbf0d7eb730 100644 --- a/sys/arm64/vmm/vmm_hyp.c +++ b/sys/arm64/vmm/vmm_hyp.c @@ -615,8 +615,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);