From nobody Thu Oct 9 16:32:22 2025 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 4cjFlW0kV6z6Bk7p; Thu, 09 Oct 2025 16:32:23 +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 4cjFlV3Hfxz42lf; Thu, 09 Oct 2025 16:32:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760027542; 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=rclYMcSXw3RKY0wZ5DETj5lQ1dR1k/i3aN/eqpvFnbo=; b=mKYCKncNcpj+VHUwhbFODGSio+C5XQ1AGnkVwxiEFiBX3p0oB0gYV1lTMh3158UuTPUlPb q3fgPplGQ7ph+lqjXfKonW5v2Bnq808/sK02Ec9tnHqRC3HApzQhvwhtstB9JRPtlwkRhw B6ashCIB8WwjtESZmu+ikRGfq+ygdsCMbRVtRFqbo7FpJB/wIaTpw7mD0f9BCwMDPDZzFB j75LPYWMyuBSr4faww6AADyQrjEyuNVjtAo+qgAHwM9mpUNzBN0ZcrIocT4crHpx5Yi90E Ctlt7JEq+IQud8qRRVXumDFvl7XZI+GSyhVDDzBdpM6kUjPIC/W9khdVqV8ooA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760027542; 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=rclYMcSXw3RKY0wZ5DETj5lQ1dR1k/i3aN/eqpvFnbo=; b=L0kEb57eYCjhDwcNuEXI0jx0ymT57QvIF3HLEZE1qa9rPkuQQvWBZ0PHT0vB+InmC15tK1 iIYfHOVP7FMTJijhm720VpRXCdOABzmJ3JP0k7W0kFbeCL4CxVLk+IXMuBwVrzWI7OD3qD aysIcGZ/q1j9JdwTLtZfWeQfMTKJiJgcYlr+jt7KAgeQsRdQqOXUstRYrYtZOliJDrsT21 PmVLr1rJlQcxUkrhPTvfzLW9YWsMipfHU/K2ccNVX40dbHawThASZqhl/y7khNn5KW5kK3 D9DEqMxdOPriJk+wBDyyybRvomvbUZGbOnN3AtC/XVM1tvHJ5CPLxYHehmio+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760027542; a=rsa-sha256; cv=none; b=UNivRLYfe6bAfZgcN5aaF3+dVAU1Gz2KvYgx/PdBe8870e9M6Py83mRdHi1f7Wu9xS/Jef ANVSGbA7zBEX+j/TwvS4OrusUsQAXTU23ROxB5610fuQOn281s3X3wu5PLnnKMgInm/Dv/ xNTsEBqhXdIQIgC6aKvOsw+1y0mi8MMHtOiLkGZVaJvBNLNTa9h+YBl0bRY4zypgXjHYOI TOdpDEvj87CEzx4JVfMPOlNPlSKtPiQeuH7W5Ng2LoSDiaASN+VJ9nfQGcvOIICPwzbUXd hv5f1MYCqMz8wYbC6D3Vi094wbvu6eqolap/45st1HvocN0V4F5MFuaeYRQhxw== 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 4cjFlV2tQPz8kL; Thu, 09 Oct 2025 16:32:22 +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 599GWMkA023619; Thu, 9 Oct 2025 16:32:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 599GWMR9023616; Thu, 9 Oct 2025 16:32:22 GMT (envelope-from git) Date: Thu, 9 Oct 2025 16:32:22 GMT Message-Id: <202510091632.599GWMR9023616@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: e14f3edc16bc - stable/15 - arm64/vmm: Save dbgclaimset_el1 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 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: e14f3edc16bc6f72fe4b8e095b0c1806a5e834f0 Auto-Submitted: auto-generated The branch stable/15 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=e14f3edc16bc6f72fe4b8e095b0c1806a5e834f0 commit e14f3edc16bc6f72fe4b8e095b0c1806a5e834f0 Author: Andrew Turner AuthorDate: 2025-10-02 15:34:43 +0000 Commit: Andrew Turner CommitDate: 2025-10-09 16:31:49 +0000 arm64/vmm: Save dbgclaimset_el1 It may be used by the guest. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D52803 (cherry picked from commit 4954ec00c4200d8bfd29875fc13f541942209824) --- sys/arm64/vmm/arm64.h | 1 + sys/arm64/vmm/vmm_hyp.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/sys/arm64/vmm/arm64.h b/sys/arm64/vmm/arm64.h index f6b14e10c51b..6a4af47ac60a 100644 --- a/sys/arm64/vmm/arm64.h +++ b/sys/arm64/vmm/arm64.h @@ -87,6 +87,7 @@ struct hypctx { uint64_t pmevcntr_el0[31]; uint64_t pmevtyper_el0[31]; + uint64_t dbgclaimset_el1; uint64_t dbgbcr_el1[16]; /* Debug Breakpoint Control Registers */ uint64_t dbgbvr_el1[16]; /* Debug Breakpoint Value Registers */ uint64_t dbgwcr_el1[16]; /* Debug Watchpoint Control Registers */ diff --git a/sys/arm64/vmm/vmm_hyp.c b/sys/arm64/vmm/vmm_hyp.c index 34402d7a4f05..636247c48080 100644 --- a/sys/arm64/vmm/vmm_hyp.c +++ b/sys/arm64/vmm/vmm_hyp.c @@ -108,6 +108,8 @@ vmm_hyp_reg_store(struct hypctx *hypctx, struct hyp *hyp, bool guest) } } + hypctx->dbgclaimset_el1 = READ_SPECIALREG(dbgclaimset_el1); + dfr0 = READ_SPECIALREG(id_aa64dfr0_el1); switch (ID_AA64DFR0_BRPs_VAL(dfr0) - 1) { #define STORE_DBG_BRP(x) \ @@ -390,6 +392,9 @@ vmm_hyp_reg_restore(struct hypctx *hypctx, struct hyp *hyp, bool guest) #undef LOAD_PMU } + WRITE_SPECIALREG(dbgclaimclr_el1, ~0ul); + WRITE_SPECIALREG(dbgclaimclr_el1, hypctx->dbgclaimset_el1); + dfr0 = READ_SPECIALREG(id_aa64dfr0_el1); switch (ID_AA64DFR0_BRPs_VAL(dfr0) - 1) { #define LOAD_DBG_BRP(x) \