git: 41309c878de3 - stable/14 - cxgbe(4): Add a helper function to locate MPS/MAC registers.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 17 Jul 2024 14:21:37 UTC
The branch stable/14 has been updated by np:
URL: https://cgit.FreeBSD.org/src/commit/?id=41309c878de3ef87fcfefb9326f3cb28bd910a20
commit 41309c878de3ef87fcfefb9326f3cb28bd910a20
Author: Navdeep Parhar <np@FreeBSD.org>
AuthorDate: 2024-04-25 05:24:49 +0000
Commit: Navdeep Parhar <np@FreeBSD.org>
CommitDate: 2024-07-17 06:35:30 +0000
cxgbe(4): Add a helper function to locate MPS/MAC registers.
These register blocks are at different locations in different chips.
Sponsored by: Chelsio Communications
(cherry picked from commit b59c5d97edf17525405d95b1f5746c4a79a9c7c4)
---
sys/dev/cxgbe/common/common.h | 1 +
sys/dev/cxgbe/common/t4_hw.c | 37 +++++++++++++++++--------------------
sys/dev/cxgbe/t4_main.c | 14 +++++---------
3 files changed, 23 insertions(+), 29 deletions(-)
diff --git a/sys/dev/cxgbe/common/common.h b/sys/dev/cxgbe/common/common.h
index 634474470e17..3d546c2f976f 100644
--- a/sys/dev/cxgbe/common/common.h
+++ b/sys/dev/cxgbe/common/common.h
@@ -722,6 +722,7 @@ int t4_set_vf_mac(struct adapter *adapter, unsigned int pf, unsigned int vf,
unsigned int t4_get_regs_len(struct adapter *adapter);
void t4_get_regs(struct adapter *adap, u8 *buf, size_t buf_size);
+u32 t4_port_reg(struct adapter *adap, u8 port, u32 reg);
const char *t4_get_port_type_description(enum fw_port_type port_type);
void t4_get_port_stats(struct adapter *adap, int idx, struct port_stats *p);
void t4_get_port_stats_offset(struct adapter *adap, int idx,
diff --git a/sys/dev/cxgbe/common/t4_hw.c b/sys/dev/cxgbe/common/t4_hw.c
index 30dedd91262c..cf4f5a65c3e5 100644
--- a/sys/dev/cxgbe/common/t4_hw.c
+++ b/sys/dev/cxgbe/common/t4_hw.c
@@ -243,18 +243,21 @@ struct port_tx_state {
uint64_t tx_frames;
};
+u32
+t4_port_reg(struct adapter *adap, u8 port, u32 reg)
+{
+ if (chip_id(adap) > CHELSIO_T4)
+ return T5_PORT_REG(port, reg);
+ return PORT_REG(port, reg);
+}
+
static void
read_tx_state_one(struct adapter *sc, int i, struct port_tx_state *tx_state)
{
uint32_t rx_pause_reg, tx_frames_reg;
- if (is_t4(sc)) {
- tx_frames_reg = PORT_REG(i, A_MPS_PORT_STAT_TX_PORT_FRAMES_L);
- rx_pause_reg = PORT_REG(i, A_MPS_PORT_STAT_RX_PORT_PAUSE_L);
- } else {
- tx_frames_reg = T5_PORT_REG(i, A_MPS_PORT_STAT_TX_PORT_FRAMES_L);
- rx_pause_reg = T5_PORT_REG(i, A_MPS_PORT_STAT_RX_PORT_PAUSE_L);
- }
+ rx_pause_reg = t4_port_reg(sc, i, A_MPS_PORT_STAT_RX_PORT_PAUSE_L);
+ tx_frames_reg = t4_port_reg(sc, i, A_MPS_PORT_STAT_TX_PORT_FRAMES_L);
tx_state->rx_pause = t4_read_reg64(sc, rx_pause_reg);
tx_state->tx_frames = t4_read_reg64(sc, tx_frames_reg);
@@ -281,10 +284,7 @@ check_tx_state(struct adapter *sc, struct port_tx_state *tx_state)
tx_frames = tx_state[i].tx_frames;
read_tx_state_one(sc, i, &tx_state[i]); /* update */
- if (is_t4(sc))
- port_ctl_reg = PORT_REG(i, A_MPS_PORT_CTL);
- else
- port_ctl_reg = T5_PORT_REG(i, A_MPS_PORT_CTL);
+ port_ctl_reg = t4_port_reg(sc, i, A_MPS_PORT_CTL);
if (t4_read_reg(sc, port_ctl_reg) & F_PORTTXEN &&
rx_pause != tx_state[i].rx_pause &&
tx_frames == tx_state[i].tx_frames) {
@@ -6952,8 +6952,7 @@ void t4_get_port_stats(struct adapter *adap, int idx, struct port_stats *p)
#define GET_STAT(name) \
t4_read_reg64(adap, \
- (is_t4(adap) ? PORT_REG(pi->tx_chan, A_MPS_PORT_STAT_##name##_L) : \
- T5_PORT_REG(pi->tx_chan, A_MPS_PORT_STAT_##name##_L)))
+ t4_port_reg(adap, pi->tx_chan, A_MPS_PORT_STAT_##name##_L));
#define GET_STAT_COM(name) t4_read_reg64(adap, A_MPS_STAT_##name##_L)
p->tx_pause = GET_STAT(TX_PORT_PAUSE);
@@ -7054,9 +7053,7 @@ void t4_get_lb_stats(struct adapter *adap, int idx, struct lb_port_stats *p)
#define GET_STAT(name) \
t4_read_reg64(adap, \
- (is_t4(adap) ? \
- PORT_REG(idx, A_MPS_PORT_STAT_LB_PORT_##name##_L) : \
- T5_PORT_REG(idx, A_MPS_PORT_STAT_LB_PORT_##name##_L)))
+ t4_port_reg(adap, idx, A_MPS_PORT_STAT_LB_PORT_##name##_L))
#define GET_STAT_COM(name) t4_read_reg64(adap, A_MPS_STAT_##name##_L)
p->octets = GET_STAT(BYTES);
@@ -9436,16 +9433,16 @@ int t4_shutdown_adapter(struct adapter *adapter)
t4_write_reg(adapter, A_DBG_GPIO_EN, 0xffff0000);
for_each_port(adapter, port) {
u32 a_port_cfg = is_t4(adapter) ?
- PORT_REG(port, A_XGMAC_PORT_CFG) :
- T5_PORT_REG(port, A_MAC_PORT_CFG);
+ t4_port_reg(adapter, port, A_XGMAC_PORT_CFG) :
+ t4_port_reg(adapter, port, A_MAC_PORT_CFG);
t4_write_reg(adapter, a_port_cfg,
t4_read_reg(adapter, a_port_cfg)
& ~V_SIGNAL_DET(1));
if (!bt) {
u32 hss_cfg0 = is_t4(adapter) ?
- PORT_REG(port, A_XGMAC_PORT_HSS_CFG0) :
- T5_PORT_REG(port, A_MAC_PORT_HSS_CFG0);
+ t4_port_reg(adapter, port, A_XGMAC_PORT_HSS_CFG0) :
+ t4_port_reg(adapter, port, A_MAC_PORT_HSS_CFG0);
t4_set_reg_field(adapter, hss_cfg0, F_HSSPDWNPLLB |
F_HSSPDWNPLLA | F_HSSPLLBYPB | F_HSSPLLBYPA,
F_HSSPDWNPLLB | F_HSSPDWNPLLA | F_HSSPLLBYPB |
diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c
index 128d2ae65611..d56a42eee8f4 100644
--- a/sys/dev/cxgbe/t4_main.c
+++ b/sys/dev/cxgbe/t4_main.c
@@ -1411,13 +1411,10 @@ t4_attach(device_t dev)
* depends on the link settings which will be known when the
* link comes up.
*/
- if (is_t6(sc)) {
+ if (is_t6(sc))
pi->fcs_reg = -1;
- } else if (is_t4(sc)) {
- pi->fcs_reg = PORT_REG(pi->tx_chan,
- A_MPS_PORT_STAT_RX_PORT_CRC_ERROR_L);
- } else {
- pi->fcs_reg = T5_PORT_REG(pi->tx_chan,
+ else {
+ pi->fcs_reg = t4_port_reg(sc, pi->tx_chan,
A_MPS_PORT_STAT_RX_PORT_CRC_ERROR_L);
}
pi->fcs_base = 0;
@@ -8025,9 +8022,8 @@ cxgbe_sysctls(struct port_info *pi)
#define T4_REGSTAT(name, stat, desc) \
SYSCTL_ADD_OID(ctx, children, OID_AUTO, #name, \
- CTLTYPE_U64 | CTLFLAG_RD | CTLFLAG_MPSAFE, sc, \
- (is_t4(sc) ? PORT_REG(pi->tx_chan, A_MPS_PORT_STAT_##stat##_L) : \
- T5_PORT_REG(pi->tx_chan, A_MPS_PORT_STAT_##stat##_L)), \
+ CTLTYPE_U64 | CTLFLAG_RD | CTLFLAG_MPSAFE, sc, \
+ t4_port_reg(sc, pi->tx_chan, A_MPS_PORT_STAT_##stat##_L), \
sysctl_handle_t4_reg64, "QU", desc)
/* We get these from port_stats and they may be stale by up to 1s */