From nobody Thu Aug 6 18:03:23 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 4hGFWc1z5Bz6nRCK for ; Thu, 06 Aug 2026 18:03:24 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hGFWb6tZ7z3gPR for ; Thu, 06 Aug 2026 18:03:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786039404; 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=LIjayL1Pvb6mFurDfCUkmzwRAvAzcLGQi6nEEjnLzzQ=; b=KT6kcTIVz9cQJtk0Lbm/BX36Mrifo5w6LKEtv05lT3dAfYIc3cRnU7fPouq0DCLHIJ5G+D uvHJXWH0lIEcdOosmqQncTqfl7AguwGwDOw2DCua/Ep94tA1Hc9dXXrcTPVu3XAcGaQRuP I22G6/cwQ1tWy+HHcAeRg0aGDmKgpI0rAiqoCv3SS5Au9fCQJASCNQDRqfbh3GvOFJaGfn W5jSSicPj5mFREycBkAuaBsC0Jojf3fMfVl6qVjmWswry6LUEAvj/MO5jje8gVd/gS644W jAJRNf1Gk9Fadq0dXLAJ5GtUB7sCaBLiUOapqXFlwItCvNo4/0riMm8p3Xt4iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786039404; a=rsa-sha256; cv=none; b=V6kFg/CJxoWHiye+ybZGyuaFFJIWMFEaPkAYh+dEyZuhumSh9REdC3xm82TeG6p9g9nVea 3kRIkVlYfaChr5A1HPHUGALZT5EE8l++eXlHH++Ml9iKH3YEiTqStxGM1tpfCfbNR4cNC4 T9KZ3uBKUABtOrN4Qma2qCPKGiJFPPziemKKnvS/5UWi8Msnoko5sXm8S73m/TiOIEajYM O9i2F879C6DgRkwycid65A2/c9Z7mTenPHKOA0Xkp3KngEzcyjwOjCQEeO60VqwQSjN3At QuSTAcOiGDpii0EreGFO5Q61NV1pHHNGjwOVrqDxpJ3q3mEi/yUTcofh1lEWog== 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=1786039404; 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=LIjayL1Pvb6mFurDfCUkmzwRAvAzcLGQi6nEEjnLzzQ=; b=ITzR6oMeGLp1gEJr10flwQpxLToNNQyTXT0bjN/uQBPJuQNKphln0Vlsxuxjew8ozhJHl7 fyEHM6RAGGxbdribosx6HD1du6+pKvA6k9JZdBM8e1dDd9cuEuDsPZnWk6kPyj0Mpl1UN3 5fv3/2mG7LXEP03lk15KUAznw13LZh55ng/6X1fL4hkAcvLFUkyPasjCrTqvfguZd05qNz VojN7Jx5M35/S7NMo7Rw7lKjslLPj8pgJ2iipBq70Zndj6rm3lBn28kVtdC32VKQb17fo3 3lz43l13qBocotGa0m2YcxDQiTo7KlxjiN9eEfavhB0XHOXBp+kxLXkMQ+UQVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hGFWb5tSWzVdJ for ; Thu, 06 Aug 2026 18:03:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 325e8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 06 Aug 2026 18:03:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: b029b0d0e69c - stable/15 - arm64/vmm: Fix vgic_v3 copy paste error for writing to GICD_ICENABLERn 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b029b0d0e69c10ad8a4d0830fcf09bc2017f8970 Auto-Submitted: auto-generated Date: Thu, 06 Aug 2026 18:03:23 +0000 Message-Id: <6a74cc6b.325e8.45323c9f@gitrepo.freebsd.org> The branch stable/15 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=b029b0d0e69c10ad8a4d0830fcf09bc2017f8970 commit b029b0d0e69c10ad8a4d0830fcf09bc2017f8970 Author: Jessica Clarke AuthorDate: 2026-07-17 23:55:21 +0000 Commit: Jessica Clarke CommitDate: 2026-08-06 18:02:04 +0000 arm64/vmm: Fix vgic_v3 copy paste error for writing to GICD_ICENABLERn Otherwise we try to disable the wrong IRQ. Fixes: 47e073941f4e ("Import the kernel parts of bhyve/arm64") MFC after: 1 week (cherry picked from commit 422a530c80080f2585ecefe812d609079b851fe3) --- sys/arm64/vmm/io/vgic_v3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/vmm/io/vgic_v3.c b/sys/arm64/vmm/io/vgic_v3.c index 199749c12b9f..1565dfb33bc9 100644 --- a/sys/arm64/vmm/io/vgic_v3.c +++ b/sys/arm64/vmm/io/vgic_v3.c @@ -1118,7 +1118,7 @@ dist_icenabler_write(struct hypctx *hypctx, u_int reg, u_int offset, u_int size, MPASS(offset == 0); MPASS(size == 4); - n = (reg - GICD_ISENABLER(0)) / 4; + n = (reg - GICD_ICENABLER(0)) / 4; /* GICD_ICENABLER0 is RAZ/WI so handled separately */ MPASS(n > 0); write_enabler(hypctx, n, false, wval);