git: 86715a30e270 - main - fman: Fix duplicate port identifiers
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 21 Aug 2026 02:26:51 UTC
The branch main has been updated by jhibbits:
URL: https://cgit.FreeBSD.org/src/commit/?id=86715a30e2708eacedaafed629d196d945c12b1e
commit 86715a30e2708eacedaafed629d196d945c12b1e
Author: Justin Hibbits <jhibbits@FreeBSD.org>
AuthorDate: 2026-08-20 03:29:50 +0000
Commit: Justin Hibbits <jhibbits@FreeBSD.org>
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)