From nobody Thu Nov 19 20:47:40 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 4jVrBh3XYpz71Cp0 for ; Thu, 19 Nov 2026 20:47:40 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jVrBh30tlz4vPx for ; Thu, 19 Nov 2026 20:47:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795121260; 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=CRh5NUbv3iSZWsSGrzowWWHSN3cBSmiHZrOL/xBjkLA=; b=UjaQ5ORHFuCCK5rXkL1N2FTCEUuX9YmX2Eye+WNl2hsc0A+2uoQIK8wj8llVxJzDzEQir7 qDOAZsQQBogWNwOBdy+Lx6u8pSyPd2pPqSj8QDMw2wL4YrEo+PBga3FLpPyUYStYGVXs2m 5A/1n7QWiZu9JBcrvvR9qSqrLva0vUxJJcFQJWquumosTLCPhOsBFpvUot73Yxxe4IS6JQ ge+Zfb4ay1Ye81bMlSy0DPWy60YRHIBu/hRsHXkcjB1wRG0doEflHnmKz4CQ1XmvHrgHU2 A67gy2cFy36eOKsJpC+Jx2IN927Y/5XDrNMnJ8a42TexG9HpAcL7AmmzYKPnAg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1795121260; b=T+JGC6nPxi0kC0ZuKfODNpQJ0xodMEkXQpUHq/ANEmdrcDndQZTepd3FYFfrhHNpLhVG2t FM/xU2AVjxAEvI67fOOwlFFwBkAbYJ+XcRdafTPXdSmrM6kWI35C2+CNyInDocrBIpNxUc 0TtINzwCpJT+0ohRh0VvnCGOp6JUi4GOSEYAUAB7OHuKiBLnZ1jesuyXt4svLyqZn/+Jfd 5sLbRATGcrcIQDYP31O/J3cOKplPe+PI1ZW4LyfoBeJ24/hmucdQeiNAiphY/CcpDR/c6V qqE8tTOvjgwBb5ohLc1d4xmAEbDI4OL2nOMVVBgCWvp4wwfevM6bmOW6W2CR8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795121260; 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=CRh5NUbv3iSZWsSGrzowWWHSN3cBSmiHZrOL/xBjkLA=; b=V9/OuzjpOJE93AndhUs7LHaYClXD2gyPBTW4I2r11uewdM38yrlp2OBMpBAZSP2jd8RSxZ T/y84w5SKwuMbhCER5gfM2mxesSllqu6vZhaPXMNHFADwkYXxG8yMMyEmKn4LqyIpb10e0 8zhXh7gfCYlIHr5zclDBq9d0NxFZCB6X13+nLWrRg0D4gcVm2Arf3NRSHNycDnlK+jBPMa 8tN7aFO+rwhqM5f2aTqBKTWCDoAWRoC9TYhh97BTakkMkuRFDGk9skcbCYOWvA2DgHhNaU LHJSEDahAinjmTvzzNDyagzwiimbWheeFLbcZ0ktPg1gxfHf399AcMaW/Xr7Pw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jVrBh2f57zHFY for ; Thu, 19 Nov 2026 20:47:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id bad1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Nov 2026 20:47:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: a24fc8cdfb14 - stable/15 - Revert "bhyve/riscv: fix PCIe FDT interrupt-map entry stride" List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository 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: a24fc8cdfb1414719573379ccb2fde86748f7f5c Auto-Submitted: auto-generated Date: Thu, 19 Nov 2026 20:47:40 +0000 Message-Id: <6aff606c.bad1.5e90a6c0@gitrepo.freebsd.org> The branch stable/15 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=a24fc8cdfb1414719573379ccb2fde86748f7f5c commit a24fc8cdfb1414719573379ccb2fde86748f7f5c Author: Jessica Clarke AuthorDate: 2026-11-19 20:39:29 +0000 Commit: Jessica Clarke 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);