git: a24fc8cdfb14 - stable/15 - Revert "bhyve/riscv: fix PCIe FDT interrupt-map entry stride"

From: Jessica Clarke <jrtc27_at_FreeBSD.org>
Date: Thu, 19 Nov 2026 20:47:40 UTC
The branch stable/15 has been updated by jrtc27:

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

commit a24fc8cdfb1414719573379ccb2fde86748f7f5c
Author:     Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2026-11-19 20:39:29 +0000
Commit:     Jessica Clarke <jrtc27@FreeBSD.org>
CommitDate: 2026-11-19 20:45:08 +0000

    Revert "bhyve/riscv: fix PCIe FDT interrupt-map entry stride"
    
    Thanks to past me's foolish choice not to alter the commit message such
    that none of its lines start with a #, Git got very confused the
    cherry-pick and included its own commented-out instructions. Reverting
    to re-land with a fixed body.
    
    This is a direct commit to stable/15.
    
    This reverts commit 69f76efd01a72fe0d6cb68442d2c15d3174a268f.
---
 usr.sbin/bhyve/riscv/fdt.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/usr.sbin/bhyve/riscv/fdt.c b/usr.sbin/bhyve/riscv/fdt.c
index b9fe5ae6c32f..3ccd7ae5dc79 100644
--- a/usr.sbin/bhyve/riscv/fdt.c
+++ b/usr.sbin/bhyve/riscv/fdt.c
@@ -312,15 +312,15 @@ fdt_add_pcie(int intrs[static 4])
 		pin = i % 4;
 		slot = i / 4;
 		intr = intrs[(pin + slot) % 4];
-		SET_PROP_U32(prop, 9 * i + 0, slot << 11);
-		SET_PROP_U32(prop, 9 * i + 1, 0);
-		SET_PROP_U32(prop, 9 * i + 2, 0);
-		SET_PROP_U32(prop, 9 * i + 3, pin + 1);
-		SET_PROP_U32(prop, 9 * i + 4, aplic_phandle);
-		SET_PROP_U32(prop, 9 * i + 5, 0);
-		SET_PROP_U32(prop, 9 * i + 6, 0);
-		SET_PROP_U32(prop, 9 * i + 7, intr);
-		SET_PROP_U32(prop, 9 * i + 8, IRQ_TYPE_LEVEL_HIGH);
+		SET_PROP_U32(prop, 10 * i + 0, slot << 11);
+		SET_PROP_U32(prop, 10 * i + 1, 0);
+		SET_PROP_U32(prop, 10 * i + 2, 0);
+		SET_PROP_U32(prop, 10 * i + 3, pin + 1);
+		SET_PROP_U32(prop, 10 * i + 4, aplic_phandle);
+		SET_PROP_U32(prop, 10 * i + 5, 0);
+		SET_PROP_U32(prop, 10 * i + 6, 0);
+		SET_PROP_U32(prop, 10 * i + 7, intr);
+		SET_PROP_U32(prop, 10 * i + 8, IRQ_TYPE_LEVEL_HIGH);
 	}
 
 	fdt_end_node(fdt);