Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 06 Aug 2026 18:03:23 +0000
From:      Jessica Clarke <jrtc27@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: b029b0d0e69c - stable/15 - arm64/vmm: Fix vgic_v3 copy paste error for writing to GICD_ICENABLERn
Message-ID:  <6a74cc6b.325e8.45323c9f@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch stable/15 has been updated by jrtc27:

URL: https://cgit.FreeBSD.org/src/commit/?id=b029b0d0e69c10ad8a4d0830fcf09bc2017f8970

commit b029b0d0e69c10ad8a4d0830fcf09bc2017f8970
Author:     Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2026-07-17 23:55:21 +0000
Commit:     Jessica Clarke <jrtc27@FreeBSD.org>
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);


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a74cc6b.325e8.45323c9f>