The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=480ff89c67b25113515018cdcd13179229b4a0d3
commit 480ff89c67b25113515018cdcd13179229b4a0d3 Author: Navdeep Parhar <[email protected]> AuthorDate: 2024-04-30 23:07:24 +0000 Commit: Navdeep Parhar <[email protected]> CommitDate: 2024-04-30 23:07:24 +0000 cxgbe(4): Rename rx_c_chan to rx_chan. It is the equivalent of tx_chan but for receive so rx_chan is a better name. Initialize both using helper functions and make sure both are displayed in the sysctl MIB. MFC after: 1 week Sponsored by: Chelsio Communications --- sys/dev/cxgbe/adapter.h | 4 ++-- sys/dev/cxgbe/common/t4_hw.c | 12 ++++++++++-- sys/dev/cxgbe/crypto/t4_crypto.c | 2 +- sys/dev/cxgbe/t4_main.c | 6 ++++-- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h index 8440d9d94f77..1a61834c5a40 100644 --- a/sys/dev/cxgbe/adapter.h +++ b/sys/dev/cxgbe/adapter.h @@ -320,10 +320,10 @@ struct port_info { uint8_t port_type; uint8_t mod_type; uint8_t port_id; - uint8_t tx_chan; + uint8_t tx_chan; /* tx TP c-channel */ + uint8_t rx_chan; /* rx TP c-channel */ uint8_t mps_bg_map; /* rx MPS buffer group bitmap */ uint8_t rx_e_chan_map; /* rx TP e-channel bitmap */ - uint8_t rx_c_chan; /* rx TP c-channel */ struct link_config link_cfg; struct ifmedia media; diff --git a/sys/dev/cxgbe/common/t4_hw.c b/sys/dev/cxgbe/common/t4_hw.c index 8ac7ec069174..50aa5dec30d8 100644 --- a/sys/dev/cxgbe/common/t4_hw.c +++ b/sys/dev/cxgbe/common/t4_hw.c @@ -6786,6 +6786,14 @@ static unsigned int t4_get_rx_c_chan(struct adapter *adap, int idx) return 0; } +/* + * TP TX c-channel associated with the port. + */ +static unsigned int t4_get_tx_c_chan(struct adapter *adap, int idx) +{ + return idx; +} + /** * t4_get_port_type_description - return Port Type string description * @port_type: firmware Port Type enumeration @@ -9817,10 +9825,10 @@ int t4_port_init(struct adapter *adap, int mbox, int pf, int vf, int port_id) } while ((adap->params.portvec & (1 << j)) == 0); } - p->tx_chan = j; + p->tx_chan = t4_get_tx_c_chan(adap, j); + p->rx_chan = t4_get_rx_c_chan(adap, j); p->mps_bg_map = t4_get_mps_bg_map(adap, j); p->rx_e_chan_map = t4_get_rx_e_chan_map(adap, j); - p->rx_c_chan = t4_get_rx_c_chan(adap, j); p->lport = j; if (!(adap->flags & IS_VF) || diff --git a/sys/dev/cxgbe/crypto/t4_crypto.c b/sys/dev/cxgbe/crypto/t4_crypto.c index 230e81847ba5..4ea4ad1639eb 100644 --- a/sys/dev/cxgbe/crypto/t4_crypto.c +++ b/sys/dev/cxgbe/crypto/t4_crypto.c @@ -1924,7 +1924,7 @@ ccr_init_port(struct ccr_softc *sc, int port) pi = sc->adapter->port[port]; sc->ports[port].txq = &sc->adapter->sge.ctrlq[port]; sc->ports[port].rxq = &sc->adapter->sge.rxq[pi->vi->first_rxq]; - sc->ports[port].rx_channel_id = pi->rx_c_chan; + sc->ports[port].rx_channel_id = pi->rx_chan; sc->ports[port].tx_channel_id = pi->tx_chan; sc->ports[port].stats_queued = counter_u64_alloc(M_WAITOK); sc->ports[port].stats_completed = counter_u64_alloc(M_WAITOK); diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index a9611f239132..f474d1a58ef9 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -7972,8 +7972,10 @@ cxgbe_sysctls(struct port_info *pi) pi->mps_bg_map, "MPS buffer group map"); SYSCTL_ADD_INT(ctx, children, OID_AUTO, "rx_e_chan_map", CTLFLAG_RD, NULL, pi->rx_e_chan_map, "TP rx e-channel map"); - SYSCTL_ADD_INT(ctx, children, OID_AUTO, "rx_c_chan", CTLFLAG_RD, NULL, - pi->rx_c_chan, "TP rx c-channel"); + SYSCTL_ADD_INT(ctx, children, OID_AUTO, "tx_chan", CTLFLAG_RD, NULL, + pi->tx_chan, "TP tx c-channel"); + SYSCTL_ADD_INT(ctx, children, OID_AUTO, "rx_chan", CTLFLAG_RD, NULL, + pi->rx_chan, "TP rx c-channel"); if (sc->flags & IS_VF) return;
