From nobody Thu Oct 2 16:22:11 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 4ccxs02pTLz69TDq; Thu, 02 Oct 2025 16:22:12 +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 4ccxrz67n5z3bKb; Thu, 02 Oct 2025 16:22:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759422131; 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=F3+cecWxAAxSh/X8Rg72VsPtalodUY/musilJ4hV/tQ=; b=Q+MoSqruGuQvKwpQciMbtHSIHSWhZSAqfmV2MaX5RYdJ2RIXGL6ETtI6efbeVHSsbbCxdB lV0j2oY2yQ8gWPxasJiqWaXLZTEuDZvtjg7tghThpabh3bfg6SpaEk8tVrRabRNJa3hNym t268mDlbC2JDyhO8zofILhwji71iQcgvuQgUpJweeWTCsfAe2kGoolTzkE8W8xALhiB9Me dNBrBWOlsysjPM5gnj5k/N2zdwVyJbmB7cPTRrOWYdtigYe6es3igj5/IC3lmPaGVX/2e1 y0hHqbLWBXQOjienJgI/dFnkkWkUcZrOXSlvwr8F1qHs8rFoKTO3qFNYyJt16A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759422131; 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=F3+cecWxAAxSh/X8Rg72VsPtalodUY/musilJ4hV/tQ=; b=DshiAOZ+exOiNpv3UxdVTBIErt66gHx3usTxu1cDtHx8s79HUqyOaE79dGXp7Qdo/XAvYA jYqPq6lTjyama7lSVp8SvVv07RwvvgPaAn1o7Lgs+hd9RqfUoQLowoSmfpWBNZI7wVcbnX 0PC/mAh0/+8W2uZUeki6L11Ve2yDvnVaPl6vIcJPmcXXvM768/AdwHK99cM/nNKjh1aFM6 t2b4rR9eqmdncIcntv6C9M61hxSnTQaMoPVzPu4a1hNZU77cJNwscHkcqSyI7ooEuc1OeI G4E749xb43brD2E/TYdE2M1KoRSO0bgbY5UOW8Z0z2nwOq8h8J1Ap1TbZDYUwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759422131; a=rsa-sha256; cv=none; b=x7QymwkO/uhJM2FOoNWZ3DGyEJJyTLx5+SA868sz60P5Sw8TKm5I3U/w+yqnuqFccDytwE x4o+RvnGEeovs7Xg5Wkgc6c3Dw+9vZnzFxnuy9gBcliInmobrVyVMNy0lAkJXTYCZ+aI3Q xVqKlNuAj4FA8G2kb8mB6FGZQbCV/YYCXkoYaDVkf3gH0543N2mOeYQrCluFxui3TGjGfz mC4NXHG1oYwBMdTc4s3esmEQGBsb4kq4zfKPGGmKx4GR5PqoCerKLTeWGAqAofAi+tvilb 4XD4st9XoJyNujDQwmKnP7s8R8nUScKduqJkXvOxnxhOVj8D3Ouo/8dGcjVq4w== 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 4ccxrz5l2KzhL; Thu, 02 Oct 2025 16:22:11 +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 592GMBn2066055; Thu, 2 Oct 2025 16:22:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 592GMBr3066052; Thu, 2 Oct 2025 16:22:11 GMT (envelope-from git) Date: Thu, 2 Oct 2025 16:22:11 GMT Message-Id: <202510021622.592GMBr3066052@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: 4954ec00c420 - main - arm64/vmm: Save dbgclaimset_el1 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: 4954ec00c4200d8bfd29875fc13f541942209824 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=4954ec00c4200d8bfd29875fc13f541942209824 commit 4954ec00c4200d8bfd29875fc13f541942209824 Author: Andrew Turner AuthorDate: 2025-10-02 15:34:43 +0000 Commit: Andrew Turner CommitDate: 2025-10-02 16:21:33 +0000 arm64/vmm: Save dbgclaimset_el1 It may be used by the guest. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D52803 --- 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 29279f16d151..334b795832a3 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 b7a621c782b7..b8c6d2ab7a9a 100644 --- a/sys/arm64/vmm/vmm_hyp.c +++ b/sys/arm64/vmm/vmm_hyp.c @@ -121,6 +121,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) \ @@ -394,6 +396,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) \