From nobody Mon Feb 9 16:28:45 2026 X-Original-To: dev-commits-src-branches@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 4f8qrY4cbgz6Rg80 for ; Mon, 09 Feb 2026 16:28:45 +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 4f8qrY27B2z3PZJ for ; Mon, 09 Feb 2026 16:28:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770654525; 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=Lth6bu3Zsez1zPIpJql9KCaNdlI3+LPpQTD2r8Gn5zc=; b=xTfZBKLI2yn9Z/HJT3uN8a/OeML9i3TdZPcWg67+Kd+fyY3DQtvLTSYIDukuJtvehRF7gH k2LINovWA9muZznUe/hQtHKSAwTTfrhJCy/Ch/cs1r7m++4lFz6Za+hdJdY1i1XDproIRY iFRWUeck+ZlAnalrABmBHdn5srnAIfqjmgkumHrns75oPmel4fA6vY7ISVfRDut9NCfTOR yhm7PiIJeoho9cLB+FaAE5OfZ4xfkN2R3EUeCaG1qAcaislccUVWTA8JeQvqQH5iRLf85X 2WkD1xsBg3knWI6vostS4y87/c9xgesVay1G2KBp2bhgHNJhoq127O62LSy5cQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770654525; a=rsa-sha256; cv=none; b=Imtj0GDOqOrrsPg10tt7iaJK39h16gQQMKa21/A5+3SKhBObiN+IsobqCO4Y5u4pvyupv8 3INsUSrXrsFc/Prme8K9e8m/3NyRkJqOgZ9hqGsaXqs0JMVdy2LAXG2ydsh6WOqIGd9Mez bFj+HJ4RUngs9ZNiH2pMjTUMY1N1+J3kOPT9LGzxFo/kr+rPO/Qrmrs9HwIdeLBu+M03dG c9rf7Tez1Qg+JcknHOOjvtM7CkeSmfk7rKBV2lYHL+wxb2+ZYJ3jF2oDEz5QNsEqIcBsAN TT29J1rBSQ7CsG+IMR/Upn8zLb8tqfSk6GE9dMMzrjuY90arCUveHVgRhTu3gg== 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=1770654525; 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=Lth6bu3Zsez1zPIpJql9KCaNdlI3+LPpQTD2r8Gn5zc=; b=SxjlxWulx5GD5E2p3P7GJBNe5hXqDjZQ8MIqRcOwgtl9+3nxjhGIImckwzU1OuLQhiK3v9 3mtv4OVaPHd7g1DWVQepwHK6fxUWHW3HQAePL4jw4llHcHI3RZBJVh4IxxqLwm+37tYM9S duV5r4Uw5F1OECJyTy2qQbn/KnWnPI40EYYmMDhjm9T2TMp5FtBrCrjLr9dupQ7c9M22WV LyLmbMxCprYGlcboySA5WVslIWGxeUHQFP5q7kNC5UGWbUb7iI/RTcn2/ZZPWlRQe26DEA B9Y9kHqBDitQqwR73o817ko8dEqFnj2/Jb6euqr1NeTphWY4DYDrdgZ3XysNmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8qrY1kqpzgYG for ; Mon, 09 Feb 2026 16:28:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cbda by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 16:28:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: c98aa51be91a - stable/15 - arm64/vmm: Add HYP_FEAT_FGT{,2} List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: c98aa51be91a2146f2d4fb10723bc8032f58084b Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 16:28:45 +0000 Message-Id: <698a0b3d.1cbda.36673aa2@gitrepo.freebsd.org> The branch stable/15 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=c98aa51be91a2146f2d4fb10723bc8032f58084b commit c98aa51be91a2146f2d4fb10723bc8032f58084b Author: Andrew Turner AuthorDate: 2026-02-03 17:14:26 +0000 Commit: Andrew Turner CommitDate: 2026-02-09 14:52:00 +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 (cherry picked from commit 095a7871f4320e7667a644e6e34a27e1f526b053) --- 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 aa1361049f49..5a7654ab250f 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)) {