From nobody Tue Feb 3 17:27:49 2026 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 4f59RT41d9z6QSGc for ; Tue, 03 Feb 2026 17:27:49 +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 4f59RT1rkTz3JDb for ; Tue, 03 Feb 2026 17:27:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770139669; 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=Cr7uMsgKouHl4V7ImsByi2WxD4uT/ap04NeG6nXEyiM=; b=bslBXb8x0H9LEGhd1EOdDKY9ZUjxtfIrI4Kw70OYDuNZGbSCeSDxYp8eXU9kpzDM+5uLlN UgwA3jNeLla8P4YnC2HXRhD/J3LS+Y75LklxHjYz/tEnW02eRlMQoAv6hLrkYbj3D05sOW 85n9KtM3oyfg4kdLw2BmndC4Mgkp0r3K8OJ/IpSL6faXXkC9s+gz4BBvDtW5ddaMuMyJhy MmIQyN9J+TU/E1M8/408SBAHRgp4CwVn1SWcokOQS1ZiCBeXJUfgKP9VvALSSbp4f4/G/e E12AAkwORm8NSSuxevs6gpGJcPzZVPxVMBua67XwoqHoLcLA/QOnzKqYbSgfuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770139669; a=rsa-sha256; cv=none; b=sTWD5w4mvGVHjMyL9jMFNrMKhlhtMucycE5OAOixljt43SjHuOUceFreK9tsLsSIogL7RV LZ7qbwJEjLgojgcWC6An0zQwsQGixHMMDsXMk8rThX0BMXu+P4/fD6lQu3K8+rRcU0gfLG pAggaeS+yqI93eW836jXyzU8sXTJCMRYjqvtECbyuccwTDrT00HbS5PKrfHo7c+v5Wot0B 4u2Q+H3hzuQjL26r5zmZkvyg0xMSNbBOyzeeo0qeQx0O7M3yUzvb26ZVJJDzxUMuTDfBdu X8RVc4ROAHoB4wOLnSZrGm3PPD0Sqf4+WYYbKcB9eeCKnFLsAKDz8tZVW9SsvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770139669; 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=Cr7uMsgKouHl4V7ImsByi2WxD4uT/ap04NeG6nXEyiM=; b=T0S2mj+zUZc8Y72KJ+F4jb0PgnK31Ihx+dh8XoynBRnR/hBndCnJVq4baK3nz3T9yxHZuq Y7v+orSUmXdUPbROnAA9s5aTLg0OBBnDqFlDAIuwVoqdS08Vo403gUWL07QnbPtK/zyV1x NmQPqTUnicKkL3x726qi4WF742TParJyQeAhgaV5VknPkDTnzNAGzSD1XshSNrwLPlrHSf atNAJoOTyd55wV0JKf2JJnEcEukdd8GtjbpoCJTuV9tvXOG6Qkyn4tu3xORypZk90EoOzd 5OGGA4Kxvr2cMhMOllSYZOff4yy3knPSzIs7Gn7WX9JnG/KhXyFf3DYYQWTFoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f59RT1Nq2z759 for ; Tue, 03 Feb 2026 17:27:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e8db by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Feb 2026 17:27:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 095a7871f432 - main - arm64/vmm: Add HYP_FEAT_FGT{,2} 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/main X-Git-Reftype: branch X-Git-Commit: 095a7871f4320e7667a644e6e34a27e1f526b053 Auto-Submitted: auto-generated Date: Tue, 03 Feb 2026 17:27:49 +0000 Message-Id: <69823015.1e8db.374debff@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=095a7871f4320e7667a644e6e34a27e1f526b053 commit 095a7871f4320e7667a644e6e34a27e1f526b053 Author: Andrew Turner AuthorDate: 2026-02-03 17:14:26 +0000 Commit: Andrew Turner CommitDate: 2026-02-03 17:14:26 +0000 arm64/vmm: Add HYP_FEAT_FGT{,2} Add the macros and detection for Fine-grained traps (FEAT_FGT and FEAT_FGT2). Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D54686 --- sys/arm64/vmm/arm64.h | 2 ++ sys/arm64/vmm/vmm_arm64.c | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/sys/arm64/vmm/arm64.h b/sys/arm64/vmm/arm64.h index f530dab05331..1b8762545925 100644 --- a/sys/arm64/vmm/arm64.h +++ b/sys/arm64/vmm/arm64.h @@ -131,6 +131,8 @@ struct hyp { uint64_t feats; /* Which features are enabled */ #define HYP_FEAT_HCX (0x1ul << 0) #define HYP_FEAT_ECV_POFF (0x1ul << 1) +#define HYP_FEAT_FGT (0x1ul << 2) +#define HYP_FEAT_FGT2 (0x1ul << 3) bool vgic_attached; struct vgic_v3 *vgic; struct hypctx *ctx[]; diff --git a/sys/arm64/vmm/vmm_arm64.c b/sys/arm64/vmm/vmm_arm64.c index d529f000b828..6643d32684d8 100644 --- a/sys/arm64/vmm/vmm_arm64.c +++ b/sys/arm64/vmm/vmm_arm64.c @@ -525,6 +525,18 @@ vmmops_init(struct vm *vm, pmap_t pmap) if (get_kernel_reg(ID_AA64MMFR0_EL1, &idreg)) { if (ID_AA64MMFR0_ECV_VAL(idreg) >= ID_AA64MMFR0_ECV_POFF) hyp->feats |= HYP_FEAT_ECV_POFF; + + switch (ID_AA64MMFR0_FGT_VAL(idreg)) { + case ID_AA64MMFR0_FGT_NONE: + break; + default: + case ID_AA64MMFR0_FGT_8_9: + hyp->feats |= HYP_FEAT_FGT2; + /* FALLTHROUGH */ + case ID_AA64MMFR0_FGT_8_6: + hyp->feats |= HYP_FEAT_FGT; + break; + } } if (get_kernel_reg(ID_AA64MMFR1_EL1, &idreg)) {