From nobody Thu Oct 9 16:32:27 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 4cjFlc499Kz6Bjr5; Thu, 09 Oct 2025 16:32:28 +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 4cjFlc0r3jz43FW; Thu, 09 Oct 2025 16:32:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760027548; 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=GlrmDbtAYi1lY9ed1CrDpvYTQR30ECxJyUgXr4upqPw=; b=PXMMqp3jzxKt8K3ysyumpHuHrGt1CajOPjYRs7D2yVorywsG2d4hVjqWgd6wUWdAytAK+O XBcbbxAIsvSRdfQ4NKASjcSiDL6mRD+F+UKC0Di2smc10C/b5fKamx3qOmUmgeZpdgwa8h AKJ6HW0kImSFrSp9QOCIEM3L7blDc0uL4KSyw3zbjoYbnD1F9iQD3CHDJzerbCjjBnFkU2 RlxhPlhG5E49XcRHXzsoXs2Ulc3IhbJgRNBWaY2X9JS5ep9cNkzeXis//axsha0ZSpDCyd +YJlSIOoKf8OirtYn3Bd1aOSsHxZzrLlDJpcS7ary7x7W2T06YOfZVd1v2nQ+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760027548; 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=GlrmDbtAYi1lY9ed1CrDpvYTQR30ECxJyUgXr4upqPw=; b=c5YFN95mUZUU00257az3ZuPsHuySmltCtQ/AyDnKPhzcpUw8RDioOkplIR4AhgwVc/pUBG N5LppWKJqoNLoUS63jj1K6sFrSEuwNu6y9W54QVOxvtq/qoeXB/3NbuQlTMN4eXFpfg+Xh 8DAR3RHQ70Oka8/HoxZj7TbE+f+Zaj2H24qLR2ZVs5UpiPmo+hTcaGN3Ds+5HspPIyZ8W4 0bquLHKQDbLUAy10zGDOv8GiAXV2xkPFXWCCP2MRqe76onlnKUY7i3coc1UrmnSxG73dsi U+09i3EEdMqJ35k9s4ZDwpEiAStjgFV+UGgdxbqf+QFICGDuSnji2slA2XJHSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760027548; a=rsa-sha256; cv=none; b=b76oWLYBcV3xfLRYIveoq4swseld/0XflAWNpxmSaFW54HjR2acMyhT0Ej1977wYIVMceV dERGuTydH2Ko5+guxdQw/Rm3ClM2CewPB1buxiM8UeH7Uyw5Is9vUebPWlwwDvSJZBMt2M fXTgqbw+z0aNKBlkAHkFsKuRBPEXif0qeAWrBKR7B79W+Ft4B4R/FovU2eZ6cv8qA+lCAi sTcEjvbaWXQskS44XGSUQPxXdBafu4/vLKLUtCPQTK2depF+ZEgsoKuSaImcryWLhjWhE1 3tvBp93bzLe0zf5E8Xxx/BvuEkK1taZ5xjH5LjIN3d2zkgmtQh4oJwRmcJZiTw== 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 4cjFlc0QvPz8kP; Thu, 09 Oct 2025 16:32:28 +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 599GWRsS023796; Thu, 9 Oct 2025 16:32:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 599GWRP4023793; Thu, 9 Oct 2025 16:32:27 GMT (envelope-from git) Date: Thu, 9 Oct 2025 16:32:27 GMT Message-Id: <202510091632.599GWRP4023793@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: f579cc44981b - stable/15 - arm64/vmm: Add missing debug traps 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: f579cc44981b70a7a6315dce953a3df8b63a3984 Auto-Submitted: auto-generated The branch stable/15 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=f579cc44981b70a7a6315dce953a3df8b63a3984 commit f579cc44981b70a7a6315dce953a3df8b63a3984 Author: Andrew Turner AuthorDate: 2025-10-02 15:35:11 +0000 Commit: Andrew Turner CommitDate: 2025-10-09 16:31:50 +0000 arm64/vmm: Add missing debug traps These are features we don't support or advertise to the guest so can safely be trapped. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D52806 (cherry picked from commit c67ea2707d2b5e6deb5986710f520ff69e4f78a3) --- sys/arm64/vmm/vmm_reset.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/arm64/vmm/vmm_reset.c b/sys/arm64/vmm/vmm_reset.c index c4102277131d..1240c3ed16ec 100644 --- a/sys/arm64/vmm/vmm_reset.c +++ b/sys/arm64/vmm/vmm_reset.c @@ -145,7 +145,8 @@ reset_vm_el2_regs(void *vcpu) /* Set the Extended Hypervisor Configuration Register */ el2ctx->hcrx_el2 = 0; /* TODO: Trap all extensions we don't support */ - el2ctx->mdcr_el2 = 0; + el2ctx->mdcr_el2 = MDCR_EL2_TDOSA | MDCR_EL2_TDRA | MDCR_EL2_TPMS | + MDCR_EL2_TTRF; /* PMCR_EL0.N is read from MDCR_EL2.HPMN */ el2ctx->mdcr_el2 |= (el2ctx->pmcr_el0 & PMCR_N_MASK) >> PMCR_N_SHIFT;