From nobody Fri Aug 21 02:26:51 2026 X-Original-To: dev-commits-src-main@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 4hR4245q6qz6pY58 for ; Fri, 21 Aug 2026 02:26:52 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hR4240W9Hz4Q6w for ; Fri, 21 Aug 2026 02:26:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787279212; 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=iht8beDrQFCsMN4hQzaf8mfVbGqwASQ2D8Kt890swjA=; b=BisIkhb9lCFOwWY8jZ6i/8gIclgxPz/SyvP/wxJieJpad6mnRVtU6I4gBzDhjQ/rQKIlDg SL4L9Mrb7W5NikstFlremfyLgk+FwlJhkGPCUzjWdPt0o+hOJ+NqUJmnzdXA1qy4QwPjw9 euVeqiLr+v6/igLSVHCkAXNY5kqc/aKMO1ciFOsrF300/ZjCT+/MzHEyF+Bh0GZfnpS4RD abhaM87nLTn4bg9cDScXT7wZWnvBnv9d29OkvjfXOwtJBdSz4IPw/EommF3WqgkKFHLRlu BVEnZtGs0LfK7BlrTb4KNY6ixfb6+s1s5gLgZ9B2LR3g85QDZ6YadincvUmBSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787279212; a=rsa-sha256; cv=none; b=gHjuN4z0iHawWA3sf93+8Z89p1njhG8wKD817ueiqf1ttIoqTC7mxBlgjb02IZr1pbOPsN 6vWT641cr6mkjg6VBu3hc1dlARjLCDmFGSgQ5o0/d0u8L4Kv4VB9iEKpD5DY2kMvsf2TcS EMELE1JIPKk/JCCSktx4mlZ+lfbk2IMLssl3XDP3i5t0qp7X6HlFwCHKUPtG7ngL92eIPq /wp5VDrkZ0qbNHxWfaNDCl/JkJSu+SyiVARnqOo3LoxLexgd9LCyCydtMM5RL15j+kD9wQ vvZZMsJ2odUjg5+Wh1ukFwtKtzthgIZJsVNIftbumijKHPznMOV46PHVPKy0KQ== 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=1787279212; 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=iht8beDrQFCsMN4hQzaf8mfVbGqwASQ2D8Kt890swjA=; b=kaNqMkgK6lrRTdCxBlqUWenvGYUgn0FPGAlPAWrgRQ6zf/PMcbqTIEln/gwMwQtYdbBAml ecSbPVmKkImC45pnJwa7w7JtORTZ2HavtUpBqP/jYUhKAOuzICVNHOC3KMbK7eXKpfJdt9 1lrIHmCh9RVvehy+vcDPsy0ZQWN+kE+JQis/W4dZPYZJmwuSex61mN3ux4+7v2QfoQpxnv FV6AoOk4Cxb+wUGUkNZqJo2PZx5+K14yx7oqi2Zma0SlkBFwqKUTUljSVxeiAkYeUX7EM3 iJPr4ygpAGSeM0+wOgh9fBlVTCZjKd5Ix2fz45zYS4pqZRJSMPoBCdvXCzilMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hR4234zDDzknF for ; Fri, 21 Aug 2026 02:26:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3759d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Aug 2026 02:26:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 86715a30e270 - main - fman: Fix duplicate port identifiers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 86715a30e2708eacedaafed629d196d945c12b1e Auto-Submitted: auto-generated Date: Fri, 21 Aug 2026 02:26:51 +0000 Message-Id: <6a87b76b.3759d.1d8e18e2@gitrepo.freebsd.org> The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=86715a30e2708eacedaafed629d196d945c12b1e commit 86715a30e2708eacedaafed629d196d945c12b1e Author: Justin Hibbits AuthorDate: 2026-08-20 03:29:50 +0000 Commit: Justin Hibbits CommitDate: 2026-08-21 02:26:09 +0000 fman: Fix duplicate port identifiers fman_qman_channel_id returns the QMan FMan channel for a given port. If a port isn't found, the wrong channel number will be returned. --- sys/dev/dpaa/fman.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/dpaa/fman.c b/sys/dev/dpaa/fman.c index b94c05fd7dbf..e9e16d3c409d 100644 --- a/sys/dev/dpaa/fman.c +++ b/sys/dev/dpaa/fman.c @@ -824,7 +824,7 @@ fman_qman_channel_id(device_t dev, int port) if (sc->sc_revision_major >= 6) { static const int qman_port_id[] = { 0x30, 0x31, 0x28, 0x29, 0x2a, 0x2b, - 0x2c, 0x2d, 0x02, 0x03, 0x04, 0x05, 0x07, 0x07 + 0x2c, 0x2d, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 }; for (i = 0; i < sc->qman_chan_count; i++) { if (qman_port_id[i] == port) @@ -833,7 +833,7 @@ fman_qman_channel_id(device_t dev, int port) } else { static const int qman_port_id[] = { 0x31, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x01, - 0x02, 0x03, 0x04, 0x05, 0x07, 0x07 + 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 }; for (i = 0; i < sc->qman_chan_count; i++) { if (qman_port_id[i] == port)