Wangxun Fixes
Subsystems (2)
PATCH v6 7/21 net/txgbe: fix Tx desc free logic
In reply to Zaiyu WangOn some server environments, this driver caused TDM non-fatal errors or PCIe request errors during Tx operation
In Amber-Lite NIC's Tx head write-back mode, the hardware periodically writes back a head index pointing to the next descriptor it is adout to process in Tx ring. All descriptors before the head are considered processed by hardware and can be safely freed by the driver.
The root cause is that the driver can safely free a batch of descriptors only when the hardware's write-back head pointer has advanced beyond all descriptors in that batch, meaning they have all been processed by the hardware. If the driver frees a descriptor before the hardware has finished processing it, invalid memory access may occur, leading to the observed bug.
To fix the issue, correct the boundary check in all three Tx cleanup functions, each of which was missing the proper condition to prevent freeing unprocessed descriptors.
--- drivers/net/txgbe/txgbe_rxtx.c | 16 +++++------ drivers/net/txgbe/txgbe_rxtx.h | 35 +++++++++++++++++++++++ drivers/net/txgbe/txgbe_rxtx_vec_common.h | 10 +++---- 3 files changed, 48 insertions(+), 13 deletions(-)
drivers/net/txgbe/txgbe_rxtx.c +8 -8
@@ -98,12 +98,11 @@ txgbe_tx_free_bufs(struct txgbe_tx_queue *txq)if (tx_last_dd >= txq->nb_tx_desc) tx_last_dd -= txq->nb_tx_desc; -volatile uint16_t head = (uint16_t )*txq->headwb_mem; +uint32_t h =rte_atomic_load_explicit (txq->headwb_mem, + rte_memory_order_acquire); +const uint16_t head = (uint16_t )h; -if (txq->tx_next_dd > head && head > tx_last_dd) -return 0 ; -else if (tx_last_dd > txq->tx_next_dd && - (head > tx_last_dd || head < txq->tx_next_dd)) +if (!txgbe_tx_headwb_desc_done (head, tx_last_dd, txq->tx_next_dd))return 0 ; }else {/* check DD bit on threshold descriptor */
@@ -645,12 +644,13 @@ txgbe_xmit_cleanup(struct txgbe_tx_queue *txq) status = txr[desc_to_clean_to].dw3;if (txq->headwb_mem) { -u32 head = *txq->headwb_mem; +uint32_t h =rte_atomic_load_explicit (txq->headwb_mem, + rte_memory_order_acquire); +const uint16_t head = (uint16_t )h;PMD_TX_FREE_LOG (DEBUG ,"queue[%02d]: headwb_mem = %03d, desc_to_clean_to = %03d" , txq->reg_idx, head, desc_to_clean_to); -/* we have caught up to head, no work left to do */ -if (desc_to_clean_to == head) +if (!txgbe_tx_headwb_desc_done (head, last_desc_cleaned, desc_to_clean_to))return -(1 ); }else {if (!(status &rte_cpu_to_le_32 (TXGBE_TXD_DD ))) {
drivers/net/txgbe/txgbe_rxtx.h +35 -0
@@ -426,6 +426,41 @@ struct txgbe_txq_ops {void (*reset)(struct txgbe_tx_queue *txq); }; +/** +* Check whether Tx descriptors in the range (last, next] are done +* in Tx head write-back mode. +* +* In head write-back mode, the hardware periodically updates *headwb_mem +* with the index of the next descriptor it will process. +* All descriptors before the head are considered processed by hardware and can +* be safely freed. The descriptor pointed to by head itself is not yet processed. +* +* @param head +* Current hardware head index read from headwb_mem. +* @param last +* The highest-index descriptor cleaned in the previous round +* (exclusive: descriptors at or before this index are already freed). +* @param next +* The highest-index descriptor to be cleaned in this round +* (inclusive: this descriptor is the target of the current cleanup). +* @return +* true if all descriptors in the range (last, next] have been completed +* by hardware and can be freed, false otherwise. +*/ +static inline bool +txgbe_tx_headwb_desc_done (uint16_t head,uint16_t last,uint16_t next) +{ +if (next == head) +return false; +else if (next > head && head > last) +return false; +/* wrap case */ +else if (last > next && (head > last || head < next)) +return false; + +return true; +} +/* Takes an ethdev and a queue and sets up the tx function to be used based on * the queue parameters. Used in tx_queue_setup by primary process and then * in dev_init by secondary process when attaching to an existing ethdev.
drivers/net/txgbe/txgbe_rxtx_vec_common.h +5 -5
@@ -94,11 +94,11 @@ txgbe_tx_free_bufs(struct txgbe_tx_queue *txq) txq->tx_next_dd - txq->tx_free_thresh;if (tx_last_dd >= txq->nb_tx_desc) tx_last_dd -= txq->nb_tx_desc; -volatile uint16_t head = (uint16_t )*txq->headwb_mem; -if (txq->tx_next_dd > head && head > tx_last_dd) -return 0 ; -else if (tx_last_dd > txq->tx_next_dd && - (head > tx_last_dd || head < txq->tx_next_dd)) +uint32_t h =rte_atomic_load_explicit (txq->headwb_mem, + rte_memory_order_acquire); +const uint16_t head = (uint16_t )h; + +if (!txgbe_tx_headwb_desc_done (head, tx_last_dd, txq->tx_next_dd))return 0 ; }else {/* check DD bit on threshold descriptor */
Signature · 1 line
2.21.0.windows.1
PATCH v6 8/21 net/txgbe: fix link flow control registers for Amber-Lite
In reply to Zaiyu WangThe flow control counter registers on AML NICs differ from those on SP NICs. Update the register offsets accordingly to ensure the counters work correctly.
--- drivers/net/txgbe/base/txgbe_hw.c | 7 ++++++ drivers/net/txgbe/base/txgbe_regs.h | 2 ++ drivers/net/txgbe/base/txgbe_type.h | 4 ++++ drivers/net/txgbe/txgbe_ethdev.c | 34 +++++++++++++++++++---------- 4 files changed, 36 insertions(+), 11 deletions(-)
drivers/net/txgbe/base/txgbe_hw.c +7 -0
@@ -394,6 +394,13 @@ s32 txgbe_clear_hw_cntrs(struct txgbe_hw *hw)rd32 (hw,TXGBE_PBTXLNKXON );rd32 (hw,TXGBE_PBTXLNKXOFF ); +if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) { +wr32 (hw,TXGBE_PBRXLNKXON_AML ,0 ); +wr32 (hw,TXGBE_PBRXLNKXOFF_AML ,0 ); + hw->last_stats.rx_xon_packets =0 ; + hw->last_stats.rx_xoff_packets =0 ; + } +/* DMA Stats */ rd32 (hw,TXGBE_DMARXPKT );rd32 (hw,TXGBE_DMATXPKT );
drivers/net/txgbe/base/txgbe_regs.h +2 -0
@@ -1085,6 +1085,8 @@ enum txgbe_5tuple_protocol {#define TXGBE_PBRXDROP 0x019068#define TXGBE_PBRXLNKXOFF 0x011988#define TXGBE_PBRXLNKXON 0x011E0C +#define TXGBE_PBRXLNKXOFF_AML 0x011F80 +#define TXGBE_PBRXLNKXON_AML 0x011F84#define TXGBE_PBRXUPXON (up) (0x011E30 + (up) * 4)#define TXGBE_PBRXUPXOFF (up) (0x011E10 + (up) * 4)
drivers/net/txgbe/base/txgbe_type.h +4 -0
@@ -876,6 +876,10 @@ struct txgbe_hw {u64 tx_qp_bytes;u64 rx_qp_mc_packets; } qp_last[TXGBE_MAX_QP ]; +struct { +u64 rx_xon_packets; +u64 rx_xoff_packets; + } last_stats;rte_spinlock_t phy_lock;/*amlite: new SW-FW mbox */
drivers/net/txgbe/txgbe_ethdev.c +23 -11
@@ -2264,16 +2264,18 @@ txgbe_dev_reset(struct rte_eth_dev *dev)return ret; } +#define TXGBE_UPDATE_COUNTER_32BIT_GENERIC (reg, last, count, reset) \ + do { \ + uint32_t current = rd32(hw, reg); \ + if ((current) < (last)) \ + current += 0x100000000ULL; \ + if (reset) \ + (last) = current; \ + (count) = (uint32_t)((current) - (last)); \ + } while (0) +#define UPDATE_QP_COUNTER_32bit (reg, last_counter, counter) \ - { \ - uint32_t current_counter = rd32(hw, reg); \ - if (current_counter < last_counter) \ - current_counter += 0x100000000LL; \ - if (!hw->offset_loaded) \ - last_counter = current_counter; \ - counter = current_counter - last_counter; \ - counter &= 0xFFFFFFFFLL; \ - } + TXGBE_UPDATE_COUNTER_32BIT_GENERIC(reg, last_counter, counter, !hw->offset_loaded)#define UPDATE_QP_COUNTER_36bit (reg_lsb, reg_msb, last_counter, counter) \ { \
@@ -2331,8 +2333,18 @@ txgbe_read_stats_registers(struct txgbe_hw *hw, hw_stats->up[i].rx_up_dropped +=rd32 (hw,TXGBE_PBRXMISS (i)); } - hw_stats->rx_xon_packets +=rd32 (hw,TXGBE_PBRXLNKXON ); - hw_stats->rx_xoff_packets +=rd32 (hw,TXGBE_PBRXLNKXOFF ); + +if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) { +TXGBE_UPDATE_COUNTER_32BIT_GENERIC (TXGBE_PBRXLNKXON_AML , + hw->last_stats.rx_xon_packets, + hw_stats->rx_xon_packets, !hw->offset_loaded); +TXGBE_UPDATE_COUNTER_32BIT_GENERIC (TXGBE_PBRXLNKXOFF_AML , + hw->last_stats.rx_xoff_packets, + hw_stats->rx_xoff_packets, !hw->offset_loaded); + }else { + hw_stats->rx_xon_packets +=rd32 (hw,TXGBE_PBRXLNKXON ); + hw_stats->rx_xoff_packets +=rd32 (hw,TXGBE_PBRXLNKXOFF ); + } hw_stats->tx_xon_packets +=rd32 (hw,TXGBE_PBTXLNKXON ); hw_stats->tx_xoff_packets +=rd32 (hw,TXGBE_PBTXLNKXOFF );
Signature · 1 line
2.21.0.windows.1
PATCH v6 9/21 net/txgbe: fix link flow control config for Sapphire
In reply to Zaiyu WangSP chips have a hardware bug preventing XON flow control support, so the driver disables it.
--- drivers/net/txgbe/base/txgbe_hw.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/txgbe/base/txgbe_hw.c +4 -2
@@ -1037,8 +1037,10 @@ s32 txgbe_fc_enable(struct txgbe_hw *hw)for (i =0 ; i <TXGBE_DCB_TC_MAX ; i++) {if ((hw->fc.current_mode & txgbe_fc_tx_pause) && hw->fc.high_water[i]) { - fcrtl =TXGBE_FCWTRLO_TH (hw->fc.low_water[i]) | -TXGBE_FCWTRLO_XON ; + fcrtl =TXGBE_FCWTRLO_TH (hw->fc.low_water[i]); +/* Only AML support XON */ +if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) + fcrtl |=TXGBE_FCWTRLO_XON ; fcrth =TXGBE_FCWTRHI_TH (hw->fc.high_water[i]) |TXGBE_FCWTRHI_XOFF ; }else {
Signature · 1 line
2.21.0.windows.1
PATCH v6 10/21 net/txgbe: fix a mass of unknown interrupts
In reply to Zaiyu WangWhen RSC is enabled, Rx ring IVAR is set to configure ITR. It causes Rx ring interrupts report on the default msix_vector. Thus a mass of unknown interrupts occupy CPU.
Fix the issue by setting ring IVAR only when the rxq interrupt is enabled.
--- drivers/net/txgbe/txgbe_rxtx.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-)
drivers/net/txgbe/txgbe_rxtx.c +17 -13
@@ -4347,6 +4347,8 @@ static int txgbe_set_rsc(struct rte_eth_dev *dev) {struct rte_eth_rxmode *rx_conf = &dev->data->dev_conf.rxmode; +struct rte_pci_device *pci_dev =RTE_ETH_DEV_TO_PCI (dev); +struct rte_intr_handle *intr_handle = pci_dev->intr_handle;struct txgbe_hw *hw =TXGBE_DEV_HW (dev);struct rte_eth_dev_info dev_info = {0 };bool rsc_capable = false;
@@ -4397,8 +4399,6 @@ txgbe_set_rsc(struct rte_eth_dev *dev)rd32 (hw,TXGBE_RXCFG (rxq->reg_idx));uint32_t psrtype =rd32 (hw,TXGBE_POOLRSS (rxq->reg_idx)); -uint32_t eitr = -rd32 (hw,TXGBE_ITR (rxq->reg_idx));/* * txgbe PMD doesn't support header-split at the moment.
@@ -4417,6 +4417,9 @@ txgbe_set_rsc(struct rte_eth_dev *dev) srrctl |=txgbe_get_rscctl_maxdesc (rxq->mb_pool); psrtype |=TXGBE_POOLRSS_L4HDR ; +wr32 (hw,TXGBE_RXCFG (rxq->reg_idx), srrctl); +wr32 (hw,TXGBE_POOLRSS (rxq->reg_idx), psrtype); +/* * RSC: Set ITR interval corresponding to 2K ints/s. *
@@ -4430,19 +4433,20 @@ txgbe_set_rsc(struct rte_eth_dev *dev)* For a sparse streaming case this setting will yield * at most 500us latency for a single RSC aggregation. */ - eitr &= ~TXGBE_ITR_IVAL_MASK ; - eitr |=TXGBE_ITR_IVAL_10G (TXGBE_QUEUE_ITR_INTERVAL_DEFAULT ); - eitr |=TXGBE_ITR_WRDSA ; +if (rte_intr_dp_is_en (intr_handle)) { +uint32_t eitr =rd32 (hw,TXGBE_ITR (rxq->reg_idx)); -wr32 (hw,TXGBE_RXCFG (rxq->reg_idx), srrctl); -wr32 (hw,TXGBE_POOLRSS (rxq->reg_idx), psrtype); -wr32 (hw,TXGBE_ITR (rxq->reg_idx), eitr); + eitr &= ~TXGBE_ITR_IVAL_MASK ; + eitr |=TXGBE_ITR_IVAL_10G (TXGBE_QUEUE_ITR_INTERVAL_DEFAULT ); + eitr |=TXGBE_ITR_WRDSA ; +wr32 (hw,TXGBE_ITR (rxq->reg_idx), eitr); -/* -* RSC requires the mapping of the queue to the -* interrupt vector. -*/ -txgbe_set_ivar_map (hw,0 , rxq->reg_idx, i); +/* +* RSC requires the mapping of the queue to the +* interrupt vector. +*/ +txgbe_set_ivar_map (hw,0 , rxq->reg_idx, i); + } } dev->data->lro =1 ;
Signature · 1 line
2.21.0.windows.1
PATCH v6 11/21 net/txgbe: fix traffic class priority configuration
In reply to Zaiyu WangAfter applying the following testpmd command, 802.1Q packets with specific priorities were not properly directed to the corresponding traffic classes:
port config 0 dcb vt off 4 pfc off
The old driver had two issues:
1. The hardware uses a 4-bit mapping register per traffic class for priority-to-TC mapping, but the driver incorrectly configured it as 3 bits.
2. The DCB TX configuration mistakenly wrote to the RX register.
Fix both issues, ensuring that tc-prio mapping works as expected. Additionally, remove the stale and inconsistent TXGBE_DCBUP2TC_DEC macro as it has no callers.
--- drivers/net/txgbe/base/txgbe_dcb_hw.c | 2 +- drivers/net/txgbe/base/txgbe_regs.h | 6 ++---- drivers/net/txgbe/txgbe_rxtx.c | 7 ++----- 3 files changed, 5 insertions(+), 10 deletions(-)
drivers/net/txgbe/base/txgbe_dcb_hw.c +1 -1
@@ -154,7 +154,7 @@ s32 txgbe_dcb_config_tx_data_arbiter_raptor(struct txgbe_hw *hw, u16 *refill,for (i =0 ; i <TXGBE_DCB_UP_MAX ; i++) reg |=TXGBE_DCBUP2TC_MAP (i, map[i]); -wr32 (hw,TXGBE_PBRXUP2TC , reg); +wr32 (hw,TXGBE_PBTXUP2TC , reg);/* Configure traffic class credits and priority */ for (i =0 ; i <TXGBE_DCB_TC_MAX ; i++) {
drivers/net/txgbe/base/txgbe_regs.h +2 -4
@@ -503,10 +503,8 @@#define TXGBE_PBRXCTL 0x019000#define TXGBE_PBRXCTL_ST MS(0, 0x1)#define TXGBE_PBRXCTL_ENA MS(31, 0x1) -#define TXGBE_PBRXUP2TC 0x019008#define TXGBE_PBTXUP2TC 0x01C800 -#define TXGBE_DCBUP2TC_MAP (tc, v) LS(v, 3 * (tc), 0x7) -#define TXGBE_DCBUP2TC_DEC (tc, r) RS(r, 3 * (tc), 0x7) +#define TXGBE_DCBUP2TC_MAP (tc, v) LS(v, 4 * (tc), 0x7)#define TXGBE_PBRXSIZE (tc) (0x019020 + (tc) * 4)#define TXGBE_PBRXSIZE_KB (v) LS(v, 10, 0x3FF)
@@ -1705,7 +1703,7 @@ enum txgbe_5tuple_protocol {#define TXGBE_RDM_PF_HIDE (_i) (0x12090 + ((_i) * 4))#define TXGBE_RPUP2TC 0x019008 -#define TXGBE_RPUP2TC_UP_SHIFT 3 +#define TXGBE_RPUP2TC_UP_SHIFT 4#define TXGBE_RPUP2TC_UP_MASK 0x7#define TXGBE_RDM_DCACHE_CTL 0x0120A8
drivers/net/txgbe/txgbe_rxtx.c +2 -5
@@ -3378,11 +3378,8 @@ txgbe_vmdq_dcb_configure(struct rte_eth_dev *dev) queue_mapping =0 ;for (i =0 ; i <RTE_ETH_DCB_NUM_USER_PRIORITIES ; i++) -/* -* mapping is done with 3 bits per priority, -* so shift by i*3 each time -*/ - queue_mapping |= ((cfg->dcb_tc[i] &0x07 ) << (i *3 )); + queue_mapping |= ((cfg->dcb_tc[i] &TXGBE_RPUP2TC_UP_MASK ) << + (i *TXGBE_RPUP2TC_UP_SHIFT ));wr32 (hw,TXGBE_RPUP2TC , queue_mapping);
Signature · 1 line
2.21.0.windows.1
PATCH v6 12/21 net/txgbe: fix link stability for 25G NIC
In reply to Zaiyu WangThe link was previously configured via firmware, but this approach resulted in unstable link behavior. To resolve the issue, re-add the PHY configuration flow directly into the driver.
--- drivers/net/txgbe/base/meson.build | 1 + drivers/net/txgbe/base/txgbe_aml.c | 105 +- drivers/net/txgbe/base/txgbe_aml.h | 6 +- drivers/net/txgbe/base/txgbe_e56.c | 2488 +++++++++++++++++++++++++ drivers/net/txgbe/base/txgbe_e56.h | 1746 +++++++++++++++++ drivers/net/txgbe/base/txgbe_e56_bp.h | 279 +++ drivers/net/txgbe/base/txgbe_hw.c | 35 +- drivers/net/txgbe/base/txgbe_phy.h | 1 - drivers/net/txgbe/base/txgbe_regs.h | 2 + drivers/net/txgbe/base/txgbe_type.h | 12 + drivers/net/txgbe/txgbe_ethdev.c | 83 +- drivers/net/txgbe/txgbe_ethdev.h | 4 + 12 files changed, 4703 insertions(+), 59 deletions(-) create mode 100644 drivers/net/txgbe/base/txgbe_e56.c create mode 100644 drivers/net/txgbe/base/txgbe_e56.h create mode 100644 drivers/net/txgbe/base/txgbe_e56_bp.h
drivers/net/txgbe/base/meson.build +1 -0
@@ -12,4 +12,5 @@ base_sources = files( 'txgbe_mng.c', 'txgbe_phy.c', 'txgbe_vf.c', + 'txgbe_e56.c', )
drivers/net/txgbe/base/txgbe_aml.c +80 -25
177 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_aml.h +4 -2
@@ -16,7 +16,9 @@ s32 txgbe_get_link_capabilities_aml(struct txgbe_hw *hw, u32 *speed, bool *autoneg);u32 txgbe_get_media_type_aml (struct txgbe_hw *hw);void txgbe_wait_for_link_up_aml (struct txgbe_hw *hw,u32 speed); -s32 txgbe_setup_mac_link_aml (struct txgbe_hw *hw,u32 speed, -bool autoneg_wait_to_complete); +s32 txgbe_setup_phy_link_aml (struct txgbe_hw *hw, +u32 speed, +bool autoneg_wait_to_complete, +bool *need_reset);void txgbe_init_mac_link_ops_aml (struct txgbe_hw *hw);#endif /* _TXGBE_AML_H_ */
drivers/net/txgbe/base/txgbe_e56.c new file +2488 -0
2,488 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_e56.h new file +1746 -0
319 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_e56_bp.h new file +279 -0
279 lines not on this page · raw message
drivers/net/txgbe/txgbe_ethdev.c +82 -1
83 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.21.0.windows.1
Part of the diff is not shown here. View the raw message.
PATCH v6 13/21 net/txgbe: fix link stability for 40G NIC
In reply to Zaiyu WangThe link was previously configured via firmware, but this approach resulted in unstable link behavior. To resolve the issue, re-add the PHY configuration flow directly into the driver.
--- drivers/net/txgbe/base/txgbe_aml40.c | 73 +- drivers/net/txgbe/base/txgbe_aml40.h | 6 +- drivers/net/txgbe/base/txgbe_e56.c | 1473 ++++++++++++++++++++++++-- drivers/net/txgbe/base/txgbe_e56.h | 9 +- drivers/net/txgbe/txgbe_ethdev.c | 4 +- 5 files changed, 1447 insertions(+), 118 deletions(-)
drivers/net/txgbe/base/txgbe_aml40.c +56 -17
@@ -13,6 +13,7 @@#include "txgbe_hw.h" #include "txgbe_aml.h" #include "txgbe_aml40.h" +#include "txgbe_e56.h" void txgbe_init_ops_aml40 (struct txgbe_hw *hw) {
@@ -24,6 +25,7 @@ void txgbe_init_ops_aml40(struct txgbe_hw *hw)/* PHY */ phy->get_media_type = txgbe_get_media_type_aml40; + phy->setup_link_core = txgbe_setup_phy_link_aml40;/* LINK */ mac->init_mac_link_ops = txgbe_init_mac_link_ops_aml40;
@@ -52,6 +54,13 @@ s32 txgbe_check_mac_link_aml40(struct txgbe_hw *hw, u32 *speed,if (link_up_wait_to_complete) {for (i =0 ; i < hw->mac.max_link_up_time; i++) { +if (!hw->link_valid) { + *link_up = false; + +msleep (100 ); +continue ; + } +if (!(links_reg &TXGBE_PORTSTAT_UP )) { *link_up = false; }else {
@@ -68,6 +77,9 @@ s32 txgbe_check_mac_link_aml40(struct txgbe_hw *hw, u32 *speed, *link_up = false; } +if (!hw->link_valid) + *link_up = false; +if (*link_up) {if ((links_reg &TXGBE_CFG_PORT_ST_AML_LINK_40G ) ==TXGBE_CFG_PORT_ST_AML_LINK_40G )
@@ -107,20 +119,24 @@ u32 txgbe_get_media_type_aml40(struct txgbe_hw *hw)return txgbe_media_type_fiber_qsfp; } -s32 txgbe_setup_mac_link_aml40 (struct txgbe_hw *hw, -u32 speed, -bool autoneg_wait_to_complete) +s32 txgbe_setup_phy_link_aml40 (struct txgbe_hw *hw, +u32 speed, +bool autoneg_wait_to_complete, +bool *need_reset) {bool autoneg = false;s32 status =0 ; +s32 ret_status =0 ;u32 link_speed =TXGBE_LINK_SPEED_UNKNOWN ;bool link_up = false; +int i;u32 link_capabilities =TXGBE_LINK_SPEED_UNKNOWN ; +u32 value; -if (hw->phy.sfp_type == txgbe_sfp_type_not_present) { -DEBUGOUT ("SFP not detected, skip setup mac link" ); -return 0 ; - } + *need_reset = false; + +if (hw->phy.sfp_type == txgbe_sfp_type_not_present) + hw->phy.identify_sfp (hw);/* Check to see if speed passed in is supported. */ status = hw->mac.get_link_capabilities(hw,
@@ -132,18 +148,42 @@ s32 txgbe_setup_mac_link_aml40(struct txgbe_hw *hw,if (speed ==TXGBE_LINK_SPEED_UNKNOWN )return TXGBE_ERR_LINK_SETUP ; - status = hw->mac.check_link (hw, &link_speed, &link_up, - autoneg_wait_to_complete); +for (i =0 ; i <4 ; i++) { +txgbe_e56_check_phy_link (hw, &link_speed, &link_up); +if (link_up) +break ; +msleep (250 ); + }if (link_speed == speed && link_up) -return status; - -if (speed &TXGBE_LINK_SPEED_40GB_FULL ) - speed =0x20 ; - - status = hw->phy.set_link_hostif (hw, (u8 )speed, autoneg, true); + goto out; + +rte_spinlock_lock (&hw->phy_lock); + ret_status =txgbe_set_link_to_amlite (hw, speed); +if (ret_status ==TXGBE_ERR_TIMEOUT ) + hw->link_valid = false; +rte_spinlock_unlock (&hw->phy_lock); + +for (i =0 ; i <4 ; i++) { +txgbe_e56_check_phy_link (hw, &link_speed, &link_up); +if (link_up) + goto out; +msleep (250 ); + } -txgbe_wait_for_link_up_aml (hw, speed); +out: +if (link_up) { + value =rd32 (hw,TXGBE_PORTSTAT ); +if (!(value &TXGBE_PORTSTAT_UP )) { +DEBUGOUT ("MAC link 0x14404: 0x%x" , value); + *need_reset = true; + value =rd32 (hw,0x110b0 ); +DEBUGOUT ("MAC intr status 0x110b0: 0x%x" , value); + } + }else { + *need_reset = true; +DEBUGOUT ("Link reconfiguration required. Reset scheduled in 2000ms." ); + }return status; }
@@ -159,6 +199,5 @@ void txgbe_init_mac_link_ops_aml40(struct txgbe_hw *hw) mac->flap_tx_laser = txgbe_flap_tx_laser_multispeed_fiber; - mac->setup_link = txgbe_setup_mac_link_aml40; mac->set_rate_select_speed = txgbe_set_hard_rate_select_speed; }
drivers/net/txgbe/base/txgbe_aml40.h +4 -2
@@ -14,7 +14,9 @@ s32 txgbe_check_mac_link_aml40(struct txgbe_hw *hw,s32 txgbe_get_link_capabilities_aml40 (struct txgbe_hw *hw,u32 *speed,bool *autoneg);u32 txgbe_get_media_type_aml40 (struct txgbe_hw *hw); -s32 txgbe_setup_mac_link_aml40 (struct txgbe_hw *hw,u32 speed, -bool autoneg_wait_to_complete); +s32 txgbe_setup_phy_link_aml40 (struct txgbe_hw *hw, +u32 speed, +bool autoneg_wait_to_complete, +bool *need_reset);void txgbe_init_mac_link_ops_aml40 (struct txgbe_hw *hw);#endif /* _TXGBE_AML40_H_ */
drivers/net/txgbe/base/txgbe_e56.c +1378 -95
1,560 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_e56.h +7 -2
@@ -438,7 +438,12 @@ typedef union {#define E56PHY_FETX_FFE_TRAIN_CFG_0_KRT_FETX_INIT_FFE_CFG_2 9, 8#define E56PHY_FETX_FFE_TRAIN_CFG_0_KRT_FETX_INIT_FFE_CFG_3 13, 12 -#define PHYINIT_TIMEOUT 1000/* PHY initialization timeout value in 0.5ms unit */ +/* PHYINIT_TIMEOUT, a loop iteration counter, not a fixed time unit. +* The actual timeout duration depends on the usec_delay() or msleep() +* value used inside the polling loop. For example, when usec_delay(500) +* is used, the total timeout is approximately PHYINIT_TIMEOUT * 500 us. +*/ +#define PHYINIT_TIMEOUT 1000#define E56G__BASEADDR 0x0
@@ -1729,7 +1734,7 @@ typedef union {void set_fields_e56 (unsigned int *src_data,unsigned int bit_high,unsigned int bit_low,unsigned int set_value); -int txgbe_e56_rx_rd_second_code_40g (struct txgbe_hw *hw,int *SECOND_CODE ,int lane); +void txgbe_e56_rx_rd_second_code_40g (struct txgbe_hw *hw,int *SECOND_CODE ,int lane);void txgbe_e56_rx_rd_second_code (struct txgbe_hw *hw,int *SECOND_CODE );u32 txgbe_e56_cfg_40g (struct txgbe_hw *hw);u32 txgbe_e56_cfg_25g (struct txgbe_hw *hw);
drivers/net/txgbe/txgbe_ethdev.c +2 -2
@@ -2054,7 +2054,7 @@ txgbe_dev_stop(struct rte_eth_dev *dev)PMD_INIT_FUNC_TRACE (); -if (hw->mac.type == txgbe_mac_aml) +if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40)rte_eal_alarm_cancel (txgbe_dev_setup_link_alarm_handler_aml, hw);rte_eal_alarm_cancel (txgbe_dev_detect_sfp, dev);
@@ -3206,7 +3206,7 @@ txgbe_dev_setup_link_thread_handler(void *param)struct txgbe_hw *hw =TXGBE_DEV_HW (dev);rte_thread_detach (rte_thread_self ()); -if (hw->mac.type == txgbe_mac_aml) +if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40)txgbe_dev_setup_link_alarm_handler_aml (hw);else txgbe_dev_setup_link_alarm_handler (dev);
Signature · 1 line
2.21.0.windows.1
PATCH v6 14/21 net/txgbe: fix link stability for Amber-Lite backplane mode
In reply to Zaiyu WangThe link was previously configured via firmware, but this approach resulted in unstable link behavior. To resolve the issue, re-add the PHY configuration flow directly into the driver.
--- drivers/net/txgbe/base/meson.build | 1 + drivers/net/txgbe/base/txgbe.h | 2 + drivers/net/txgbe/base/txgbe_aml.c | 65 +- drivers/net/txgbe/base/txgbe_aml40.c | 43 +- drivers/net/txgbe/base/txgbe_e56.c | 22 +- drivers/net/txgbe/base/txgbe_e56.h | 2 + drivers/net/txgbe/base/txgbe_e56_bp.c | 2597 +++++++++++++++++++++++++ drivers/net/txgbe/base/txgbe_e56_bp.h | 3 + drivers/net/txgbe/base/txgbe_hw.c | 6 + drivers/net/txgbe/base/txgbe_hw.h | 4 +- drivers/net/txgbe/base/txgbe_osdep.h | 4 + drivers/net/txgbe/base/txgbe_phy.c | 21 + drivers/net/txgbe/base/txgbe_phy.h | 22 + drivers/net/txgbe/base/txgbe_type.h | 25 +- drivers/net/txgbe/txgbe_ethdev.c | 109 +- drivers/net/txgbe/txgbe_ethdev.h | 2 +- 16 files changed, 2898 insertions(+), 30 deletions(-) create mode 100644 drivers/net/txgbe/base/txgbe_e56_bp.c
drivers/net/txgbe/base/meson.build +1 -0
@@ -13,4 +13,5 @@ base_sources = files( 'txgbe_phy.c', 'txgbe_vf.c', 'txgbe_e56.c', + 'txgbe_e56_bp.c', )
drivers/net/txgbe/base/txgbe.h +2 -0
@@ -13,5 +13,7 @@#include "txgbe_hw.h" #include "txgbe_vf.h" #include "txgbe_dcb.h" +#include "txgbe_e56.h" +#include "txgbe_e56_bp.h" #endif /* _TXGBE_H_ */
drivers/net/txgbe/base/txgbe_aml.c +54 -11
102 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_aml40.c +39 -4
73 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_e56.c +12 -10
@@ -53,7 +53,7 @@ int txgbe_e56_int_cmp(const void *a, const void *b) }s32 txgbe_e56_check_phy_link (struct txgbe_hw *hw,u32 *speed, -bool *link_up) +bool *link_up) {u32 rdata =0 ;u32 links_reg =0 ;
@@ -101,7 +101,8 @@ u32 txgbe_e56_tx_ffe_cfg(struct txgbe_hw *hw, u32 speed) post =S10G_TX_FFE_CFG_POST ; }else if (speed ==TXGBE_LINK_SPEED_25GB_FULL ) {if (hw->phy.sfp_type == txgbe_sfp_type_da_cu_core0 || - hw->phy.sfp_type == txgbe_sfp_type_da_cu_core1) { + hw->phy.sfp_type == txgbe_sfp_type_da_cu_core1 || +txgbe_is_backplane (hw)) { ffe_main =S25G_TX_FFE_CFG_DAC_MAIN ; pre1 =S25G_TX_FFE_CFG_DAC_PRE1 ; pre2 =S25G_TX_FFE_CFG_DAC_PRE2 ;
@@ -119,7 +120,8 @@ u32 txgbe_e56_tx_ffe_cfg(struct txgbe_hw *hw, u32 speed) post =S10G_TX_FFE_CFG_POST ;if (hw->phy.sfp_type == txgbe_qsfp_type_40g_cu_core0 || - hw->phy.sfp_type == txgbe_qsfp_type_40g_cu_core1) { + hw->phy.sfp_type == txgbe_qsfp_type_40g_cu_core1 || +txgbe_is_backplane (hw)) { ffe_main =S40G_TX_FFE_CFG_MAIN ; pre1 =S40G_TX_FFE_CFG_PRE1 ; pre2 =S40G_TX_FFE_CFG_PRE2 ;
@@ -1508,7 +1510,7 @@ txgbe_e56_rxs_osc_init_for_temp_track_range(struct txgbe_hw *hw, u32 speed) rdata =rd32_ephy (hw, addr);if (timer++ >PHYINIT_TIMEOUT ) { -DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!\n" ); +DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!" );return -1 ; } }
@@ -1542,7 +1544,7 @@ txgbe_e56_rxs_osc_init_for_temp_track_range(struct txgbe_hw *hw, u32 speed)if (((rdata >> (i *8 )) &0x3f ) ==0x21 )break ;if (timer++ >PHYINIT_TIMEOUT ) { -DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!\n" ); +DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!" );return -1 ; } }
@@ -1618,7 +1620,7 @@ txgbe_e56_rxs_osc_init_for_temp_track_range(struct txgbe_hw *hw, u32 speed) addr =E56PHY_CTRL_FSM_RX_STAT_0_ADDR ; rdata =rd32_ephy (hw, addr);if (timer++ >PHYINIT_TIMEOUT ) { -DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!\n" ); +DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!" );return -1 ; } }
@@ -1664,7 +1666,7 @@ txgbe_e56_rxs_osc_init_for_temp_track_range(struct txgbe_hw *hw, u32 speed)if (((rdata >> (i *8 )) &0x3f ) ==0x21 )break ;if (timer++ >PHYINIT_TIMEOUT ) { -DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!\n" ); +DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!" );return -1 ; } }
@@ -1929,7 +1931,7 @@ int txgbe_temp_track_seq_40g(struct txgbe_hw *hw, u32 speed)CMVAR_UFINE_FMIN_WRAP =S25G_CMVAR_UFINE_FMIN_WRAP ;CMVAR_FINE_FMIN_WRAP =S25G_CMVAR_FINE_FMIN_WRAP ; }else { -DEBUGOUT ("Error Speed\n" ); +DEBUGOUT ("Error Speed" );return 0 ; }
@@ -3190,7 +3192,7 @@ static int txgbe_e56_disable_rx40G(struct txgbe_hw *hw) rdata =rd32_ephy (hw, addr);usec_delay (100 );if (timer++ >PHYINIT_TIMEOUT ) { -DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!\n" ); +DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!" );break ; } }
@@ -3296,7 +3298,7 @@ static int txgbe_e56_disable_rx(struct txgbe_hw *hw)break ;usec_delay (100 );if (timer++ >PHYINIT_TIMEOUT ) { -DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!\n" ); +DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!" );break ; } }
drivers/net/txgbe/base/txgbe_e56.h +2 -0
@@ -1744,6 +1744,8 @@ int txgbe_temp_track_seq(struct txgbe_hw *hw, u32 speed);int txgbe_e56_get_temp (struct txgbe_hw *hw,int *temp);int txgbe_set_link_to_amlite (struct txgbe_hw *hw,u32 speed);int txgbe_e56_reconfig_rx (struct txgbe_hw *hw,u32 speed); +s32 txgbe_e56_check_phy_link (struct txgbe_hw *hw,u32 *speed, +bool *link_up);s32 txgbe_e56_fec_set (struct txgbe_hw *hw);s32 txgbe_e56_fec_polling (struct txgbe_hw *hw,bool *link_up);u32 txgbe_e56_tx_ffe_cfg (struct txgbe_hw *hw,u32 speed);
drivers/net/txgbe/base/txgbe_e56_bp.c new file +2597 -0
2,597 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_e56_bp.h +3 -0
@@ -276,4 +276,7 @@ typedef union {#define E56PHY_CMS_ANA_OVRDVAL_10_ADDR (E56PHY_CMS_BASE_ADDR + 0xD8)#define E56PHY_CMS_ANA_OVRDVAL_7_ANA_LCPLL_LF_LPF_SETCODE_CALIB_I 8, 4 +int txgbe_e56_set_phy_link_mode (struct txgbe_hw *hw, +u8 bp_link_mode,u32 need_restart); +int handle_e56_bkp_an73_flow (struct txgbe_hw *hw);#endif
drivers/net/txgbe/base/txgbe_hw.c +6 -0
@@ -4071,6 +4071,12 @@ s32 txgbe_reset_pipeline_raptor(struct txgbe_hw *hw)return err; } +bool txgbe_is_backplane (struct txgbe_hw *hw) +{ +return hw->phy.get_media_type (hw) == txgbe_media_type_backplane ? + true : false; +} +bool txgbe_gpio_ext_check (struct txgbe_hw *hw,u8 gpio_ext_mask) {u32 gpio_ext =rd32 (hw,TXGBE_GPIOEXT );
drivers/net/txgbe/base/txgbe_hw.h +2 -2
@@ -118,6 +118,6 @@ s32 txgbe_reinit_fdir_tables(struct txgbe_hw *hw);bool txgbe_verify_lesm_fw_enabled_raptor (struct txgbe_hw *hw);s32 txgbe_fmgr_cmd_op (struct txgbe_hw *hw,u32 cmd,u32 cmd_addr);s32 txgbe_flash_read_dword (struct txgbe_hw *hw,u32 addr,u32 *data); -s32 txgbe_e56_check_phy_link (struct txgbe_hw *hw,u32 *speed, -bool *link_up); +bool txgbe_is_backplane (struct txgbe_hw *hw); +bool txgbe_gpio_ext_check (struct txgbe_hw *hw,u8 gpio_ext_mask);#endif /* _TXGBE_HW_H_ */
drivers/net/txgbe/base/txgbe_osdep.h +4 -0
@@ -162,6 +162,10 @@ static inline u64 REVERT_BIT_MASK64(u64 mask) ((mask &0xFFFFFFFF00000000 ) >>32 ); } +#define BITS_PER_LONG (__SIZEOF_LONG__ * 8) +#define GENMASK (h, l) \ + (((~0UL) << (l)) & (~0UL >> (BITS_PER_LONG - 1 - (h)))) +#define IOMEM #define BIT (nr) (1UL << (nr))
drivers/net/txgbe/base/txgbe_phy.c +21 -0
@@ -2503,6 +2503,27 @@ void txgbe_set_phy_temp(struct txgbe_hw *hw) } } +int txgbe_is_dac_cable (struct txgbe_hw *hw) +{ +if (hw->phy.sfp_type == txgbe_sfp_type_da_cu_core0 || + hw->phy.sfp_type == txgbe_sfp_type_da_cu_core1 || + hw->phy.sfp_type == txgbe_sfp_type_da_act_lmt_core0 || + hw->phy.sfp_type == txgbe_sfp_type_da_act_lmt_core1 || + hw->phy.sfp_type == txgbe_qsfp_type_40g_cu_core0 || + hw->phy.sfp_type == txgbe_qsfp_type_40g_cu_core1) +return true; + +return false; +} + +int txgbe_xpcs_an_enabled (struct txgbe_hw *hw) +{ +if (!(txgbe_is_dac_cable (hw) ||txgbe_is_backplane (hw))) +return false; + +return hw->devarg.auto_neg ? true : false; +} +/** * txgbe_kr_handle - Handle the interrupt of auto-negotiation * @hw: pointer to hardware structure
drivers/net/txgbe/base/txgbe_phy.h +22 -0
@@ -105,6 +105,8 @@#define VR_AN_INTR_CMPLT MS16(0, 0x1)#define VR_AN_INTR_LINK MS16(1, 0x1)#define VR_AN_INTR_PG_RCV MS16(2, 0x1) +#define TXGBE_E56_AN_TXDIS MS16(3, 0x1) +#define TXGBE_E56_AN_PG_RCV MS16(4, 0x1)#define VR_AN_KR_MODE_CL 0x078003#define VR_AN_KR_MODE_CL_PDET MS16(0, 0x1)#define VR_XS_OR_PCS_MMD_DIGI_CTL1 0x038000
@@ -428,6 +430,24 @@#define TXGBE_BP_M_NAUTO 0#define TXGBE_BP_M_AUTO 1 +#define kr_read_poll (op, val, cond, sleep_us, \ + times, args...) \ +({ \ + unsigned long __sleep_us = (sleep_us); \ + u32 __times = (times); \ + u32 i; \ + int __cond = 0; \ + for (i = 0; i < __times; i++) { \ + (val) = op(args); \ + if (cond) { \ + __cond = 1; \ + break; \ + } \ + usec_delay(__sleep_us);\ + } \ + (__cond) ? 0 : -1; \ +}) +#ifndef CL72_KRTR_PRBS_MODE_EN #define CL72_KRTR_PRBS_MODE_EN 0xFFFF/* open kr prbs check */ #endif
@@ -490,6 +510,8 @@ void txgbe_autoc_write(struct txgbe_hw *hw, u64 value);void txgbe_bp_mode_set (struct txgbe_hw *hw);void txgbe_set_phy_temp (struct txgbe_hw *hw);void txgbe_bp_down_event (struct txgbe_hw *hw); +int txgbe_is_dac_cable (struct txgbe_hw *hw); +int txgbe_xpcs_an_enabled (struct txgbe_hw *hw);s32 txgbe_kr_handle (struct txgbe_hw *hw);#endif /* _TXGBE_PHY_H_ */
drivers/net/txgbe/base/txgbe_type.h +24 -1
@@ -719,6 +719,7 @@ struct txgbe_phy_info {u32 addr;u32 id;enum txgbe_sfp_type sfp_type; +u32 fiber_suppport_speed;bool sfp_setup_needed;u32 revision;u32 media_type;
@@ -740,6 +741,7 @@ struct txgbe_phy_info {u16 ffe_pre2;u16 ffe_post;u16 fec_mode; +u16 bp_capa; };#define TXGBE_DEVARG_BP_AUTO "auto_neg"
@@ -899,7 +901,28 @@ struct txgbe_hw {u32 cur_fec_link;int temperature;u32 bp_link_mode; -}; +bool dac_sfp; +bool bypass_ctle; +u32 curbp_link_mode; +bool an_done;
Lines of this file are not shown. View the raw message.
drivers/net/txgbe/txgbe_ethdev.c +108 -1
109 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.21.0.windows.1
Part of the diff is not shown here. View the raw message.
PATCH v6 15/21 net/txgbe: fix FEC mode configuration on 25G NIC
In reply to Zaiyu WangThe 25G NIC offers off, RS, Base-R, and auto FEC modes. When reconfiguring the PHY, the FEC mode must match on both sides; otherwise, the link cannot come up. The current driver fails to maintain this requirement, causing link instability.
Add proper FEC mode handling during PHY reconfiguration to guarantee link establishment.
--- drivers/net/txgbe/base/txgbe_aml.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/net/txgbe/base/txgbe_aml.c +12 -1
@@ -282,6 +282,14 @@ s32 txgbe_setup_phy_link_aml(struct txgbe_hw *hw, !(hw->fec_mode & hw->cur_fec_link))) goto out; +if (speed ==TXGBE_LINK_SPEED_25GB_FULL && + link_speed ==TXGBE_LINK_SPEED_25GB_FULL ) { +txgbe_e56_fec_polling (hw, &link_up); + +if (link_up) + goto out; + } +rte_spinlock_lock (&hw->phy_lock); ret_status =txgbe_set_link_to_amlite (hw, speed);rte_spinlock_unlock (&hw->phy_lock);
@@ -360,7 +368,10 @@ static s32 txgbe_setup_mac_link_multispeed_fiber_aml(struct txgbe_hw *hw,/* If we already have link at this speed, just jump out */ txgbe_e56_check_phy_link (hw, &link_speed, &link_up); -if (link_speed ==TXGBE_LINK_SPEED_25GB_FULL && link_up) + hw->cur_fec_link =txgbe_phy_fec_get (hw); + +if (link_speed ==TXGBE_LINK_SPEED_25GB_FULL && link_up && + hw->fec_mode & hw->cur_fec_link) goto out;/* Allow module to change analog characteristics (10G -> 25G) */
Signature · 1 line
2.21.0.windows.1
PATCH v6 16/21 net/txgbe: fix SFP module identification
In reply to Zaiyu WangSome optical modules were not correctly recognized due to ambiguous classification in the original detection flow. Rework the module identification logic to cover all module types. Also narrow the I2C lock scope to avoid potential race conditions during module access.
--- drivers/net/txgbe/base/txgbe_hw.c | 2 - drivers/net/txgbe/base/txgbe_phy.c | 341 ++++++++++------------------ drivers/net/txgbe/base/txgbe_phy.h | 18 +- drivers/net/txgbe/base/txgbe_type.h | 2 + 4 files changed, 134 insertions(+), 229 deletions(-)
drivers/net/txgbe/base/txgbe_hw.c +0 -2
@@ -2909,8 +2909,6 @@ s32 txgbe_init_ops_generic(struct txgbe_hw *hw) phy->read_i2c_eeprom = txgbe_read_i2c_eeprom; phy->write_i2c_eeprom = txgbe_write_i2c_eeprom; phy->identify_sfp = txgbe_identify_module; - phy->read_i2c_byte_unlocked = txgbe_read_i2c_byte_unlocked; - phy->write_i2c_byte_unlocked = txgbe_write_i2c_byte_unlocked; phy->check_overtemp = txgbe_check_overtemp; phy->reset = txgbe_reset_phy; phy->set_link_hostif = txgbe_hic_ephy_set_link;
drivers/net/txgbe/base/txgbe_phy.c +119 -222
471 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_phy.h +13 -5
@@ -261,7 +261,9 @@#define TXGBE_SFF_SFF_8472_COMP 0x5E#define TXGBE_SFF_SFF_8472_OSCB 0x6E#define TXGBE_SFF_SFF_8472_ESCB 0x76 +#define TXGBE_SFF_QSFP_PAGE_SELECT 0x7F +#define TXGBE_SFF_IDENTIFIER_QSFP 0x0C#define TXGBE_SFF_IDENTIFIER_QSFP_PLUS 0x0D#define TXGBE_SFF_QSFP_VENDOR_OUI_BYTE0 0xA5#define TXGBE_SFF_QSFP_VENDOR_OUI_BYTE1 0xA6
@@ -289,6 +291,9 @@#define TXGBE_SFF_4x10GBASESR_CAP 0x11#define TXGBE_SFF_40GBASEPSM4_PARALLEL 0x12#define TXGBE_SFF_40GBASE_SWMD4_CAP 0x1f +#define TXGBE_SFF_COPPER_5M 0x5 +#define TXGBE_SFF_COPPER_3M 0x3 +#define TXGBE_SFF_COPPER_1M 0x1#define TXGBE_SFF_DA_SPEC_ACTIVE_LIMITING 0x4#define TXGBE_SFF_25GAUI_C2M_AOC_BER_5 0x1
@@ -296,6 +301,11 @@#define TXGBE_SFF_25GAUI_C2M_AOC_BER_12 0x18#define TXGBE_SFF_25GAUI_C2M_ACC_BER_12 0x19 +#define TXGBE_ETHERNET_COMP_OFFSET 0x83 +#define TXGBE_SFF_ETHERNET_40G_CR4 MS(3, 0x1) +#define TXGBE_SFF_ETHERNET_40G_SR4 MS(2, 0x1) +#define TXGBE_SFF_ETHERNET_40G_LR4 MS(1, 0x1) +#define TXGBE_SFF_SOFT_RS_SELECT_MASK 0x8#define TXGBE_SFF_SOFT_RS_SELECT_10G 0x8#define TXGBE_SFF_SOFT_RS_SELECT_1G 0x0
@@ -493,14 +503,12 @@ s32 txgbe_identify_qsfp_module(struct txgbe_hw *hw);s32 txgbe_check_overtemp (struct txgbe_hw *hw);s32 txgbe_read_i2c_byte (struct txgbe_hw *hw,u8 byte_offset,u8 dev_addr,u8 *data); -s32 txgbe_read_i2c_byte_unlocked (struct txgbe_hw *hw,u8 byte_offset, -u8 dev_addr,u8 *data);s32 txgbe_write_i2c_byte (struct txgbe_hw *hw,u8 byte_offset,u8 dev_addr,u8 data); -s32 txgbe_write_i2c_byte_unlocked (struct txgbe_hw *hw,u8 byte_offset, -u8 dev_addr,u8 data);s32 txgbe_read_i2c_sff8472 (struct txgbe_hw *hw,u8 byte_offset, -u8 *sff8472_data); +u8 *sff8472_data); +s32 txgbe_read_i2c_sff8636 (struct txgbe_hw *hw,u8 page,u8 byte_offset, +u8 *sff8636_data);s32 txgbe_read_i2c_eeprom (struct txgbe_hw *hw,u8 byte_offset,u8 *eeprom_data); s32 txgbe_write_i2c_eeprom(struct txgbe_hw *hw, u8 byte_offset,
drivers/net/txgbe/base/txgbe_type.h +2 -0
@@ -702,6 +702,8 @@ struct txgbe_phy_info { u8 dev_addr, u8 data);s32 (*read_i2c_sff8472)(struct txgbe_hw *hw,u8 byte_offset,u8 *sff8472_data); +s32 (*read_i2c_sff8636)(struct txgbe_hw *hw,u8 page,u8 byte_offset, +u8 *sff8636_data);s32 (*read_i2c_eeprom)(struct txgbe_hw *hw,u8 byte_offset,u8 *eeprom_data); s32 (*write_i2c_eeprom)(struct txgbe_hw *hw, u8 byte_offset,
Signature · 1 line
2.21.0.windows.1
PATCH v6 17/21 net/txgbe: fix get module info operation
In reply to Zaiyu WangThe original I2C access flow in the module information retrieval process was flawed. Correct the implementation to properly fetch module info.
--- drivers/net/txgbe/base/txgbe_phy.h | 6 +- drivers/net/txgbe/txgbe_ethdev.c | 118 +++++++++++++++++++++++------ 2 files changed, 98 insertions(+), 26 deletions(-)
drivers/net/txgbe/base/txgbe_phy.h +5 -1
@@ -258,10 +258,14 @@#define TXGBE_SFF_CABLE_DA_ACTIVE 0x8#define TXGBE_SFF_CABLE_SPEC_COMP 0x3C#define TXGBE_SFF_SFF_8472_SWAP 0x5C +#define TXGBE_SFF_DDM_IMPLEMENTED 0x40#define TXGBE_SFF_SFF_8472_COMP 0x5E#define TXGBE_SFF_SFF_8472_OSCB 0x6E#define TXGBE_SFF_SFF_8472_ESCB 0x76 -#define TXGBE_SFF_QSFP_PAGE_SELECT 0x7F +#define TXGBE_SFF_SFF_REVISION_ADDR 0x01 +#define TXGBE_SFF_QSFP_PAGE_SELECT 0x7F + +#define TXGBE_MODULE_QSFP_MAX_LEN 640#define TXGBE_SFF_IDENTIFIER_QSFP 0x0C#define TXGBE_SFF_IDENTIFIER_QSFP_PLUS 0x0D
drivers/net/txgbe/txgbe_ethdev.c +93 -25
134 lines not on this page · raw message
Signature · 1 line
2.21.0.windows.1
PATCH v6 18/21 net/txgbe: fix get EEPROM operation
In reply to Zaiyu WangThe original I2C access flow in the module information retrieval process was flawed. Correct the implementation to properly fetch module info.
--- drivers/net/txgbe/base/txgbe_phy.h | 1 + drivers/net/txgbe/txgbe_ethdev.c | 81 +++++++++++++++++++++++++++--- 2 files changed, 76 insertions(+), 6 deletions(-)
drivers/net/txgbe/base/txgbe_phy.h +1 -0
@@ -245,6 +245,7 @@/* EEPROM (dev_addr = 0xA0) */ #define TXGBE_I2C_EEPROM_DEV_ADDR 0xA0#define TXGBE_SFF_IDENTIFIER 0x00 +#define TXGBE_SFF_8636_STATUS_OFFSET 0x02#define TXGBE_SFF_IDENTIFIER_SFP 0x03#define TXGBE_SFF_VENDOR_OUI_BYTE0 0x25#define TXGBE_SFF_VENDOR_OUI_BYTE1 0x26
drivers/net/txgbe/txgbe_ethdev.c +75 -6
98 lines not on this page · raw message
Signature · 1 line
2.21.0.windows.1
PATCH v6 19/21 net/txgbe: fix to reset Tx write-back pointer
In reply to Zaiyu WangThe write-back pointer was not reset when the Tx queue was reset. This leads to the wrong Tx desc free logic. Move the resetting of pointer into txq->ops->reset(txq).
--- drivers/net/txgbe/txgbe_rxtx.c | 45 +++++++++++++---------- drivers/net/txgbe/txgbe_rxtx.h | 1 + drivers/net/txgbe/txgbe_rxtx_vec_common.h | 7 ++++ 3 files changed, 33 insertions(+), 20 deletions(-)
drivers/net/txgbe/txgbe_rxtx.c +25 -20
@@ -2313,6 +2313,12 @@ txgbe_reset_tx_queue(struct txgbe_tx_queue *txq) txq->tx_next_dd = (uint16_t )(txq->tx_free_thresh -1 ); txq->tx_tail =0 ; +/* Zero out headwb_mem memory */ +if (txq->headwb_mem) { +for (i =0 ; i < txq->headwb_size; i++) + txq->headwb_mem[i] =0 ; + } +/* * Always allow 1 descriptor to be un-allocated to avoid * a H/W race condition
@@ -2412,7 +2418,7 @@ txgbe_get_tx_port_offloads(struct rte_eth_dev *dev)return tx_offload_capa; } -static int +static void txgbe_setup_headwb_resources (struct rte_eth_dev *dev,void *tx_queue,unsigned int socket_id)
@@ -2420,33 +2426,33 @@ txgbe_setup_headwb_resources(struct rte_eth_dev *dev,struct txgbe_hw *hw =TXGBE_DEV_HW (dev);const struct rte_memzone *headwb;struct txgbe_tx_queue *txq = tx_queue; -u8 i, headwb_size =0 ; +u8 headwb_size =0 ; -if (hw->mac.type != txgbe_mac_aml && hw->mac.type != txgbe_mac_aml40) { - txq->headwb_mem =NULL ; -return 0 ; - } +if (hw->mac.type != txgbe_mac_aml && hw->mac.type != txgbe_mac_aml40) + goto out; + +if (!hw->devarg.tx_headwb) + goto out; - headwb_size = hw->devarg.tx_headwb_size; + headwb_size = txq->headwb_size; headwb =rte_eth_dma_zone_reserve (dev,"tx_headwb_mem" , txq->queue_id,sizeof (u32) * headwb_size,TXGBE_ALIGN , socket_id);if (headwb ==NULL ) { -DEBUGOUT ("Fail to setup headwb resources: no mem" ); -txgbe_tx_queue_release (txq); -return -ENOMEM ; +PMD_DRV_LOG (INFO , +"Failed to allocate headwb memory for Tx queue %u, change to SP mode" , + txq->queue_id); + goto out; } txq->headwb = headwb; txq->headwb_dma =TMZ_PADDR (headwb); txq->headwb_mem = (uint32_t *)TMZ_VADDR (headwb); +return ; -/* Zero out headwb_mem memory */ -for (i =0 ; i < headwb_size; i++) - txq->headwb_mem[i] =0 ; - -return 0 ; +out: + txq->headwb_mem =NULL ; }int __rte_cold
@@ -2542,6 +2548,7 @@ txgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, txq->offloads = offloads; txq->ops = &def_txq_ops; txq->tx_deferred_start = tx_conf->tx_deferred_start; + txq->headwb_size = hw->devarg.tx_headwb_size;#ifdef RTE_LIB_SECURITY txq->using_ipsec = !!(dev->data->dev_conf.txmode.offloads &RTE_ETH_TX_OFFLOAD_SECURITY );
@@ -2577,8 +2584,7 @@ txgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,/* set up scalar TX function as appropriate */ txgbe_set_tx_function (dev, txq); -if (hw->devarg.tx_headwb) - err =txgbe_setup_headwb_resources (dev, txq, socket_id); +txgbe_setup_headwb_resources (dev, txq, socket_id); txq->ops->reset (txq); txq->desc_error =0 ;
@@ -4755,15 +4761,14 @@ txgbe_dev_tx_init(struct rte_eth_dev *dev)wr32 (hw,TXGBE_TXRP (txq->reg_idx),0 );wr32 (hw,TXGBE_TXWP (txq->reg_idx),0 ); -if ((hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) && - hw->devarg.tx_headwb) { +if (txq->headwb_mem) {uint32_t txdctl;wr32 (hw,TXGBE_PX_TR_HEAD_ADDRL (txq->reg_idx), (uint32_t )(txq->headwb_dma &BIT_MASK32 ));wr32 (hw,TXGBE_PX_TR_HEAD_ADDRH (txq->reg_idx), (uint32_t )(txq->headwb_dma >>32 )); -if (hw->devarg.tx_headwb_size ==16 ) +if (txq->headwb_size ==16 ) txdctl =TXGBE_PX_TR_CFG_HEAD_WB |TXGBE_PX_TR_CFG_HEAD_WB_64BYTE ;else
drivers/net/txgbe/txgbe_rxtx.h +1 -0
@@ -416,6 +416,7 @@ struct txgbe_tx_queue {uint64_t desc_error;bool resetting;const struct rte_memzone *headwb; +uint16_t headwb_size;uint64_t headwb_dma;volatile uint32_t *headwb_mem; };
drivers/net/txgbe/txgbe_rxtx_vec_common.h +7 -0
@@ -252,6 +252,13 @@ _txgbe_reset_tx_queue_vec(struct txgbe_tx_queue *txq) txq->tx_next_dd = (uint16_t )(txq->tx_free_thresh -1 ); txq->tx_tail =0 ; + +/* Zero out headwb_mem memory */ +if (txq->headwb_mem) { +for (i =0 ; i < txq->headwb_size; i++) + txq->headwb_mem[i] =0 ; + } +/* * Always allow 1 descriptor to be un-allocated to avoid * a H/W race condition
Signature · 1 line
2.21.0.windows.1
PATCH v6 20/21 net/txgbe: fix to enable Tx desc check
In reply to Zaiyu WangNow lib security is enabled by default, and cannot be disabled if the driver is intended to be used. So Tdm_desc_chk is always unable to enable. Remove this restriction, and just enable the corresponding queue check.
--- drivers/net/txgbe/txgbe_rxtx.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/net/txgbe/txgbe_rxtx.c +6 -5
@@ -4761,6 +4761,12 @@ txgbe_dev_tx_init(struct rte_eth_dev *dev)wr32 (hw,TXGBE_TXRP (txq->reg_idx),0 );wr32 (hw,TXGBE_TXWP (txq->reg_idx),0 ); +#ifdef RTE_LIB_SECURITY + if (!txq->using_ipsec) +#endif +wr32m (hw,TXGBE_TDM_DESC_CHK (txq->reg_idx /32 ), +RTE_BIT32 (txq->reg_idx %32 ),RTE_BIT32 (txq->reg_idx %32 )); +if (txq->headwb_mem) {uint32_t txdctl;
@@ -4778,11 +4784,6 @@ txgbe_dev_tx_init(struct rte_eth_dev *dev) } } -#ifndef RTE_LIB_SECURITY -for (i =0 ; i <4 ; i++) -wr32 (hw,TXGBE_TDM_DESC_CHK (i),0xFFFFFFFF ); -#endif -/* Device configured with multiple TX queues. */ txgbe_dev_mq_tx_configure (dev); }
Signature · 1 line
2.21.0.windows.1
PATCH v6 21/21 net/txgbe: fix temperature track for AML NIC
In reply to Zaiyu WangPreviously, temperature tracking for the amlite NIC was handled by firmware together with the hardware setup. However, the firmware-based PHY configuration has proven to be unstable.
Re-add the temperature tracking function directly in the driver and invoke it periodically to ensure the PHY remains calibrated. According to the hardware recommendation, the tracking sequence should be run at least every 100 ms to keep temperature drift within 5 °C. Considering the software and hardware overhead, a 2-second interval is used as a practical trade-off that still meets stability requirements while minimizing performance impact.
The periodic tracking is implemented using a timer in the driver, and the sequence itself is the same as the one originally performed during link setup.
--- drivers/net/txgbe/txgbe_ethdev.c | 44 +++++++++++++++++++++++++++++++- drivers/net/txgbe/txgbe_ethdev.h | 1 + 2 files changed, 44 insertions(+), 1 deletion(-)
drivers/net/txgbe/txgbe_ethdev.c +43 -1
@@ -2011,8 +2011,10 @@ txgbe_dev_start(struct rte_eth_dev *dev)txgbe_filter_restore (dev); hw->bp_event_interval =100 *1000 ; -if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) +if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) {rte_eal_alarm_set (hw->bp_event_interval, txgbe_dev_e56_check_bp_event, dev); +rte_eal_alarm_set (1000 *1000 *2 , txgbe_dev_check_aml_temp_event, dev); + }if (tm_conf->root && !tm_conf->committed) PMD_DRV_LOG(WARNING,
@@ -2060,6 +2062,7 @@ txgbe_dev_stop(struct rte_eth_dev *dev)if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) {rte_eal_alarm_cancel (txgbe_dev_e56_check_bp_event, dev); +rte_eal_alarm_cancel (txgbe_dev_check_aml_temp_event, dev);rte_eal_alarm_cancel (txgbe_dev_setup_link_alarm_handler_aml, hw); }
@@ -2932,6 +2935,45 @@ txgbe_dev_supported_ptypes_get(struct rte_eth_dev *dev, size_t *no_of_elements)return NULL ; } +void txgbe_dev_check_aml_temp_event (void *param) +{ +struct rte_eth_dev *dev = (struct rte_eth_dev *)param; +struct txgbe_hw *hw =TXGBE_DEV_HW (dev); +uint32_t link_speed =0 , val =0 ; +s32 status =0 ; +int temp; + +if (hw ==NULL ) +return ; + + status =txgbe_e56_get_temp (hw, &temp); +if (status) + temp =DEFAULT_TEMP ; + +if (!(temp - hw->temperature >4 || + hw->temperature - temp >4 )) + goto out; + + hw->temperature = temp; + val =rd32 (hw,TXGBE_PORT ); +if (val &TXGBE_AMLITE_LED_LINK_40G ) + link_speed =TXGBE_LINK_SPEED_40GB_FULL ; +else if (val &TXGBE_AMLITE_LED_LINK_25G ) + link_speed =TXGBE_LINK_SPEED_25GB_FULL ; +else + link_speed =TXGBE_LINK_SPEED_10GB_FULL ; + +rte_spinlock_lock (&hw->phy_lock); +if (hw->mac.type == txgbe_mac_aml) +txgbe_temp_track_seq (hw, link_speed); +else if (hw->mac.type == txgbe_mac_aml40) +txgbe_temp_track_seq_40g (hw, link_speed); +rte_spinlock_unlock (&hw->phy_lock); + +out: +rte_eal_alarm_set (1000 *1000 *2 , txgbe_dev_check_aml_temp_event, dev); +} +void txgbe_dev_e56_check_bp_event (void *param) {struct rte_eth_dev *dev = (struct rte_eth_dev *)param;
drivers/net/txgbe/txgbe_ethdev.h +1 -0
@@ -747,5 +747,6 @@ void txgbe_vlan_hw_strip_bitmap_set(struct rte_eth_dev *dev, uint16_t queue, bool on);void txgbe_config_vlan_strip_on_all_queues (struct rte_eth_dev *dev,int mask); +void txgbe_dev_check_aml_temp_event (void *param);void txgbe_dev_e56_check_bp_event (void *param);#endif /* _TXGBE_ETHDEV_H_ */
Signature · 1 line
2.21.0.windows.1
Quoted 65 lines · On Tue, 16 Jun 2026 20:20:08 +0800 Zaiyu Wang <[email protected]> wrote:
This series fixes several issues found on Wangxun Emerald, Sapphire and Amber-lite NICs, with a focus on link-related problems.
---
v6:
- Fixed more issues identified by AI review
---
v5:
- Fixed issues identified by AI review
---
v4:
- Fixed issues identified by devtools scripts
---
v3:
- Addressed Stephen's comments
---
v2:
- Fixed compilation error and code style issues
---Zaiyu Wang (21):
net/txgbe: remove duplicate xstats counters net/ngbe: remove duplicate xstats counters net/ngbe: add missing CDR config for YT PHY net/ngbe: fix VF promiscuous and allmulticast net/txgbe: fix inaccuracy in Tx rate limiting net/txgbe: fix link status check condition net/txgbe: fix Tx desc free logic
net/txgbe: fix link flow control registers for Amber-Lite net/txgbe: fix link flow control config for Sapphire net/txgbe: fix a mass of unknown interrupts net/txgbe: fix traffic class priority configuration net/txgbe: fix link stability for 25G NIC net/txgbe: fix link stability for 40G NIC net/txgbe: fix link stability for Amber-Lite backplane mode net/txgbe: fix FEC mode configuration on 25G NIC net/txgbe: fix SFP module identification net/txgbe: fix get module info operation net/txgbe: fix get EEPROM operation
net/txgbe: fix to reset Tx write-back pointer net/txgbe: fix to enable Tx desc check
net/txgbe: fix temperature track for AML NICdrivers/net/ngbe/base/ngbe_phy_yt.c | 3 + drivers/net/ngbe/ngbe_ethdev.c | 5 - drivers/net/ngbe/ngbe_ethdev_vf.c | 11 +- drivers/net/txgbe/base/meson.build | 2 + drivers/net/txgbe/base/txgbe.h | 2 + drivers/net/txgbe/base/txgbe_aml.c | 185 +- drivers/net/txgbe/base/txgbe_aml.h | 6 +- drivers/net/txgbe/base/txgbe_aml40.c | 114 +- drivers/net/txgbe/base/txgbe_aml40.h | 6 +- drivers/net/txgbe/base/txgbe_dcb_hw.c | 2 +- drivers/net/txgbe/base/txgbe_e56.c | 3773 +++++++++++++++++++++ drivers/net/txgbe/base/txgbe_e56.h | 1753 ++++++++++ drivers/net/txgbe/base/txgbe_e56_bp.c | 2597 ++++++++++++++ drivers/net/txgbe/base/txgbe_e56_bp.h | 282 ++ drivers/net/txgbe/base/txgbe_hw.c | 54 +- drivers/net/txgbe/base/txgbe_hw.h | 4 +- drivers/net/txgbe/base/txgbe_osdep.h | 4 + drivers/net/txgbe/base/txgbe_phy.c | 362 +- drivers/net/txgbe/base/txgbe_phy.h | 46 +- drivers/net/txgbe/base/txgbe_regs.h | 13 +- drivers/net/txgbe/base/txgbe_type.h | 43 +- drivers/net/txgbe/txgbe_ethdev.c | 472 ++- drivers/net/txgbe/txgbe_ethdev.h | 7 +-
Quoted 9 lines
drivers/net/txgbe/txgbe_rxtx.c | 109 +- drivers/net/txgbe/txgbe_rxtx.h | 36 + drivers/net/txgbe/txgbe_rxtx_vec_common.h | 17 +- 26 files changed, 9464 insertions(+), 444 deletions(-) create mode 100644 drivers/net/txgbe/base/txgbe_e56.c create mode 100644 drivers/net/txgbe/base/txgbe_e56.h create mode 100644 drivers/net/txgbe/base/txgbe_e56_bp.c create mode 100644 drivers/net/txgbe/base/txgbe_e56_bp.h
AI review was mostly clean, do you want to change this one thing?
Review of [PATCH v6 00/21] net/{txgbe,ngbe} fixes from Zaiyu Wang
All findings from the v5 review are addressed:
- 07/21: Tx desc free now loads the 32-bit headwb_mem atomically and casts to uint16_t at the use site, removing the type pun.
- 14/21: kr_read_poll() switches from usleep() to usec_delay() to match the rest of the txgbe base layer.
- 16/21: stray tab+space indent in txgbe_read_i2c_sff8636() is gone.
- 17/21: stray tab+space indent in txgbe_get_module_info() is gone. TXGBE_SFF_DDM_IMPLEMENTED is now indented as a bit mask under the 8472_SWAP register definition, which reads correctly.
- 18/21: page is reset to 0 inside each iteration of the for loop so it no longer accumulates across iterations. The flat-memory check is now driven by an explicit read of module byte 2 via read_i2c_sff8636() into a local is_flat_mem flag, instead of reading data[0x2] out of the caller's output buffer. databyte is cleared to 0 at the top of each loop body so the skipped-read branch can no longer leak the previous iteration's value.
- 20/21: RTE_LIBRTE_SECURITY is corrected to RTE_LIB_SECURITY so the
!txq->using_ipsec guard is actually preprocessed in.
One small remaining comment on 18/21, not blocking.
Patch 18/21 (net/txgbe: fix get EEPROM operation)
Info: is_flat_mem has inverted semantics relative to its name, which is going to confuse future maintainers. SFF-8636 byte 2 bit 2 ("Flat_mem") is 1 for flat-memory modules and 0 for paged-memory modules (this is the same convention ethtool uses). The new code treats the bit the opposite way:
+ bool is_flat_mem = true;
...
+ if (rdata & 0x4)
+ is_flat_mem = false;
...
+ if (page == 0 || is_flat_mem) {
+ status = hw->phy.read_i2c_sff8636(hw, page, ...);So when the module reports flat (bit set), is_flat_mem is set to false; when paged (bit clear), is_flat_mem stays true. The condition 'page == 0 || is_flat_mem' reads only page 0 in the flat case and any page in the paged case, which is the right behavior, but the variable ends up meaning "paged memory is OK to read" rather than "module is flat". Suggest either:
bool is_flat_mem = false;
if (rdata & 0x4)
is_flat_mem = true;
...
if (page == 0 || !is_flat_mem) {
...
}or renaming to allow_paged_reads (or similar) and keeping the existing default and condition.
Quoted 109 lines
-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Wednesday, June 17, 2026 5:42 AM
To: Zaiyu Wang <[email protected]>; Zaiyu Wang <[email protected]>
Cc: [email protected]; [email protected]
Subject: Re: [PATCH v6 00/21] Wangxun FixesQuoted 65 lines · On Tue, 16 Jun 2026 20:20:08 +0800 Zaiyu Wang <[email protected]> wrote:
This series fixes several issues found on Wangxun Emerald, Sapphire and Amber-lite NICs, with a focus on link-related problems.
---
v6:
- Fixed more issues identified by AI review
---
v5:
- Fixed issues identified by AI review
---
v4:
- Fixed issues identified by devtools scripts
---
v3:
- Addressed Stephen's comments
---
v2:
- Fixed compilation error and code style issues
---Zaiyu Wang (21):
net/txgbe: remove duplicate xstats counters net/ngbe: remove duplicate xstats counters net/ngbe: add missing CDR config for YT PHY net/ngbe: fix VF promiscuous and allmulticast net/txgbe: fix inaccuracy in Tx rate limiting net/txgbe: fix link status check condition net/txgbe: fix Tx desc free logic
net/txgbe: fix link flow control registers for Amber-Lite net/txgbe: fix link flow control config for Sapphire net/txgbe: fix a mass of unknown interrupts net/txgbe: fix traffic class priority configuration net/txgbe: fix link stability for 25G NIC net/txgbe: fix link stability for 40G NIC net/txgbe: fix link stability for Amber-Lite backplane mode net/txgbe: fix FEC mode configuration on 25G NIC net/txgbe: fix SFP module identification net/txgbe: fix get module info operation net/txgbe: fix get EEPROM operation
net/txgbe: fix to reset Tx write-back pointer net/txgbe: fix to enable Tx desc check
net/txgbe: fix temperature track for AML NICdrivers/net/ngbe/base/ngbe_phy_yt.c | 3 + drivers/net/ngbe/ngbe_ethdev.c | 5 - drivers/net/ngbe/ngbe_ethdev_vf.c | 11 +- drivers/net/txgbe/base/meson.build | 2 + drivers/net/txgbe/base/txgbe.h | 2 + drivers/net/txgbe/base/txgbe_aml.c | 185 +- drivers/net/txgbe/base/txgbe_aml.h | 6 +- drivers/net/txgbe/base/txgbe_aml40.c | 114 +- drivers/net/txgbe/base/txgbe_aml40.h | 6 +- drivers/net/txgbe/base/txgbe_dcb_hw.c | 2 +- drivers/net/txgbe/base/txgbe_e56.c | 3773 +++++++++++++++++++++ drivers/net/txgbe/base/txgbe_e56.h | 1753 ++++++++++ drivers/net/txgbe/base/txgbe_e56_bp.c | 2597 ++++++++++++++ drivers/net/txgbe/base/txgbe_e56_bp.h | 282 ++ drivers/net/txgbe/base/txgbe_hw.c | 54 +- drivers/net/txgbe/base/txgbe_hw.h | 4 +- drivers/net/txgbe/base/txgbe_osdep.h | 4 + drivers/net/txgbe/base/txgbe_phy.c | 362 +- drivers/net/txgbe/base/txgbe_phy.h | 46 +- drivers/net/txgbe/base/txgbe_regs.h | 13 +- drivers/net/txgbe/base/txgbe_type.h | 43 +- drivers/net/txgbe/txgbe_ethdev.c | 472 ++- drivers/net/txgbe/txgbe_ethdev.h | 7 +-Quoted 9 lines
drivers/net/txgbe/txgbe_rxtx.c | 109 +- drivers/net/txgbe/txgbe_rxtx.h | 36 + drivers/net/txgbe/txgbe_rxtx_vec_common.h | 17 +- 26 files changed, 9464 insertions(+), 444 deletions(-) create mode 100644 drivers/net/txgbe/base/txgbe_e56.c create mode 100644 drivers/net/txgbe/base/txgbe_e56.h create mode 100644 drivers/net/txgbe/base/txgbe_e56_bp.c create mode 100644 drivers/net/txgbe/base/txgbe_e56_bp.hAI review was mostly clean, do you want to change this one thing?
Review of [PATCH v6 00/21] net/{txgbe,ngbe} fixes from Zaiyu Wang
All findings from the v5 review are addressed:
- 07/21: Tx desc free now loads the 32-bit
headwb_mematomically and casts touint16_tat the use site, removing the type pun.
- 14/21:kr_read_poll()switches fromusleep()tousec_delay()to match the rest of the txgbe base layer.
- 16/21: stray tab+space indent intxgbe_read_i2c_sff8636()is gone.
- 17/21: stray tab+space indent intxgbe_get_module_info()is gone.TXGBE_SFF_DDM_IMPLEMENTEDis now indented as a bit mask under the 8472_SWAP register definition, which reads correctly.
- 18/21: page is reset to 0 inside each iteration of the for loop so it no longer accumulates across iterations. The flat-memory check is now driven by an explicit read of module byte 2 viaread_i2c_sff8636()into a localis_flat_memflag, instead of reading data[0x2] out of the caller's output buffer. databyte is cleared to 0 at the top of each loop body so the skipped-read branch can no longer leak the previous iteration's value.
- 20/21:RTE_LIBRTE_SECURITYis corrected toRTE_LIB_SECURITYso the
Quoted 7 lines
!txq->using_ipsec guard is actually preprocessed in.One small remaining comment on 18/21, not blocking.
Patch 18/21 (net/txgbe: fix get EEPROM operation)
Info:
is_flat_memhas inverted semantics relative to its name, which is going to confuse
future
Quoted 2 lines
maintainers. SFF-8636 byte 2 bit 2
("Flat_mem") is 1 for flat-memory modules and 0 for paged-memory modules (this is the
same
Quoted 11 lines
convention ethtool uses). The new code treats the bit the opposite way:
+ bool is_flat_mem = true; ... + if (rdata & 0x4) + is_flat_mem = false; ... + if (page == 0 || is_flat_mem) { + status = hw->phy.read_i2c_sff8636(hw, page, ...);So when the module reports flat (bit set),
is_flat_memis set to false; when paged (bit
clear),
Quoted 1 line
is_flat_memstays true. The condition 'page == 0 ||is_flat_mem' reads only page 0 in
the flat
Quoted 1 line
case and any page in the paged case, which is the right behavior, but the variable ends
up meaning
Quoted 11 lines
"paged memory is OK to read" rather than "module is flat". Suggest either:
bool is_flat_mem = false; if (rdata & 0x4) is_flat_mem = true; ... if (page == 0 || !is_flat_mem) { ... }or renaming to
allow_paged_reads(or similar) and keeping the existing default and
condition.
Quoted 3 lines
Hi Stephen,
Thanks for your time. I will fix the issue as you suggested in v7 and send it shortly.
v7 cover Wangxun Fixes
In reply to Zaiyu WangThis series fixes several issues found on Wangxun Emerald, Sapphire and Amber-lite NICs, with a focus on link-related problems.
---
v7:
- Fixed inverted semantics of is_flat_mem to match SFF8636
---
v6:
- Fixed more issues identified by AI review
---
v5:
- Fixed issues identified by AI review
---
v4:
- Fixed issues identified by devtools scripts
---
v3:
- Addressed Stephen's comments
---
v2:
- Fixed compilation error and code style issues
---
Zaiyu Wang (21):
net/txgbe: remove duplicate xstats counters net/ngbe: remove duplicate xstats counters net/ngbe: add missing CDR config for YT PHY net/ngbe: fix VF promiscuous and allmulticast net/txgbe: fix inaccuracy in Tx rate limiting net/txgbe: fix link status check condition net/txgbe: fix Tx desc free logic
net/txgbe: fix link flow control registers for Amber-Lite net/txgbe: fix link flow control config for Sapphire net/txgbe: fix a mass of unknown interrupts net/txgbe: fix traffic class priority configuration net/txgbe: fix link stability for 25G NIC net/txgbe: fix link stability for 40G NIC net/txgbe: fix link stability for Amber-Lite backplane mode net/txgbe: fix FEC mode configuration on 25G NIC net/txgbe: fix SFP module identification net/txgbe: fix get module info operation net/txgbe: fix get EEPROM operation
net/txgbe: fix to reset Tx write-back pointer net/txgbe: fix to enable Tx desc check
net/txgbe: fix temperature track for AML NIC
drivers/net/ngbe/base/ngbe_phy_yt.c | 3 + drivers/net/ngbe/ngbe_ethdev.c | 5 - drivers/net/ngbe/ngbe_ethdev_vf.c | 11 +- drivers/net/txgbe/base/meson.build | 2 + drivers/net/txgbe/base/txgbe.h | 2 + drivers/net/txgbe/base/txgbe_aml.c | 185 +- drivers/net/txgbe/base/txgbe_aml.h | 6 +- drivers/net/txgbe/base/txgbe_aml40.c | 114 +- drivers/net/txgbe/base/txgbe_aml40.h | 6 +- drivers/net/txgbe/base/txgbe_dcb_hw.c | 2 +- drivers/net/txgbe/base/txgbe_e56.c | 3773 +++++++++++++++++++++ drivers/net/txgbe/base/txgbe_e56.h | 1753 ++++++++++ drivers/net/txgbe/base/txgbe_e56_bp.c | 2597 ++++++++++++++ drivers/net/txgbe/base/txgbe_e56_bp.h | 282 ++ drivers/net/txgbe/base/txgbe_hw.c | 54 +- drivers/net/txgbe/base/txgbe_hw.h | 4 +- drivers/net/txgbe/base/txgbe_osdep.h | 4 + drivers/net/txgbe/base/txgbe_phy.c | 362 +- drivers/net/txgbe/base/txgbe_phy.h | 46 +- drivers/net/txgbe/base/txgbe_regs.h | 13 +- drivers/net/txgbe/base/txgbe_type.h | 43 +- drivers/net/txgbe/txgbe_ethdev.c | 472 ++- drivers/net/txgbe/txgbe_ethdev.h | 7 +- drivers/net/txgbe/txgbe_rxtx.c | 109 +- drivers/net/txgbe/txgbe_rxtx.h | 36 + drivers/net/txgbe/txgbe_rxtx_vec_common.h | 17 +- 26 files changed, 9464 insertions(+), 444 deletions(-) create mode 100644 drivers/net/txgbe/base/txgbe_e56.c create mode 100644 drivers/net/txgbe/base/txgbe_e56.h create mode 100644 drivers/net/txgbe/base/txgbe_e56_bp.c create mode 100644 drivers/net/txgbe/base/txgbe_e56_bp.h
Signature · 1 line
2.21.0.windows.1
PATCH v7 1/21 net/txgbe: remove duplicate xstats counters
Remove four redundant counters (tx_xon_packets, rx_xon_packets, tx_xoff_packets and rx_xoff_packets) from xstats, as they were duplicates of tx_flow_control_xon_packets and others. Both sets were reading the same registers but being output twice under different names. After removing these entries, the flow control counters in DPDK now align with those in our Linux kernel driver.
--- drivers/net/txgbe/txgbe_ethdev.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/net/txgbe/txgbe_ethdev.c +0 -5
@@ -261,11 +261,6 @@ static const struct rte_txgbe_xstats_name_off rte_txgbe_stats_strings[] = {HW_XSTAT (tx_size_1024_to_max_packets),/* Flow Control */ -HW_XSTAT (tx_xon_packets), -HW_XSTAT (rx_xon_packets), -HW_XSTAT (tx_xoff_packets), -HW_XSTAT (rx_xoff_packets), -HW_XSTAT_NAME (tx_xon_packets,"tx_flow_control_xon_packets" ),HW_XSTAT_NAME (rx_xon_packets,"rx_flow_control_xon_packets" ), HW_XSTAT_NAME(tx_xoff_packets, "tx_flow_control_xoff_packets"),
Signature · 1 line
2.21.0.windows.1
PATCH v7 2/21 net/ngbe: remove duplicate xstats counters
In reply to Zaiyu WangRemove four redundant counters (tx_xon_packets, rx_xon_packets, tx_xoff_packets and rx_xoff_packets) from xstats, as they were duplicates of tx_flow_control_xon_packets and others. Both sets were reading the same registers but being output twice under different names. After removing these entries, the flow control counters in DPDK now align with those in our Linux kernel driver.
--- drivers/net/ngbe/ngbe_ethdev.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/net/ngbe/ngbe_ethdev.c +0 -5
@@ -227,11 +227,6 @@ static const struct rte_ngbe_xstats_name_off rte_ngbe_stats_strings[] = {HW_XSTAT (tx_size_1024_to_max_packets),/* Flow Control */ -HW_XSTAT (tx_xon_packets), -HW_XSTAT (rx_xon_packets), -HW_XSTAT (tx_xoff_packets), -HW_XSTAT (rx_xoff_packets), -HW_XSTAT_NAME (tx_xon_packets,"tx_flow_control_xon_packets" ),HW_XSTAT_NAME (rx_xon_packets,"rx_flow_control_xon_packets" ), HW_XSTAT_NAME(tx_xoff_packets, "tx_flow_control_xoff_packets"),
Signature · 1 line
2.21.0.windows.1
PATCH v7 3/21 net/ngbe: add missing CDR config for YT PHY
In reply to Zaiyu WangAccording to the PHY vendor, when YT8531S operates in UTP-to-Fiber or RGMII-to-Fiber mode with auto-negotiation disabled (Force mode), additional CDR (Clock Data Recovery) configuration is required to improve link connectivity. Without this config, link may be unstable or fail to establish.
--- drivers/net/ngbe/base/ngbe_phy_yt.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ngbe/base/ngbe_phy_yt.c +3 -0
@@ -264,6 +264,9 @@ s32 ngbe_setup_phy_link_yt(struct ngbe_hw *hw, u32 speed, value =YT_BCR_RESET |YT_BCR_ANE |YT_BCR_RESTART_AN |YT_BCR_DUPLEX |YT_BCR_SPEED_SELECT1 ; }else { +/* force mode need to config cdr */ +ngbe_write_phy_reg_sds_ext_yt (hw,0x3 ,0 ,0x1434 ); +ngbe_write_phy_reg_sds_ext_yt (hw,0xe ,0 ,0x163 ); value =YT_BCR_RESET |YT_BCR_DUPLEX ;if (speed &NGBE_LINK_SPEED_1GB_FULL ) value |=YT_BCR_SPEED_SELECT1 ;
Signature · 1 line
2.21.0.windows.1
PATCH v7 4/21 net/ngbe: fix VF promiscuous and allmulticast
In reply to Zaiyu WangThe configuration of allmulti and promiscuous modes conflicts together. For instance, if we enable promiscuous mode, then enable and disable allmulti, then the promiscuous mode is wrongly disabled.
To resolve this, the following changes are made:
- do nothing when we set/unset allmulti if promiscuous mode is on
- restore the proper mode (none or allmulti) when we disable promiscuous mode
--- drivers/net/ngbe/ngbe_ethdev_vf.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/net/ngbe/ngbe_ethdev_vf.c +9 -2
@@ -1196,9 +1196,13 @@ static int ngbevf_dev_promiscuous_disable(struct rte_eth_dev *dev) {struct ngbe_hw *hw =ngbe_dev_hw (dev); +int mode =NGBEVF_XCAST_MODE_NONE ;int ret; -switch (hw->mac.update_xcast_mode (hw,NGBEVF_XCAST_MODE_NONE )) { +if (dev->data->all_multicast) + mode =NGBEVF_XCAST_MODE_ALLMULTI ; + +switch (hw->mac.update_xcast_mode (hw, mode)) {case 0 : ret =0 ;break ;
@@ -1219,7 +1223,7 @@ ngbevf_dev_allmulticast_enable(struct rte_eth_dev *dev)struct ngbe_hw *hw =ngbe_dev_hw (dev);int ret; -if (dev->data->promiscuous ==1 ) +if (dev->data->promiscuous)return 0 ;switch (hw->mac.update_xcast_mode (hw,NGBEVF_XCAST_MODE_ALLMULTI )) {
@@ -1243,6 +1247,9 @@ ngbevf_dev_allmulticast_disable(struct rte_eth_dev *dev)struct ngbe_hw *hw =ngbe_dev_hw (dev);int ret; +if (dev->data->promiscuous) +return 0 ; +switch (hw->mac.update_xcast_mode (hw,NGBEVF_XCAST_MODE_MULTI )) {case 0 : ret =0 ;
Signature · 1 line
2.21.0.windows.1
PATCH v7 5/21 net/txgbe: fix inaccuracy in Tx rate limiting
In reply to Zaiyu WangAmber-lite NIC's TX rate limiting has large deviations for small packets. To address this, the following changes are made:
1. Set TDM_RL_ADJ (0x1820c) to 21B (includes 7B Ethernet preamble, 1B SFD, 1B EFD, and 12B IPG).
2) Remove the rate offset in the driver (e.g., 105 / 100, a rough compensation value from Linux kernel driver tests).
After these changes, accuracy deviation for 64B packets is within ~5%, while large packets show lower deviation.
--- drivers/net/txgbe/base/txgbe_regs.h | 3 +++ drivers/net/txgbe/txgbe_ethdev.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)
drivers/net/txgbe/base/txgbe_regs.h +3 -0
@@ -1670,6 +1670,9 @@ enum txgbe_5tuple_protocol {#define TXGBE_TDM_FACTOR_INT_SHIFT 16#define TXGBE_TDM_FACTOR_FRA_SHIFT 2 +#define TXGBE_TDM_RL_ADJ 0x1820C +/* Ethernet framing overhead: 7B Ethernet preamble + 1B SFD + 1B EFD + 12B IPG */ +#define TXGBE_FRAME_OVERHEAD 21#define TXGBE_TDM_RL_VM_IDX 0x018218#define TXGBE_TDM_RL_VM_CFG 0x01821C#define TXGBE_TDM_RL_CFG 0x018400
drivers/net/txgbe/txgbe_ethdev.c +1 -1
@@ -4314,7 +4314,6 @@ txgbe_set_queue_rate_limit(struct rte_eth_dev *dev,u16 frac; link_speed = dev->data->dev_link.link_speed; - tx_rate = tx_rate *105 /100 ;/* Calculate the rate factor values to set */ factor_int = link_speed / tx_rate; frac = (link_speed % tx_rate) *10000 / tx_rate;
@@ -4324,6 +4323,7 @@ txgbe_set_queue_rate_limit(struct rte_eth_dev *dev, factor_fra =0 ; } +wr32 (hw,TXGBE_TDM_RL_ADJ ,TXGBE_FRAME_OVERHEAD );wr32 (hw,TXGBE_TDM_RL_QUEUE_IDX , queue_idx);wr32m (hw,TXGBE_TDM_RL_QUEUE_CFG ,TXGBE_TDM_FACTOR_INT_MASK , factor_int <<TXGBE_TDM_FACTOR_INT_SHIFT );
Signature · 1 line
2.21.0.windows.1
PATCH v7 6/21 net/txgbe: fix link status check condition
In reply to Zaiyu WangThe original code incorrectly used 'if (link_up)' instead of 'if (*link_up)', causing the condition to always evaluate to true because the pointer itself is non-NULL. This led to incorrect speed assignment.
--- drivers/net/txgbe/base/txgbe_aml.c | 2 +- drivers/net/txgbe/base/txgbe_aml40.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/txgbe/base/txgbe_aml.c +1 -1
@@ -67,7 +67,7 @@ s32 txgbe_check_mac_link_aml(struct txgbe_hw *hw, u32 *speed, *link_up = false; } -if (link_up) { +if (*link_up) {switch (links_reg &TXGBE_CFG_PORT_ST_AML_LINK_MASK ) {case TXGBE_CFG_PORT_ST_AML_LINK_25G : *speed =TXGBE_LINK_SPEED_25GB_FULL ;
drivers/net/txgbe/base/txgbe_aml40.c +1 -1
@@ -68,7 +68,7 @@ s32 txgbe_check_mac_link_aml40(struct txgbe_hw *hw, u32 *speed, *link_up = false; } -if (link_up) { +if (*link_up) {if ((links_reg &TXGBE_CFG_PORT_ST_AML_LINK_40G ) ==TXGBE_CFG_PORT_ST_AML_LINK_40G ) *speed =TXGBE_LINK_SPEED_40GB_FULL ;
Signature · 1 line
2.21.0.windows.1
PATCH v7 7/21 net/txgbe: fix Tx desc free logic
In reply to Zaiyu WangOn some server environments, this driver caused TDM non-fatal errors or PCIe request errors during Tx operation
In Amber-Lite NIC's Tx head write-back mode, the hardware periodically writes back a head index pointing to the next descriptor it is adout to process in Tx ring. All descriptors before the head are considered processed by hardware and can be safely freed by the driver.
The root cause is that the driver can safely free a batch of descriptors only when the hardware's write-back head pointer has advanced beyond all descriptors in that batch, meaning they have all been processed by the hardware. If the driver frees a descriptor before the hardware has finished processing it, invalid memory access may occur, leading to the observed bug.
To fix the issue, correct the boundary check in all three Tx cleanup functions, each of which was missing the proper condition to prevent freeing unprocessed descriptors.
--- drivers/net/txgbe/txgbe_rxtx.c | 16 +++++------ drivers/net/txgbe/txgbe_rxtx.h | 35 +++++++++++++++++++++++ drivers/net/txgbe/txgbe_rxtx_vec_common.h | 10 +++---- 3 files changed, 48 insertions(+), 13 deletions(-)
drivers/net/txgbe/txgbe_rxtx.c +8 -8
@@ -98,12 +98,11 @@ txgbe_tx_free_bufs(struct txgbe_tx_queue *txq)if (tx_last_dd >= txq->nb_tx_desc) tx_last_dd -= txq->nb_tx_desc; -volatile uint16_t head = (uint16_t )*txq->headwb_mem; +uint32_t h =rte_atomic_load_explicit (txq->headwb_mem, + rte_memory_order_acquire); +const uint16_t head = (uint16_t )h; -if (txq->tx_next_dd > head && head > tx_last_dd) -return 0 ; -else if (tx_last_dd > txq->tx_next_dd && - (head > tx_last_dd || head < txq->tx_next_dd)) +if (!txgbe_tx_headwb_desc_done (head, tx_last_dd, txq->tx_next_dd))return 0 ; }else {/* check DD bit on threshold descriptor */
@@ -645,12 +644,13 @@ txgbe_xmit_cleanup(struct txgbe_tx_queue *txq) status = txr[desc_to_clean_to].dw3;if (txq->headwb_mem) { -u32 head = *txq->headwb_mem; +uint32_t h =rte_atomic_load_explicit (txq->headwb_mem, + rte_memory_order_acquire); +const uint16_t head = (uint16_t )h;PMD_TX_FREE_LOG (DEBUG ,"queue[%02d]: headwb_mem = %03d, desc_to_clean_to = %03d" , txq->reg_idx, head, desc_to_clean_to); -/* we have caught up to head, no work left to do */ -if (desc_to_clean_to == head) +if (!txgbe_tx_headwb_desc_done (head, last_desc_cleaned, desc_to_clean_to))return -(1 ); }else {if (!(status &rte_cpu_to_le_32 (TXGBE_TXD_DD ))) {
drivers/net/txgbe/txgbe_rxtx.h +35 -0
@@ -426,6 +426,41 @@ struct txgbe_txq_ops {void (*reset)(struct txgbe_tx_queue *txq); }; +/** +* Check whether Tx descriptors in the range (last, next] are done +* in Tx head write-back mode. +* +* In head write-back mode, the hardware periodically updates *headwb_mem +* with the index of the next descriptor it will process. +* All descriptors before the head are considered processed by hardware and can +* be safely freed. The descriptor pointed to by head itself is not yet processed. +* +* @param head +* Current hardware head index read from headwb_mem. +* @param last +* The highest-index descriptor cleaned in the previous round +* (exclusive: descriptors at or before this index are already freed). +* @param next +* The highest-index descriptor to be cleaned in this round +* (inclusive: this descriptor is the target of the current cleanup). +* @return +* true if all descriptors in the range (last, next] have been completed +* by hardware and can be freed, false otherwise. +*/ +static inline bool +txgbe_tx_headwb_desc_done (uint16_t head,uint16_t last,uint16_t next) +{ +if (next == head) +return false; +else if (next > head && head > last) +return false; +/* wrap case */ +else if (last > next && (head > last || head < next)) +return false; + +return true; +} +/* Takes an ethdev and a queue and sets up the tx function to be used based on * the queue parameters. Used in tx_queue_setup by primary process and then * in dev_init by secondary process when attaching to an existing ethdev.
drivers/net/txgbe/txgbe_rxtx_vec_common.h +5 -5
@@ -94,11 +94,11 @@ txgbe_tx_free_bufs(struct txgbe_tx_queue *txq) txq->tx_next_dd - txq->tx_free_thresh;if (tx_last_dd >= txq->nb_tx_desc) tx_last_dd -= txq->nb_tx_desc; -volatile uint16_t head = (uint16_t )*txq->headwb_mem; -if (txq->tx_next_dd > head && head > tx_last_dd) -return 0 ; -else if (tx_last_dd > txq->tx_next_dd && - (head > tx_last_dd || head < txq->tx_next_dd)) +uint32_t h =rte_atomic_load_explicit (txq->headwb_mem, + rte_memory_order_acquire); +const uint16_t head = (uint16_t )h; + +if (!txgbe_tx_headwb_desc_done (head, tx_last_dd, txq->tx_next_dd))return 0 ; }else {/* check DD bit on threshold descriptor */
Signature · 1 line
2.21.0.windows.1
PATCH v7 8/21 net/txgbe: fix link flow control registers for Amber-Lite
In reply to Zaiyu WangThe flow control counter registers on AML NICs differ from those on SP NICs. Update the register offsets accordingly to ensure the counters work correctly.
--- drivers/net/txgbe/base/txgbe_hw.c | 7 ++++++ drivers/net/txgbe/base/txgbe_regs.h | 2 ++ drivers/net/txgbe/base/txgbe_type.h | 4 ++++ drivers/net/txgbe/txgbe_ethdev.c | 34 +++++++++++++++++++---------- 4 files changed, 36 insertions(+), 11 deletions(-)
drivers/net/txgbe/base/txgbe_hw.c +7 -0
@@ -394,6 +394,13 @@ s32 txgbe_clear_hw_cntrs(struct txgbe_hw *hw)rd32 (hw,TXGBE_PBTXLNKXON );rd32 (hw,TXGBE_PBTXLNKXOFF ); +if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) { +wr32 (hw,TXGBE_PBRXLNKXON_AML ,0 ); +wr32 (hw,TXGBE_PBRXLNKXOFF_AML ,0 ); + hw->last_stats.rx_xon_packets =0 ; + hw->last_stats.rx_xoff_packets =0 ; + } +/* DMA Stats */ rd32 (hw,TXGBE_DMARXPKT );rd32 (hw,TXGBE_DMATXPKT );
drivers/net/txgbe/base/txgbe_regs.h +2 -0
@@ -1085,6 +1085,8 @@ enum txgbe_5tuple_protocol {#define TXGBE_PBRXDROP 0x019068#define TXGBE_PBRXLNKXOFF 0x011988#define TXGBE_PBRXLNKXON 0x011E0C +#define TXGBE_PBRXLNKXOFF_AML 0x011F80 +#define TXGBE_PBRXLNKXON_AML 0x011F84#define TXGBE_PBRXUPXON (up) (0x011E30 + (up) * 4)#define TXGBE_PBRXUPXOFF (up) (0x011E10 + (up) * 4)
drivers/net/txgbe/base/txgbe_type.h +4 -0
@@ -876,6 +876,10 @@ struct txgbe_hw {u64 tx_qp_bytes;u64 rx_qp_mc_packets; } qp_last[TXGBE_MAX_QP ]; +struct { +u64 rx_xon_packets; +u64 rx_xoff_packets; + } last_stats;rte_spinlock_t phy_lock;/*amlite: new SW-FW mbox */
drivers/net/txgbe/txgbe_ethdev.c +23 -11
@@ -2264,16 +2264,18 @@ txgbe_dev_reset(struct rte_eth_dev *dev)return ret; } +#define TXGBE_UPDATE_COUNTER_32BIT_GENERIC (reg, last, count, reset) \ + do { \ + uint32_t current = rd32(hw, reg); \ + if ((current) < (last)) \ + current += 0x100000000ULL; \ + if (reset) \ + (last) = current; \ + (count) = (uint32_t)((current) - (last)); \ + } while (0) +#define UPDATE_QP_COUNTER_32bit (reg, last_counter, counter) \ - { \ - uint32_t current_counter = rd32(hw, reg); \ - if (current_counter < last_counter) \ - current_counter += 0x100000000LL; \ - if (!hw->offset_loaded) \ - last_counter = current_counter; \ - counter = current_counter - last_counter; \ - counter &= 0xFFFFFFFFLL; \ - } + TXGBE_UPDATE_COUNTER_32BIT_GENERIC(reg, last_counter, counter, !hw->offset_loaded)#define UPDATE_QP_COUNTER_36bit (reg_lsb, reg_msb, last_counter, counter) \ { \
@@ -2331,8 +2333,18 @@ txgbe_read_stats_registers(struct txgbe_hw *hw, hw_stats->up[i].rx_up_dropped +=rd32 (hw,TXGBE_PBRXMISS (i)); } - hw_stats->rx_xon_packets +=rd32 (hw,TXGBE_PBRXLNKXON ); - hw_stats->rx_xoff_packets +=rd32 (hw,TXGBE_PBRXLNKXOFF ); + +if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) { +TXGBE_UPDATE_COUNTER_32BIT_GENERIC (TXGBE_PBRXLNKXON_AML , + hw->last_stats.rx_xon_packets, + hw_stats->rx_xon_packets, !hw->offset_loaded); +TXGBE_UPDATE_COUNTER_32BIT_GENERIC (TXGBE_PBRXLNKXOFF_AML , + hw->last_stats.rx_xoff_packets, + hw_stats->rx_xoff_packets, !hw->offset_loaded); + }else { + hw_stats->rx_xon_packets +=rd32 (hw,TXGBE_PBRXLNKXON ); + hw_stats->rx_xoff_packets +=rd32 (hw,TXGBE_PBRXLNKXOFF ); + } hw_stats->tx_xon_packets +=rd32 (hw,TXGBE_PBTXLNKXON ); hw_stats->tx_xoff_packets +=rd32 (hw,TXGBE_PBTXLNKXOFF );
Signature · 1 line
2.21.0.windows.1
PATCH v7 9/21 net/txgbe: fix link flow control config for Sapphire
In reply to Zaiyu WangSP chips have a hardware bug preventing XON flow control support, so the driver disables it.
--- drivers/net/txgbe/base/txgbe_hw.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/txgbe/base/txgbe_hw.c +4 -2
@@ -1037,8 +1037,10 @@ s32 txgbe_fc_enable(struct txgbe_hw *hw)for (i =0 ; i <TXGBE_DCB_TC_MAX ; i++) {if ((hw->fc.current_mode & txgbe_fc_tx_pause) && hw->fc.high_water[i]) { - fcrtl =TXGBE_FCWTRLO_TH (hw->fc.low_water[i]) | -TXGBE_FCWTRLO_XON ; + fcrtl =TXGBE_FCWTRLO_TH (hw->fc.low_water[i]); +/* Only AML support XON */ +if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) + fcrtl |=TXGBE_FCWTRLO_XON ; fcrth =TXGBE_FCWTRHI_TH (hw->fc.high_water[i]) |TXGBE_FCWTRHI_XOFF ; }else {
Signature · 1 line
2.21.0.windows.1
PATCH v7 10/21 net/txgbe: fix a mass of unknown interrupts
In reply to Zaiyu WangWhen RSC is enabled, Rx ring IVAR is set to configure ITR. It causes Rx ring interrupts report on the default msix_vector. Thus a mass of unknown interrupts occupy CPU.
Fix the issue by setting ring IVAR only when the rxq interrupt is enabled.
--- drivers/net/txgbe/txgbe_rxtx.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-)
drivers/net/txgbe/txgbe_rxtx.c +17 -13
@@ -4347,6 +4347,8 @@ static int txgbe_set_rsc(struct rte_eth_dev *dev) {struct rte_eth_rxmode *rx_conf = &dev->data->dev_conf.rxmode; +struct rte_pci_device *pci_dev =RTE_ETH_DEV_TO_PCI (dev); +struct rte_intr_handle *intr_handle = pci_dev->intr_handle;struct txgbe_hw *hw =TXGBE_DEV_HW (dev);struct rte_eth_dev_info dev_info = {0 };bool rsc_capable = false;
@@ -4397,8 +4399,6 @@ txgbe_set_rsc(struct rte_eth_dev *dev)rd32 (hw,TXGBE_RXCFG (rxq->reg_idx));uint32_t psrtype =rd32 (hw,TXGBE_POOLRSS (rxq->reg_idx)); -uint32_t eitr = -rd32 (hw,TXGBE_ITR (rxq->reg_idx));/* * txgbe PMD doesn't support header-split at the moment.
@@ -4417,6 +4417,9 @@ txgbe_set_rsc(struct rte_eth_dev *dev) srrctl |=txgbe_get_rscctl_maxdesc (rxq->mb_pool); psrtype |=TXGBE_POOLRSS_L4HDR ; +wr32 (hw,TXGBE_RXCFG (rxq->reg_idx), srrctl); +wr32 (hw,TXGBE_POOLRSS (rxq->reg_idx), psrtype); +/* * RSC: Set ITR interval corresponding to 2K ints/s. *
@@ -4430,19 +4433,20 @@ txgbe_set_rsc(struct rte_eth_dev *dev)* For a sparse streaming case this setting will yield * at most 500us latency for a single RSC aggregation. */ - eitr &= ~TXGBE_ITR_IVAL_MASK ; - eitr |=TXGBE_ITR_IVAL_10G (TXGBE_QUEUE_ITR_INTERVAL_DEFAULT ); - eitr |=TXGBE_ITR_WRDSA ; +if (rte_intr_dp_is_en (intr_handle)) { +uint32_t eitr =rd32 (hw,TXGBE_ITR (rxq->reg_idx)); -wr32 (hw,TXGBE_RXCFG (rxq->reg_idx), srrctl); -wr32 (hw,TXGBE_POOLRSS (rxq->reg_idx), psrtype); -wr32 (hw,TXGBE_ITR (rxq->reg_idx), eitr); + eitr &= ~TXGBE_ITR_IVAL_MASK ; + eitr |=TXGBE_ITR_IVAL_10G (TXGBE_QUEUE_ITR_INTERVAL_DEFAULT ); + eitr |=TXGBE_ITR_WRDSA ; +wr32 (hw,TXGBE_ITR (rxq->reg_idx), eitr); -/* -* RSC requires the mapping of the queue to the -* interrupt vector. -*/ -txgbe_set_ivar_map (hw,0 , rxq->reg_idx, i); +/* +* RSC requires the mapping of the queue to the +* interrupt vector. +*/ +txgbe_set_ivar_map (hw,0 , rxq->reg_idx, i); + } } dev->data->lro =1 ;
Signature · 1 line
2.21.0.windows.1
PATCH v7 11/21 net/txgbe: fix traffic class priority configuration
In reply to Zaiyu WangAfter applying the following testpmd command, 802.1Q packets with specific priorities were not properly directed to the corresponding traffic classes:
port config 0 dcb vt off 4 pfc off
The old driver had two issues:
1. The hardware uses a 4-bit mapping register per traffic class for priority-to-TC mapping, but the driver incorrectly configured it as 3 bits.
2. The DCB TX configuration mistakenly wrote to the RX register.
Fix both issues, ensuring that tc-prio mapping works as expected. Additionally, remove the stale and inconsistent TXGBE_DCBUP2TC_DEC macro as it has no callers.
--- drivers/net/txgbe/base/txgbe_dcb_hw.c | 2 +- drivers/net/txgbe/base/txgbe_regs.h | 6 ++---- drivers/net/txgbe/txgbe_rxtx.c | 7 ++----- 3 files changed, 5 insertions(+), 10 deletions(-)
drivers/net/txgbe/base/txgbe_dcb_hw.c +1 -1
@@ -154,7 +154,7 @@ s32 txgbe_dcb_config_tx_data_arbiter_raptor(struct txgbe_hw *hw, u16 *refill,for (i =0 ; i <TXGBE_DCB_UP_MAX ; i++) reg |=TXGBE_DCBUP2TC_MAP (i, map[i]); -wr32 (hw,TXGBE_PBRXUP2TC , reg); +wr32 (hw,TXGBE_PBTXUP2TC , reg);/* Configure traffic class credits and priority */ for (i =0 ; i <TXGBE_DCB_TC_MAX ; i++) {
drivers/net/txgbe/base/txgbe_regs.h +2 -4
@@ -503,10 +503,8 @@#define TXGBE_PBRXCTL 0x019000#define TXGBE_PBRXCTL_ST MS(0, 0x1)#define TXGBE_PBRXCTL_ENA MS(31, 0x1) -#define TXGBE_PBRXUP2TC 0x019008#define TXGBE_PBTXUP2TC 0x01C800 -#define TXGBE_DCBUP2TC_MAP (tc, v) LS(v, 3 * (tc), 0x7) -#define TXGBE_DCBUP2TC_DEC (tc, r) RS(r, 3 * (tc), 0x7) +#define TXGBE_DCBUP2TC_MAP (tc, v) LS(v, 4 * (tc), 0x7)#define TXGBE_PBRXSIZE (tc) (0x019020 + (tc) * 4)#define TXGBE_PBRXSIZE_KB (v) LS(v, 10, 0x3FF)
@@ -1705,7 +1703,7 @@ enum txgbe_5tuple_protocol {#define TXGBE_RDM_PF_HIDE (_i) (0x12090 + ((_i) * 4))#define TXGBE_RPUP2TC 0x019008 -#define TXGBE_RPUP2TC_UP_SHIFT 3 +#define TXGBE_RPUP2TC_UP_SHIFT 4#define TXGBE_RPUP2TC_UP_MASK 0x7#define TXGBE_RDM_DCACHE_CTL 0x0120A8
drivers/net/txgbe/txgbe_rxtx.c +2 -5
@@ -3378,11 +3378,8 @@ txgbe_vmdq_dcb_configure(struct rte_eth_dev *dev) queue_mapping =0 ;for (i =0 ; i <RTE_ETH_DCB_NUM_USER_PRIORITIES ; i++) -/* -* mapping is done with 3 bits per priority, -* so shift by i*3 each time -*/ - queue_mapping |= ((cfg->dcb_tc[i] &0x07 ) << (i *3 )); + queue_mapping |= ((cfg->dcb_tc[i] &TXGBE_RPUP2TC_UP_MASK ) << + (i *TXGBE_RPUP2TC_UP_SHIFT ));wr32 (hw,TXGBE_RPUP2TC , queue_mapping);
Signature · 1 line
2.21.0.windows.1
PATCH v7 12/21 net/txgbe: fix link stability for 25G NIC
In reply to Zaiyu WangThe link was previously configured via firmware, but this approach resulted in unstable link behavior. To resolve the issue, re-add the PHY configuration flow directly into the driver.
--- drivers/net/txgbe/base/meson.build | 1 + drivers/net/txgbe/base/txgbe_aml.c | 105 +- drivers/net/txgbe/base/txgbe_aml.h | 6 +- drivers/net/txgbe/base/txgbe_e56.c | 2488 +++++++++++++++++++++++++ drivers/net/txgbe/base/txgbe_e56.h | 1746 +++++++++++++++++ drivers/net/txgbe/base/txgbe_e56_bp.h | 279 +++ drivers/net/txgbe/base/txgbe_hw.c | 35 +- drivers/net/txgbe/base/txgbe_phy.h | 1 - drivers/net/txgbe/base/txgbe_regs.h | 2 + drivers/net/txgbe/base/txgbe_type.h | 12 + drivers/net/txgbe/txgbe_ethdev.c | 83 +- drivers/net/txgbe/txgbe_ethdev.h | 4 + 12 files changed, 4703 insertions(+), 59 deletions(-) create mode 100644 drivers/net/txgbe/base/txgbe_e56.c create mode 100644 drivers/net/txgbe/base/txgbe_e56.h create mode 100644 drivers/net/txgbe/base/txgbe_e56_bp.h
drivers/net/txgbe/base/meson.build +1 -0
@@ -12,4 +12,5 @@ base_sources = files( 'txgbe_mng.c', 'txgbe_phy.c', 'txgbe_vf.c', + 'txgbe_e56.c', )
drivers/net/txgbe/base/txgbe_aml.c +80 -25
177 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_aml.h +4 -2
@@ -16,7 +16,9 @@ s32 txgbe_get_link_capabilities_aml(struct txgbe_hw *hw, u32 *speed, bool *autoneg);u32 txgbe_get_media_type_aml (struct txgbe_hw *hw);void txgbe_wait_for_link_up_aml (struct txgbe_hw *hw,u32 speed); -s32 txgbe_setup_mac_link_aml (struct txgbe_hw *hw,u32 speed, -bool autoneg_wait_to_complete); +s32 txgbe_setup_phy_link_aml (struct txgbe_hw *hw, +u32 speed, +bool autoneg_wait_to_complete, +bool *need_reset);void txgbe_init_mac_link_ops_aml (struct txgbe_hw *hw);#endif /* _TXGBE_AML_H_ */
drivers/net/txgbe/base/txgbe_e56.c new file +2488 -0
2,488 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_e56.h new file +1746 -0
319 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_e56_bp.h new file +279 -0
279 lines not on this page · raw message
drivers/net/txgbe/txgbe_ethdev.c +82 -1
83 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.21.0.windows.1
Part of the diff is not shown here. View the raw message.
PATCH v7 13/21 net/txgbe: fix link stability for 40G NIC
In reply to Zaiyu WangThe link was previously configured via firmware, but this approach resulted in unstable link behavior. To resolve the issue, re-add the PHY configuration flow directly into the driver.
--- drivers/net/txgbe/base/txgbe_aml40.c | 73 +- drivers/net/txgbe/base/txgbe_aml40.h | 6 +- drivers/net/txgbe/base/txgbe_e56.c | 1473 ++++++++++++++++++++++++-- drivers/net/txgbe/base/txgbe_e56.h | 9 +- drivers/net/txgbe/txgbe_ethdev.c | 4 +- 5 files changed, 1447 insertions(+), 118 deletions(-)
drivers/net/txgbe/base/txgbe_aml40.c +56 -17
@@ -13,6 +13,7 @@#include "txgbe_hw.h" #include "txgbe_aml.h" #include "txgbe_aml40.h" +#include "txgbe_e56.h" void txgbe_init_ops_aml40 (struct txgbe_hw *hw) {
@@ -24,6 +25,7 @@ void txgbe_init_ops_aml40(struct txgbe_hw *hw)/* PHY */ phy->get_media_type = txgbe_get_media_type_aml40; + phy->setup_link_core = txgbe_setup_phy_link_aml40;/* LINK */ mac->init_mac_link_ops = txgbe_init_mac_link_ops_aml40;
@@ -52,6 +54,13 @@ s32 txgbe_check_mac_link_aml40(struct txgbe_hw *hw, u32 *speed,if (link_up_wait_to_complete) {for (i =0 ; i < hw->mac.max_link_up_time; i++) { +if (!hw->link_valid) { + *link_up = false; + +msleep (100 ); +continue ; + } +if (!(links_reg &TXGBE_PORTSTAT_UP )) { *link_up = false; }else {
@@ -68,6 +77,9 @@ s32 txgbe_check_mac_link_aml40(struct txgbe_hw *hw, u32 *speed, *link_up = false; } +if (!hw->link_valid) + *link_up = false; +if (*link_up) {if ((links_reg &TXGBE_CFG_PORT_ST_AML_LINK_40G ) ==TXGBE_CFG_PORT_ST_AML_LINK_40G )
@@ -107,20 +119,24 @@ u32 txgbe_get_media_type_aml40(struct txgbe_hw *hw)return txgbe_media_type_fiber_qsfp; } -s32 txgbe_setup_mac_link_aml40 (struct txgbe_hw *hw, -u32 speed, -bool autoneg_wait_to_complete) +s32 txgbe_setup_phy_link_aml40 (struct txgbe_hw *hw, +u32 speed, +bool autoneg_wait_to_complete, +bool *need_reset) {bool autoneg = false;s32 status =0 ; +s32 ret_status =0 ;u32 link_speed =TXGBE_LINK_SPEED_UNKNOWN ;bool link_up = false; +int i;u32 link_capabilities =TXGBE_LINK_SPEED_UNKNOWN ; +u32 value; -if (hw->phy.sfp_type == txgbe_sfp_type_not_present) { -DEBUGOUT ("SFP not detected, skip setup mac link" ); -return 0 ; - } + *need_reset = false; + +if (hw->phy.sfp_type == txgbe_sfp_type_not_present) + hw->phy.identify_sfp (hw);/* Check to see if speed passed in is supported. */ status = hw->mac.get_link_capabilities(hw,
@@ -132,18 +148,42 @@ s32 txgbe_setup_mac_link_aml40(struct txgbe_hw *hw,if (speed ==TXGBE_LINK_SPEED_UNKNOWN )return TXGBE_ERR_LINK_SETUP ; - status = hw->mac.check_link (hw, &link_speed, &link_up, - autoneg_wait_to_complete); +for (i =0 ; i <4 ; i++) { +txgbe_e56_check_phy_link (hw, &link_speed, &link_up); +if (link_up) +break ; +msleep (250 ); + }if (link_speed == speed && link_up) -return status; - -if (speed &TXGBE_LINK_SPEED_40GB_FULL ) - speed =0x20 ; - - status = hw->phy.set_link_hostif (hw, (u8 )speed, autoneg, true); + goto out; + +rte_spinlock_lock (&hw->phy_lock); + ret_status =txgbe_set_link_to_amlite (hw, speed); +if (ret_status ==TXGBE_ERR_TIMEOUT ) + hw->link_valid = false; +rte_spinlock_unlock (&hw->phy_lock); + +for (i =0 ; i <4 ; i++) { +txgbe_e56_check_phy_link (hw, &link_speed, &link_up); +if (link_up) + goto out; +msleep (250 ); + } -txgbe_wait_for_link_up_aml (hw, speed); +out: +if (link_up) { + value =rd32 (hw,TXGBE_PORTSTAT ); +if (!(value &TXGBE_PORTSTAT_UP )) { +DEBUGOUT ("MAC link 0x14404: 0x%x" , value); + *need_reset = true; + value =rd32 (hw,0x110b0 ); +DEBUGOUT ("MAC intr status 0x110b0: 0x%x" , value); + } + }else { + *need_reset = true; +DEBUGOUT ("Link reconfiguration required. Reset scheduled in 2000ms." ); + }return status; }
@@ -159,6 +199,5 @@ void txgbe_init_mac_link_ops_aml40(struct txgbe_hw *hw) mac->flap_tx_laser = txgbe_flap_tx_laser_multispeed_fiber; - mac->setup_link = txgbe_setup_mac_link_aml40; mac->set_rate_select_speed = txgbe_set_hard_rate_select_speed; }
drivers/net/txgbe/base/txgbe_aml40.h +4 -2
@@ -14,7 +14,9 @@ s32 txgbe_check_mac_link_aml40(struct txgbe_hw *hw,s32 txgbe_get_link_capabilities_aml40 (struct txgbe_hw *hw,u32 *speed,bool *autoneg);u32 txgbe_get_media_type_aml40 (struct txgbe_hw *hw); -s32 txgbe_setup_mac_link_aml40 (struct txgbe_hw *hw,u32 speed, -bool autoneg_wait_to_complete); +s32 txgbe_setup_phy_link_aml40 (struct txgbe_hw *hw, +u32 speed, +bool autoneg_wait_to_complete, +bool *need_reset);void txgbe_init_mac_link_ops_aml40 (struct txgbe_hw *hw);#endif /* _TXGBE_AML40_H_ */
drivers/net/txgbe/base/txgbe_e56.c +1378 -95
1,560 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_e56.h +7 -2
@@ -438,7 +438,12 @@ typedef union {#define E56PHY_FETX_FFE_TRAIN_CFG_0_KRT_FETX_INIT_FFE_CFG_2 9, 8#define E56PHY_FETX_FFE_TRAIN_CFG_0_KRT_FETX_INIT_FFE_CFG_3 13, 12 -#define PHYINIT_TIMEOUT 1000/* PHY initialization timeout value in 0.5ms unit */ +/* PHYINIT_TIMEOUT, a loop iteration counter, not a fixed time unit. +* The actual timeout duration depends on the usec_delay() or msleep() +* value used inside the polling loop. For example, when usec_delay(500) +* is used, the total timeout is approximately PHYINIT_TIMEOUT * 500 us. +*/ +#define PHYINIT_TIMEOUT 1000#define E56G__BASEADDR 0x0
@@ -1729,7 +1734,7 @@ typedef union {void set_fields_e56 (unsigned int *src_data,unsigned int bit_high,unsigned int bit_low,unsigned int set_value); -int txgbe_e56_rx_rd_second_code_40g (struct txgbe_hw *hw,int *SECOND_CODE ,int lane); +void txgbe_e56_rx_rd_second_code_40g (struct txgbe_hw *hw,int *SECOND_CODE ,int lane);void txgbe_e56_rx_rd_second_code (struct txgbe_hw *hw,int *SECOND_CODE );u32 txgbe_e56_cfg_40g (struct txgbe_hw *hw);u32 txgbe_e56_cfg_25g (struct txgbe_hw *hw);
drivers/net/txgbe/txgbe_ethdev.c +2 -2
@@ -2054,7 +2054,7 @@ txgbe_dev_stop(struct rte_eth_dev *dev)PMD_INIT_FUNC_TRACE (); -if (hw->mac.type == txgbe_mac_aml) +if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40)rte_eal_alarm_cancel (txgbe_dev_setup_link_alarm_handler_aml, hw);rte_eal_alarm_cancel (txgbe_dev_detect_sfp, dev);
@@ -3206,7 +3206,7 @@ txgbe_dev_setup_link_thread_handler(void *param)struct txgbe_hw *hw =TXGBE_DEV_HW (dev);rte_thread_detach (rte_thread_self ()); -if (hw->mac.type == txgbe_mac_aml) +if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40)txgbe_dev_setup_link_alarm_handler_aml (hw);else txgbe_dev_setup_link_alarm_handler (dev);
Signature · 1 line
2.21.0.windows.1
PATCH v7 14/21 net/txgbe: fix link stability for Amber-Lite backplane mode
In reply to Zaiyu WangThe link was previously configured via firmware, but this approach resulted in unstable link behavior. To resolve the issue, re-add the PHY configuration flow directly into the driver.
--- drivers/net/txgbe/base/meson.build | 1 + drivers/net/txgbe/base/txgbe.h | 2 + drivers/net/txgbe/base/txgbe_aml.c | 65 +- drivers/net/txgbe/base/txgbe_aml40.c | 43 +- drivers/net/txgbe/base/txgbe_e56.c | 22 +- drivers/net/txgbe/base/txgbe_e56.h | 2 + drivers/net/txgbe/base/txgbe_e56_bp.c | 2597 +++++++++++++++++++++++++ drivers/net/txgbe/base/txgbe_e56_bp.h | 3 + drivers/net/txgbe/base/txgbe_hw.c | 6 + drivers/net/txgbe/base/txgbe_hw.h | 4 +- drivers/net/txgbe/base/txgbe_osdep.h | 4 + drivers/net/txgbe/base/txgbe_phy.c | 21 + drivers/net/txgbe/base/txgbe_phy.h | 22 + drivers/net/txgbe/base/txgbe_type.h | 25 +- drivers/net/txgbe/txgbe_ethdev.c | 109 +- drivers/net/txgbe/txgbe_ethdev.h | 2 +- 16 files changed, 2898 insertions(+), 30 deletions(-) create mode 100644 drivers/net/txgbe/base/txgbe_e56_bp.c
drivers/net/txgbe/base/meson.build +1 -0
@@ -13,4 +13,5 @@ base_sources = files( 'txgbe_phy.c', 'txgbe_vf.c', 'txgbe_e56.c', + 'txgbe_e56_bp.c', )
drivers/net/txgbe/base/txgbe.h +2 -0
@@ -13,5 +13,7 @@#include "txgbe_hw.h" #include "txgbe_vf.h" #include "txgbe_dcb.h" +#include "txgbe_e56.h" +#include "txgbe_e56_bp.h" #endif /* _TXGBE_H_ */
drivers/net/txgbe/base/txgbe_aml.c +54 -11
102 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_aml40.c +39 -4
73 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_e56.c +12 -10
@@ -53,7 +53,7 @@ int txgbe_e56_int_cmp(const void *a, const void *b) }s32 txgbe_e56_check_phy_link (struct txgbe_hw *hw,u32 *speed, -bool *link_up) +bool *link_up) {u32 rdata =0 ;u32 links_reg =0 ;
@@ -101,7 +101,8 @@ u32 txgbe_e56_tx_ffe_cfg(struct txgbe_hw *hw, u32 speed) post =S10G_TX_FFE_CFG_POST ; }else if (speed ==TXGBE_LINK_SPEED_25GB_FULL ) {if (hw->phy.sfp_type == txgbe_sfp_type_da_cu_core0 || - hw->phy.sfp_type == txgbe_sfp_type_da_cu_core1) { + hw->phy.sfp_type == txgbe_sfp_type_da_cu_core1 || +txgbe_is_backplane (hw)) { ffe_main =S25G_TX_FFE_CFG_DAC_MAIN ; pre1 =S25G_TX_FFE_CFG_DAC_PRE1 ; pre2 =S25G_TX_FFE_CFG_DAC_PRE2 ;
@@ -119,7 +120,8 @@ u32 txgbe_e56_tx_ffe_cfg(struct txgbe_hw *hw, u32 speed) post =S10G_TX_FFE_CFG_POST ;if (hw->phy.sfp_type == txgbe_qsfp_type_40g_cu_core0 || - hw->phy.sfp_type == txgbe_qsfp_type_40g_cu_core1) { + hw->phy.sfp_type == txgbe_qsfp_type_40g_cu_core1 || +txgbe_is_backplane (hw)) { ffe_main =S40G_TX_FFE_CFG_MAIN ; pre1 =S40G_TX_FFE_CFG_PRE1 ; pre2 =S40G_TX_FFE_CFG_PRE2 ;
@@ -1508,7 +1510,7 @@ txgbe_e56_rxs_osc_init_for_temp_track_range(struct txgbe_hw *hw, u32 speed) rdata =rd32_ephy (hw, addr);if (timer++ >PHYINIT_TIMEOUT ) { -DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!\n" ); +DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!" );return -1 ; } }
@@ -1542,7 +1544,7 @@ txgbe_e56_rxs_osc_init_for_temp_track_range(struct txgbe_hw *hw, u32 speed)if (((rdata >> (i *8 )) &0x3f ) ==0x21 )break ;if (timer++ >PHYINIT_TIMEOUT ) { -DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!\n" ); +DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!" );return -1 ; } }
@@ -1618,7 +1620,7 @@ txgbe_e56_rxs_osc_init_for_temp_track_range(struct txgbe_hw *hw, u32 speed) addr =E56PHY_CTRL_FSM_RX_STAT_0_ADDR ; rdata =rd32_ephy (hw, addr);if (timer++ >PHYINIT_TIMEOUT ) { -DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!\n" ); +DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!" );return -1 ; } }
@@ -1664,7 +1666,7 @@ txgbe_e56_rxs_osc_init_for_temp_track_range(struct txgbe_hw *hw, u32 speed)if (((rdata >> (i *8 )) &0x3f ) ==0x21 )break ;if (timer++ >PHYINIT_TIMEOUT ) { -DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!\n" ); +DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!" );return -1 ; } }
@@ -1929,7 +1931,7 @@ int txgbe_temp_track_seq_40g(struct txgbe_hw *hw, u32 speed)CMVAR_UFINE_FMIN_WRAP =S25G_CMVAR_UFINE_FMIN_WRAP ;CMVAR_FINE_FMIN_WRAP =S25G_CMVAR_FINE_FMIN_WRAP ; }else { -DEBUGOUT ("Error Speed\n" ); +DEBUGOUT ("Error Speed" );return 0 ; }
@@ -3190,7 +3192,7 @@ static int txgbe_e56_disable_rx40G(struct txgbe_hw *hw) rdata =rd32_ephy (hw, addr);usec_delay (100 );if (timer++ >PHYINIT_TIMEOUT ) { -DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!\n" ); +DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!" );break ; } }
@@ -3296,7 +3298,7 @@ static int txgbe_e56_disable_rx(struct txgbe_hw *hw)break ;usec_delay (100 );if (timer++ >PHYINIT_TIMEOUT ) { -DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!\n" ); +DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!" );break ; } }
drivers/net/txgbe/base/txgbe_e56.h +2 -0
@@ -1744,6 +1744,8 @@ int txgbe_temp_track_seq(struct txgbe_hw *hw, u32 speed);int txgbe_e56_get_temp (struct txgbe_hw *hw,int *temp);int txgbe_set_link_to_amlite (struct txgbe_hw *hw,u32 speed);int txgbe_e56_reconfig_rx (struct txgbe_hw *hw,u32 speed); +s32 txgbe_e56_check_phy_link (struct txgbe_hw *hw,u32 *speed, +bool *link_up);s32 txgbe_e56_fec_set (struct txgbe_hw *hw);s32 txgbe_e56_fec_polling (struct txgbe_hw *hw,bool *link_up);u32 txgbe_e56_tx_ffe_cfg (struct txgbe_hw *hw,u32 speed);
drivers/net/txgbe/base/txgbe_e56_bp.c new file +2597 -0
2,597 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_e56_bp.h +3 -0
@@ -276,4 +276,7 @@ typedef union {#define E56PHY_CMS_ANA_OVRDVAL_10_ADDR (E56PHY_CMS_BASE_ADDR + 0xD8)#define E56PHY_CMS_ANA_OVRDVAL_7_ANA_LCPLL_LF_LPF_SETCODE_CALIB_I 8, 4 +int txgbe_e56_set_phy_link_mode (struct txgbe_hw *hw, +u8 bp_link_mode,u32 need_restart); +int handle_e56_bkp_an73_flow (struct txgbe_hw *hw);#endif
drivers/net/txgbe/base/txgbe_hw.c +6 -0
@@ -4071,6 +4071,12 @@ s32 txgbe_reset_pipeline_raptor(struct txgbe_hw *hw)return err; } +bool txgbe_is_backplane (struct txgbe_hw *hw) +{ +return hw->phy.get_media_type (hw) == txgbe_media_type_backplane ? + true : false; +} +bool txgbe_gpio_ext_check (struct txgbe_hw *hw,u8 gpio_ext_mask) {u32 gpio_ext =rd32 (hw,TXGBE_GPIOEXT );
drivers/net/txgbe/base/txgbe_hw.h +2 -2
@@ -118,6 +118,6 @@ s32 txgbe_reinit_fdir_tables(struct txgbe_hw *hw);bool txgbe_verify_lesm_fw_enabled_raptor (struct txgbe_hw *hw);s32 txgbe_fmgr_cmd_op (struct txgbe_hw *hw,u32 cmd,u32 cmd_addr);s32 txgbe_flash_read_dword (struct txgbe_hw *hw,u32 addr,u32 *data); -s32 txgbe_e56_check_phy_link (struct txgbe_hw *hw,u32 *speed, -bool *link_up); +bool txgbe_is_backplane (struct txgbe_hw *hw); +bool txgbe_gpio_ext_check (struct txgbe_hw *hw,u8 gpio_ext_mask);#endif /* _TXGBE_HW_H_ */
drivers/net/txgbe/base/txgbe_osdep.h +4 -0
@@ -162,6 +162,10 @@ static inline u64 REVERT_BIT_MASK64(u64 mask) ((mask &0xFFFFFFFF00000000 ) >>32 ); } +#define BITS_PER_LONG (__SIZEOF_LONG__ * 8) +#define GENMASK (h, l) \ + (((~0UL) << (l)) & (~0UL >> (BITS_PER_LONG - 1 - (h)))) +#define IOMEM #define BIT (nr) (1UL << (nr))
drivers/net/txgbe/base/txgbe_phy.c +21 -0
@@ -2503,6 +2503,27 @@ void txgbe_set_phy_temp(struct txgbe_hw *hw) } } +int txgbe_is_dac_cable (struct txgbe_hw *hw) +{ +if (hw->phy.sfp_type == txgbe_sfp_type_da_cu_core0 || + hw->phy.sfp_type == txgbe_sfp_type_da_cu_core1 || + hw->phy.sfp_type == txgbe_sfp_type_da_act_lmt_core0 || + hw->phy.sfp_type == txgbe_sfp_type_da_act_lmt_core1 || + hw->phy.sfp_type == txgbe_qsfp_type_40g_cu_core0 || + hw->phy.sfp_type == txgbe_qsfp_type_40g_cu_core1) +return true; + +return false; +} + +int txgbe_xpcs_an_enabled (struct txgbe_hw *hw) +{ +if (!(txgbe_is_dac_cable (hw) ||txgbe_is_backplane (hw))) +return false; + +return hw->devarg.auto_neg ? true : false; +} +/** * txgbe_kr_handle - Handle the interrupt of auto-negotiation * @hw: pointer to hardware structure
drivers/net/txgbe/base/txgbe_phy.h +22 -0
@@ -105,6 +105,8 @@#define VR_AN_INTR_CMPLT MS16(0, 0x1)#define VR_AN_INTR_LINK MS16(1, 0x1)#define VR_AN_INTR_PG_RCV MS16(2, 0x1) +#define TXGBE_E56_AN_TXDIS MS16(3, 0x1) +#define TXGBE_E56_AN_PG_RCV MS16(4, 0x1)#define VR_AN_KR_MODE_CL 0x078003#define VR_AN_KR_MODE_CL_PDET MS16(0, 0x1)#define VR_XS_OR_PCS_MMD_DIGI_CTL1 0x038000
@@ -428,6 +430,24 @@#define TXGBE_BP_M_NAUTO 0#define TXGBE_BP_M_AUTO 1 +#define kr_read_poll (op, val, cond, sleep_us, \ + times, args...) \ +({ \ + unsigned long __sleep_us = (sleep_us); \ + u32 __times = (times); \ + u32 i; \ + int __cond = 0; \ + for (i = 0; i < __times; i++) { \ + (val) = op(args); \ + if (cond) { \ + __cond = 1; \ + break; \ + } \ + usec_delay(__sleep_us);\ + } \ + (__cond) ? 0 : -1; \ +}) +#ifndef CL72_KRTR_PRBS_MODE_EN #define CL72_KRTR_PRBS_MODE_EN 0xFFFF/* open kr prbs check */ #endif
@@ -490,6 +510,8 @@ void txgbe_autoc_write(struct txgbe_hw *hw, u64 value);void txgbe_bp_mode_set (struct txgbe_hw *hw);void txgbe_set_phy_temp (struct txgbe_hw *hw);void txgbe_bp_down_event (struct txgbe_hw *hw); +int txgbe_is_dac_cable (struct txgbe_hw *hw); +int txgbe_xpcs_an_enabled (struct txgbe_hw *hw);s32 txgbe_kr_handle (struct txgbe_hw *hw);#endif /* _TXGBE_PHY_H_ */
drivers/net/txgbe/base/txgbe_type.h +24 -1
@@ -719,6 +719,7 @@ struct txgbe_phy_info {u32 addr;u32 id;enum txgbe_sfp_type sfp_type; +u32 fiber_suppport_speed;bool sfp_setup_needed;u32 revision;u32 media_type;
@@ -740,6 +741,7 @@ struct txgbe_phy_info {u16 ffe_pre2;u16 ffe_post;u16 fec_mode; +u16 bp_capa; };#define TXGBE_DEVARG_BP_AUTO "auto_neg"
@@ -899,7 +901,28 @@ struct txgbe_hw {u32 cur_fec_link;int temperature;u32 bp_link_mode; -}; +bool dac_sfp; +bool bypass_ctle; +u32 curbp_link_mode; +bool an_done;
Lines of this file are not shown. View the raw message.
drivers/net/txgbe/txgbe_ethdev.c +108 -1
109 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.21.0.windows.1
Part of the diff is not shown here. View the raw message.
PATCH v7 15/21 net/txgbe: fix FEC mode configuration on 25G NIC
In reply to Zaiyu WangThe 25G NIC offers off, RS, Base-R, and auto FEC modes. When reconfiguring the PHY, the FEC mode must match on both sides; otherwise, the link cannot come up. The current driver fails to maintain this requirement, causing link instability.
Add proper FEC mode handling during PHY reconfiguration to guarantee link establishment.
--- drivers/net/txgbe/base/txgbe_aml.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/net/txgbe/base/txgbe_aml.c +12 -1
@@ -282,6 +282,14 @@ s32 txgbe_setup_phy_link_aml(struct txgbe_hw *hw, !(hw->fec_mode & hw->cur_fec_link))) goto out; +if (speed ==TXGBE_LINK_SPEED_25GB_FULL && + link_speed ==TXGBE_LINK_SPEED_25GB_FULL ) { +txgbe_e56_fec_polling (hw, &link_up); + +if (link_up) + goto out; + } +rte_spinlock_lock (&hw->phy_lock); ret_status =txgbe_set_link_to_amlite (hw, speed);rte_spinlock_unlock (&hw->phy_lock);
@@ -360,7 +368,10 @@ static s32 txgbe_setup_mac_link_multispeed_fiber_aml(struct txgbe_hw *hw,/* If we already have link at this speed, just jump out */ txgbe_e56_check_phy_link (hw, &link_speed, &link_up); -if (link_speed ==TXGBE_LINK_SPEED_25GB_FULL && link_up) + hw->cur_fec_link =txgbe_phy_fec_get (hw); + +if (link_speed ==TXGBE_LINK_SPEED_25GB_FULL && link_up && + hw->fec_mode & hw->cur_fec_link) goto out;/* Allow module to change analog characteristics (10G -> 25G) */
Signature · 1 line
2.21.0.windows.1
PATCH v7 16/21 net/txgbe: fix SFP module identification
In reply to Zaiyu WangSome optical modules were not correctly recognized due to ambiguous classification in the original detection flow. Rework the module identification logic to cover all module types. Also narrow the I2C lock scope to avoid potential race conditions during module access.
--- drivers/net/txgbe/base/txgbe_hw.c | 2 - drivers/net/txgbe/base/txgbe_phy.c | 341 ++++++++++------------------ drivers/net/txgbe/base/txgbe_phy.h | 18 +- drivers/net/txgbe/base/txgbe_type.h | 2 + 4 files changed, 134 insertions(+), 229 deletions(-)
drivers/net/txgbe/base/txgbe_hw.c +0 -2
@@ -2909,8 +2909,6 @@ s32 txgbe_init_ops_generic(struct txgbe_hw *hw) phy->read_i2c_eeprom = txgbe_read_i2c_eeprom; phy->write_i2c_eeprom = txgbe_write_i2c_eeprom; phy->identify_sfp = txgbe_identify_module; - phy->read_i2c_byte_unlocked = txgbe_read_i2c_byte_unlocked; - phy->write_i2c_byte_unlocked = txgbe_write_i2c_byte_unlocked; phy->check_overtemp = txgbe_check_overtemp; phy->reset = txgbe_reset_phy; phy->set_link_hostif = txgbe_hic_ephy_set_link;
drivers/net/txgbe/base/txgbe_phy.c +119 -222
471 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_phy.h +13 -5
@@ -261,7 +261,9 @@#define TXGBE_SFF_SFF_8472_COMP 0x5E#define TXGBE_SFF_SFF_8472_OSCB 0x6E#define TXGBE_SFF_SFF_8472_ESCB 0x76 +#define TXGBE_SFF_QSFP_PAGE_SELECT 0x7F +#define TXGBE_SFF_IDENTIFIER_QSFP 0x0C#define TXGBE_SFF_IDENTIFIER_QSFP_PLUS 0x0D#define TXGBE_SFF_QSFP_VENDOR_OUI_BYTE0 0xA5#define TXGBE_SFF_QSFP_VENDOR_OUI_BYTE1 0xA6
@@ -289,6 +291,9 @@#define TXGBE_SFF_4x10GBASESR_CAP 0x11#define TXGBE_SFF_40GBASEPSM4_PARALLEL 0x12#define TXGBE_SFF_40GBASE_SWMD4_CAP 0x1f +#define TXGBE_SFF_COPPER_5M 0x5 +#define TXGBE_SFF_COPPER_3M 0x3 +#define TXGBE_SFF_COPPER_1M 0x1#define TXGBE_SFF_DA_SPEC_ACTIVE_LIMITING 0x4#define TXGBE_SFF_25GAUI_C2M_AOC_BER_5 0x1
@@ -296,6 +301,11 @@#define TXGBE_SFF_25GAUI_C2M_AOC_BER_12 0x18#define TXGBE_SFF_25GAUI_C2M_ACC_BER_12 0x19 +#define TXGBE_ETHERNET_COMP_OFFSET 0x83 +#define TXGBE_SFF_ETHERNET_40G_CR4 MS(3, 0x1) +#define TXGBE_SFF_ETHERNET_40G_SR4 MS(2, 0x1) +#define TXGBE_SFF_ETHERNET_40G_LR4 MS(1, 0x1) +#define TXGBE_SFF_SOFT_RS_SELECT_MASK 0x8#define TXGBE_SFF_SOFT_RS_SELECT_10G 0x8#define TXGBE_SFF_SOFT_RS_SELECT_1G 0x0
@@ -493,14 +503,12 @@ s32 txgbe_identify_qsfp_module(struct txgbe_hw *hw);s32 txgbe_check_overtemp (struct txgbe_hw *hw);s32 txgbe_read_i2c_byte (struct txgbe_hw *hw,u8 byte_offset,u8 dev_addr,u8 *data); -s32 txgbe_read_i2c_byte_unlocked (struct txgbe_hw *hw,u8 byte_offset, -u8 dev_addr,u8 *data);s32 txgbe_write_i2c_byte (struct txgbe_hw *hw,u8 byte_offset,u8 dev_addr,u8 data); -s32 txgbe_write_i2c_byte_unlocked (struct txgbe_hw *hw,u8 byte_offset, -u8 dev_addr,u8 data);s32 txgbe_read_i2c_sff8472 (struct txgbe_hw *hw,u8 byte_offset, -u8 *sff8472_data); +u8 *sff8472_data); +s32 txgbe_read_i2c_sff8636 (struct txgbe_hw *hw,u8 page,u8 byte_offset, +u8 *sff8636_data);s32 txgbe_read_i2c_eeprom (struct txgbe_hw *hw,u8 byte_offset,u8 *eeprom_data); s32 txgbe_write_i2c_eeprom(struct txgbe_hw *hw, u8 byte_offset,
drivers/net/txgbe/base/txgbe_type.h +2 -0
@@ -702,6 +702,8 @@ struct txgbe_phy_info { u8 dev_addr, u8 data);s32 (*read_i2c_sff8472)(struct txgbe_hw *hw,u8 byte_offset,u8 *sff8472_data); +s32 (*read_i2c_sff8636)(struct txgbe_hw *hw,u8 page,u8 byte_offset, +u8 *sff8636_data);s32 (*read_i2c_eeprom)(struct txgbe_hw *hw,u8 byte_offset,u8 *eeprom_data); s32 (*write_i2c_eeprom)(struct txgbe_hw *hw, u8 byte_offset,
Signature · 1 line
2.21.0.windows.1
PATCH v7 17/21 net/txgbe: fix get module info operation
In reply to Zaiyu WangThe original I2C access flow in the module information retrieval process was flawed. Correct the implementation to properly fetch module info.
--- drivers/net/txgbe/base/txgbe_phy.h | 6 +- drivers/net/txgbe/txgbe_ethdev.c | 118 +++++++++++++++++++++++------ 2 files changed, 98 insertions(+), 26 deletions(-)
drivers/net/txgbe/base/txgbe_phy.h +5 -1
@@ -258,10 +258,14 @@#define TXGBE_SFF_CABLE_DA_ACTIVE 0x8#define TXGBE_SFF_CABLE_SPEC_COMP 0x3C#define TXGBE_SFF_SFF_8472_SWAP 0x5C +#define TXGBE_SFF_DDM_IMPLEMENTED 0x40#define TXGBE_SFF_SFF_8472_COMP 0x5E#define TXGBE_SFF_SFF_8472_OSCB 0x6E#define TXGBE_SFF_SFF_8472_ESCB 0x76 -#define TXGBE_SFF_QSFP_PAGE_SELECT 0x7F +#define TXGBE_SFF_SFF_REVISION_ADDR 0x01 +#define TXGBE_SFF_QSFP_PAGE_SELECT 0x7F + +#define TXGBE_MODULE_QSFP_MAX_LEN 640#define TXGBE_SFF_IDENTIFIER_QSFP 0x0C#define TXGBE_SFF_IDENTIFIER_QSFP_PLUS 0x0D
drivers/net/txgbe/txgbe_ethdev.c +93 -25
134 lines not on this page · raw message
Signature · 1 line
2.21.0.windows.1
PATCH v7 18/21 net/txgbe: fix get EEPROM operation
In reply to Zaiyu WangThe original I2C access flow in the module information retrieval process was flawed. Correct the implementation to properly fetch module info.
--- drivers/net/txgbe/base/txgbe_phy.h | 1 + drivers/net/txgbe/txgbe_ethdev.c | 81 +++++++++++++++++++++++++++--- 2 files changed, 76 insertions(+), 6 deletions(-)
drivers/net/txgbe/base/txgbe_phy.h +1 -0
@@ -245,6 +245,7 @@/* EEPROM (dev_addr = 0xA0) */ #define TXGBE_I2C_EEPROM_DEV_ADDR 0xA0#define TXGBE_SFF_IDENTIFIER 0x00 +#define TXGBE_SFF_8636_STATUS_OFFSET 0x02#define TXGBE_SFF_IDENTIFIER_SFP 0x03#define TXGBE_SFF_VENDOR_OUI_BYTE0 0x25#define TXGBE_SFF_VENDOR_OUI_BYTE1 0x26
drivers/net/txgbe/txgbe_ethdev.c +75 -6
98 lines not on this page · raw message
Signature · 1 line
2.21.0.windows.1
PATCH v7 19/21 net/txgbe: fix to reset Tx write-back pointer
In reply to Zaiyu WangThe write-back pointer was not reset when the Tx queue was reset. This leads to the wrong Tx desc free logic. Move the resetting of pointer into txq->ops->reset(txq).
--- drivers/net/txgbe/txgbe_rxtx.c | 45 +++++++++++++---------- drivers/net/txgbe/txgbe_rxtx.h | 1 + drivers/net/txgbe/txgbe_rxtx_vec_common.h | 7 ++++ 3 files changed, 33 insertions(+), 20 deletions(-)
drivers/net/txgbe/txgbe_rxtx.c +25 -20
@@ -2313,6 +2313,12 @@ txgbe_reset_tx_queue(struct txgbe_tx_queue *txq) txq->tx_next_dd = (uint16_t )(txq->tx_free_thresh -1 ); txq->tx_tail =0 ; +/* Zero out headwb_mem memory */ +if (txq->headwb_mem) { +for (i =0 ; i < txq->headwb_size; i++) + txq->headwb_mem[i] =0 ; + } +/* * Always allow 1 descriptor to be un-allocated to avoid * a H/W race condition
@@ -2412,7 +2418,7 @@ txgbe_get_tx_port_offloads(struct rte_eth_dev *dev)return tx_offload_capa; } -static int +static void txgbe_setup_headwb_resources (struct rte_eth_dev *dev,void *tx_queue,unsigned int socket_id)
@@ -2420,33 +2426,33 @@ txgbe_setup_headwb_resources(struct rte_eth_dev *dev,struct txgbe_hw *hw =TXGBE_DEV_HW (dev);const struct rte_memzone *headwb;struct txgbe_tx_queue *txq = tx_queue; -u8 i, headwb_size =0 ; +u8 headwb_size =0 ; -if (hw->mac.type != txgbe_mac_aml && hw->mac.type != txgbe_mac_aml40) { - txq->headwb_mem =NULL ; -return 0 ; - } +if (hw->mac.type != txgbe_mac_aml && hw->mac.type != txgbe_mac_aml40) + goto out; + +if (!hw->devarg.tx_headwb) + goto out; - headwb_size = hw->devarg.tx_headwb_size; + headwb_size = txq->headwb_size; headwb =rte_eth_dma_zone_reserve (dev,"tx_headwb_mem" , txq->queue_id,sizeof (u32) * headwb_size,TXGBE_ALIGN , socket_id);if (headwb ==NULL ) { -DEBUGOUT ("Fail to setup headwb resources: no mem" ); -txgbe_tx_queue_release (txq); -return -ENOMEM ; +PMD_DRV_LOG (INFO , +"Failed to allocate headwb memory for Tx queue %u, change to SP mode" , + txq->queue_id); + goto out; } txq->headwb = headwb; txq->headwb_dma =TMZ_PADDR (headwb); txq->headwb_mem = (uint32_t *)TMZ_VADDR (headwb); +return ; -/* Zero out headwb_mem memory */ -for (i =0 ; i < headwb_size; i++) - txq->headwb_mem[i] =0 ; - -return 0 ; +out: + txq->headwb_mem =NULL ; }int __rte_cold
@@ -2542,6 +2548,7 @@ txgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, txq->offloads = offloads; txq->ops = &def_txq_ops; txq->tx_deferred_start = tx_conf->tx_deferred_start; + txq->headwb_size = hw->devarg.tx_headwb_size;#ifdef RTE_LIB_SECURITY txq->using_ipsec = !!(dev->data->dev_conf.txmode.offloads &RTE_ETH_TX_OFFLOAD_SECURITY );
@@ -2577,8 +2584,7 @@ txgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,/* set up scalar TX function as appropriate */ txgbe_set_tx_function (dev, txq); -if (hw->devarg.tx_headwb) - err =txgbe_setup_headwb_resources (dev, txq, socket_id); +txgbe_setup_headwb_resources (dev, txq, socket_id); txq->ops->reset (txq); txq->desc_error =0 ;
@@ -4755,15 +4761,14 @@ txgbe_dev_tx_init(struct rte_eth_dev *dev)wr32 (hw,TXGBE_TXRP (txq->reg_idx),0 );wr32 (hw,TXGBE_TXWP (txq->reg_idx),0 ); -if ((hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) && - hw->devarg.tx_headwb) { +if (txq->headwb_mem) {uint32_t txdctl;wr32 (hw,TXGBE_PX_TR_HEAD_ADDRL (txq->reg_idx), (uint32_t )(txq->headwb_dma &BIT_MASK32 ));wr32 (hw,TXGBE_PX_TR_HEAD_ADDRH (txq->reg_idx), (uint32_t )(txq->headwb_dma >>32 )); -if (hw->devarg.tx_headwb_size ==16 ) +if (txq->headwb_size ==16 ) txdctl =TXGBE_PX_TR_CFG_HEAD_WB |TXGBE_PX_TR_CFG_HEAD_WB_64BYTE ;else
drivers/net/txgbe/txgbe_rxtx.h +1 -0
@@ -416,6 +416,7 @@ struct txgbe_tx_queue {uint64_t desc_error;bool resetting;const struct rte_memzone *headwb; +uint16_t headwb_size;uint64_t headwb_dma;volatile uint32_t *headwb_mem; };
drivers/net/txgbe/txgbe_rxtx_vec_common.h +7 -0
@@ -252,6 +252,13 @@ _txgbe_reset_tx_queue_vec(struct txgbe_tx_queue *txq) txq->tx_next_dd = (uint16_t )(txq->tx_free_thresh -1 ); txq->tx_tail =0 ; + +/* Zero out headwb_mem memory */ +if (txq->headwb_mem) { +for (i =0 ; i < txq->headwb_size; i++) + txq->headwb_mem[i] =0 ; + } +/* * Always allow 1 descriptor to be un-allocated to avoid * a H/W race condition
Signature · 1 line
2.21.0.windows.1
PATCH v7 20/21 net/txgbe: fix to enable Tx desc check
In reply to Zaiyu WangNow lib security is enabled by default, and cannot be disabled if the driver is intended to be used. So Tdm_desc_chk is always unable to enable. Remove this restriction, and just enable the corresponding queue check.
--- drivers/net/txgbe/txgbe_rxtx.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/net/txgbe/txgbe_rxtx.c +6 -5
@@ -4761,6 +4761,12 @@ txgbe_dev_tx_init(struct rte_eth_dev *dev)wr32 (hw,TXGBE_TXRP (txq->reg_idx),0 );wr32 (hw,TXGBE_TXWP (txq->reg_idx),0 ); +#ifdef RTE_LIB_SECURITY + if (!txq->using_ipsec) +#endif +wr32m (hw,TXGBE_TDM_DESC_CHK (txq->reg_idx /32 ), +RTE_BIT32 (txq->reg_idx %32 ),RTE_BIT32 (txq->reg_idx %32 )); +if (txq->headwb_mem) {uint32_t txdctl;
@@ -4778,11 +4784,6 @@ txgbe_dev_tx_init(struct rte_eth_dev *dev) } } -#ifndef RTE_LIB_SECURITY -for (i =0 ; i <4 ; i++) -wr32 (hw,TXGBE_TDM_DESC_CHK (i),0xFFFFFFFF ); -#endif -/* Device configured with multiple TX queues. */ txgbe_dev_mq_tx_configure (dev); }
Signature · 1 line
2.21.0.windows.1
PATCH v7 21/21 net/txgbe: fix temperature track for AML NIC
In reply to Zaiyu WangPreviously, temperature tracking for the amlite NIC was handled by firmware together with the hardware setup. However, the firmware-based PHY configuration has proven to be unstable.
Re-add the temperature tracking function directly in the driver and invoke it periodically to ensure the PHY remains calibrated. According to the hardware recommendation, the tracking sequence should be run at least every 100 ms to keep temperature drift within 5 °C. Considering the software and hardware overhead, a 2-second interval is used as a practical trade-off that still meets stability requirements while minimizing performance impact.
The periodic tracking is implemented using a timer in the driver, and the sequence itself is the same as the one originally performed during link setup.
--- drivers/net/txgbe/txgbe_ethdev.c | 44 +++++++++++++++++++++++++++++++- drivers/net/txgbe/txgbe_ethdev.h | 1 + 2 files changed, 44 insertions(+), 1 deletion(-)
drivers/net/txgbe/txgbe_ethdev.c +43 -1
@@ -2011,8 +2011,10 @@ txgbe_dev_start(struct rte_eth_dev *dev)txgbe_filter_restore (dev); hw->bp_event_interval =100 *1000 ; -if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) +if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) {rte_eal_alarm_set (hw->bp_event_interval, txgbe_dev_e56_check_bp_event, dev); +rte_eal_alarm_set (1000 *1000 *2 , txgbe_dev_check_aml_temp_event, dev); + }if (tm_conf->root && !tm_conf->committed) PMD_DRV_LOG(WARNING,
@@ -2060,6 +2062,7 @@ txgbe_dev_stop(struct rte_eth_dev *dev)if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) {rte_eal_alarm_cancel (txgbe_dev_e56_check_bp_event, dev); +rte_eal_alarm_cancel (txgbe_dev_check_aml_temp_event, dev);rte_eal_alarm_cancel (txgbe_dev_setup_link_alarm_handler_aml, hw); }
@@ -2932,6 +2935,45 @@ txgbe_dev_supported_ptypes_get(struct rte_eth_dev *dev, size_t *no_of_elements)return NULL ; } +void txgbe_dev_check_aml_temp_event (void *param) +{ +struct rte_eth_dev *dev = (struct rte_eth_dev *)param; +struct txgbe_hw *hw =TXGBE_DEV_HW (dev); +uint32_t link_speed =0 , val =0 ; +s32 status =0 ; +int temp; + +if (hw ==NULL ) +return ; + + status =txgbe_e56_get_temp (hw, &temp); +if (status) + temp =DEFAULT_TEMP ; + +if (!(temp - hw->temperature >4 || + hw->temperature - temp >4 )) + goto out; + + hw->temperature = temp; + val =rd32 (hw,TXGBE_PORT ); +if (val &TXGBE_AMLITE_LED_LINK_40G ) + link_speed =TXGBE_LINK_SPEED_40GB_FULL ; +else if (val &TXGBE_AMLITE_LED_LINK_25G ) + link_speed =TXGBE_LINK_SPEED_25GB_FULL ; +else + link_speed =TXGBE_LINK_SPEED_10GB_FULL ; + +rte_spinlock_lock (&hw->phy_lock); +if (hw->mac.type == txgbe_mac_aml) +txgbe_temp_track_seq (hw, link_speed); +else if (hw->mac.type == txgbe_mac_aml40) +txgbe_temp_track_seq_40g (hw, link_speed); +rte_spinlock_unlock (&hw->phy_lock); + +out: +rte_eal_alarm_set (1000 *1000 *2 , txgbe_dev_check_aml_temp_event, dev); +} +void txgbe_dev_e56_check_bp_event (void *param) {struct rte_eth_dev *dev = (struct rte_eth_dev *)param;
drivers/net/txgbe/txgbe_ethdev.h +1 -0
@@ -747,5 +747,6 @@ void txgbe_vlan_hw_strip_bitmap_set(struct rte_eth_dev *dev, uint16_t queue, bool on);void txgbe_config_vlan_strip_on_all_queues (struct rte_eth_dev *dev,int mask); +void txgbe_dev_check_aml_temp_event (void *param);void txgbe_dev_e56_check_bp_event (void *param);#endif /* _TXGBE_ETHDEV_H_ */
Signature · 1 line
2.21.0.windows.1
v8 cover Wangxun Fixes
In reply to Zaiyu WangThis series fixes several issues found on Wangxun Emerald, Sapphire and Amber-lite NICs, with a focus on link-related problems.
---
v8:
- Fixed compilation error by replacing RTE_ETH_DEV_TO_PCI with RTE_CLASS_TO_BUS_DEVICE
---
v7:
- Fixed inverted semantics of is_flat_mem to match SFF8636
---
v6:
- Fixed more issues identified by AI review
---
v5:
- Fixed issues identified by AI review
---
v4:
- Fixed issues identified by devtools scripts
---
v3:
- Addressed Stephen's comments
---
v2:
- Fixed compilation error and code style issues
---
Zaiyu Wang (21):
net/txgbe: remove duplicate xstats counters net/ngbe: remove duplicate xstats counters net/ngbe: add missing CDR config for YT PHY net/ngbe: fix VF promiscuous and allmulticast net/txgbe: fix inaccuracy in Tx rate limiting net/txgbe: fix link status check condition net/txgbe: fix Tx desc free logic
net/txgbe: fix link flow control registers for Amber-Lite net/txgbe: fix link flow control config for Sapphire net/txgbe: fix a mass of unknown interrupts net/txgbe: fix traffic class priority configuration net/txgbe: fix link stability for 25G NIC net/txgbe: fix link stability for 40G NIC net/txgbe: fix link stability for Amber-Lite backplane mode net/txgbe: fix FEC mode configuration on 25G NIC net/txgbe: fix SFP module identification net/txgbe: fix get module info operation net/txgbe: fix get EEPROM operation
net/txgbe: fix to reset Tx write-back pointer net/txgbe: fix to enable Tx desc check
net/txgbe: fix temperature track for AML NIC
drivers/net/ngbe/base/ngbe_phy_yt.c | 3 + drivers/net/ngbe/ngbe_ethdev.c | 5 - drivers/net/ngbe/ngbe_ethdev_vf.c | 11 +- drivers/net/txgbe/base/meson.build | 2 + drivers/net/txgbe/base/txgbe.h | 2 + drivers/net/txgbe/base/txgbe_aml.c | 185 +- drivers/net/txgbe/base/txgbe_aml.h | 6 +- drivers/net/txgbe/base/txgbe_aml40.c | 114 +- drivers/net/txgbe/base/txgbe_aml40.h | 6 +- drivers/net/txgbe/base/txgbe_dcb_hw.c | 2 +- drivers/net/txgbe/base/txgbe_e56.c | 3773 +++++++++++++++++++++ drivers/net/txgbe/base/txgbe_e56.h | 1753 ++++++++++ drivers/net/txgbe/base/txgbe_e56_bp.c | 2597 ++++++++++++++ drivers/net/txgbe/base/txgbe_e56_bp.h | 282 ++ drivers/net/txgbe/base/txgbe_hw.c | 54 +- drivers/net/txgbe/base/txgbe_hw.h | 4 +- drivers/net/txgbe/base/txgbe_osdep.h | 4 + drivers/net/txgbe/base/txgbe_phy.c | 362 +- drivers/net/txgbe/base/txgbe_phy.h | 46 +- drivers/net/txgbe/base/txgbe_regs.h | 13 +- drivers/net/txgbe/base/txgbe_type.h | 43 +- drivers/net/txgbe/txgbe_ethdev.c | 472 ++- drivers/net/txgbe/txgbe_ethdev.h | 7 +- drivers/net/txgbe/txgbe_rxtx.c | 109 +- drivers/net/txgbe/txgbe_rxtx.h | 36 + drivers/net/txgbe/txgbe_rxtx_vec_common.h | 17 +- 26 files changed, 9464 insertions(+), 444 deletions(-) create mode 100644 drivers/net/txgbe/base/txgbe_e56.c create mode 100644 drivers/net/txgbe/base/txgbe_e56.h create mode 100644 drivers/net/txgbe/base/txgbe_e56_bp.c create mode 100644 drivers/net/txgbe/base/txgbe_e56_bp.h
Signature · 1 line
2.21.0.windows.1
PATCH v8 1/21 net/txgbe: remove duplicate xstats counters
Remove four redundant counters (tx_xon_packets, rx_xon_packets, tx_xoff_packets and rx_xoff_packets) from xstats, as they were duplicates of tx_flow_control_xon_packets and others. Both sets were reading the same registers but being output twice under different names. After removing these entries, the flow control counters in DPDK now align with those in our Linux kernel driver.
--- drivers/net/txgbe/txgbe_ethdev.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/net/txgbe/txgbe_ethdev.c +0 -5
@@ -261,11 +261,6 @@ static const struct rte_txgbe_xstats_name_off rte_txgbe_stats_strings[] = {HW_XSTAT (tx_size_1024_to_max_packets),/* Flow Control */ -HW_XSTAT (tx_xon_packets), -HW_XSTAT (rx_xon_packets), -HW_XSTAT (tx_xoff_packets), -HW_XSTAT (rx_xoff_packets), -HW_XSTAT_NAME (tx_xon_packets,"tx_flow_control_xon_packets" ),HW_XSTAT_NAME (rx_xon_packets,"rx_flow_control_xon_packets" ), HW_XSTAT_NAME(tx_xoff_packets, "tx_flow_control_xoff_packets"),
Signature · 1 line
2.21.0.windows.1
PATCH v8 2/21 net/ngbe: remove duplicate xstats counters
In reply to Zaiyu WangRemove four redundant counters (tx_xon_packets, rx_xon_packets, tx_xoff_packets and rx_xoff_packets) from xstats, as they were duplicates of tx_flow_control_xon_packets and others. Both sets were reading the same registers but being output twice under different names. After removing these entries, the flow control counters in DPDK now align with those in our Linux kernel driver.
--- drivers/net/ngbe/ngbe_ethdev.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/net/ngbe/ngbe_ethdev.c +0 -5
@@ -227,11 +227,6 @@ static const struct rte_ngbe_xstats_name_off rte_ngbe_stats_strings[] = {HW_XSTAT (tx_size_1024_to_max_packets),/* Flow Control */ -HW_XSTAT (tx_xon_packets), -HW_XSTAT (rx_xon_packets), -HW_XSTAT (tx_xoff_packets), -HW_XSTAT (rx_xoff_packets), -HW_XSTAT_NAME (tx_xon_packets,"tx_flow_control_xon_packets" ),HW_XSTAT_NAME (rx_xon_packets,"rx_flow_control_xon_packets" ), HW_XSTAT_NAME(tx_xoff_packets, "tx_flow_control_xoff_packets"),
Signature · 1 line
2.21.0.windows.1
PATCH v8 3/21 net/ngbe: add missing CDR config for YT PHY
In reply to Zaiyu WangAccording to the PHY vendor, when YT8531S operates in UTP-to-Fiber or RGMII-to-Fiber mode with auto-negotiation disabled (Force mode), additional CDR (Clock Data Recovery) configuration is required to improve link connectivity. Without this config, link may be unstable or fail to establish.
--- drivers/net/ngbe/base/ngbe_phy_yt.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ngbe/base/ngbe_phy_yt.c +3 -0
@@ -264,6 +264,9 @@ s32 ngbe_setup_phy_link_yt(struct ngbe_hw *hw, u32 speed, value =YT_BCR_RESET |YT_BCR_ANE |YT_BCR_RESTART_AN |YT_BCR_DUPLEX |YT_BCR_SPEED_SELECT1 ; }else { +/* force mode need to config cdr */ +ngbe_write_phy_reg_sds_ext_yt (hw,0x3 ,0 ,0x1434 ); +ngbe_write_phy_reg_sds_ext_yt (hw,0xe ,0 ,0x163 ); value =YT_BCR_RESET |YT_BCR_DUPLEX ;if (speed &NGBE_LINK_SPEED_1GB_FULL ) value |=YT_BCR_SPEED_SELECT1 ;
Signature · 1 line
2.21.0.windows.1
PATCH v8 4/21 net/ngbe: fix VF promiscuous and allmulticast
In reply to Zaiyu WangThe configuration of allmulti and promiscuous modes conflicts together. For instance, if we enable promiscuous mode, then enable and disable allmulti, then the promiscuous mode is wrongly disabled.
To resolve this, the following changes are made:
- do nothing when we set/unset allmulti if promiscuous mode is on
- restore the proper mode (none or allmulti) when we disable promiscuous mode
--- drivers/net/ngbe/ngbe_ethdev_vf.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/net/ngbe/ngbe_ethdev_vf.c +9 -2
@@ -1196,9 +1196,13 @@ static int ngbevf_dev_promiscuous_disable(struct rte_eth_dev *dev) {struct ngbe_hw *hw =ngbe_dev_hw (dev); +int mode =NGBEVF_XCAST_MODE_NONE ;int ret; -switch (hw->mac.update_xcast_mode (hw,NGBEVF_XCAST_MODE_NONE )) { +if (dev->data->all_multicast) + mode =NGBEVF_XCAST_MODE_ALLMULTI ; + +switch (hw->mac.update_xcast_mode (hw, mode)) {case 0 : ret =0 ;break ;
@@ -1219,7 +1223,7 @@ ngbevf_dev_allmulticast_enable(struct rte_eth_dev *dev)struct ngbe_hw *hw =ngbe_dev_hw (dev);int ret; -if (dev->data->promiscuous ==1 ) +if (dev->data->promiscuous)return 0 ;switch (hw->mac.update_xcast_mode (hw,NGBEVF_XCAST_MODE_ALLMULTI )) {
@@ -1243,6 +1247,9 @@ ngbevf_dev_allmulticast_disable(struct rte_eth_dev *dev)struct ngbe_hw *hw =ngbe_dev_hw (dev);int ret; +if (dev->data->promiscuous) +return 0 ; +switch (hw->mac.update_xcast_mode (hw,NGBEVF_XCAST_MODE_MULTI )) {case 0 : ret =0 ;
Signature · 1 line
2.21.0.windows.1
PATCH v8 5/21 net/txgbe: fix inaccuracy in Tx rate limiting
In reply to Zaiyu WangAmber-lite NIC's TX rate limiting has large deviations for small packets. To address this, the following changes are made:
1. Set TDM_RL_ADJ (0x1820c) to 21B (includes 7B Ethernet preamble, 1B SFD, 1B EFD, and 12B IPG).
2) Remove the rate offset in the driver (e.g., 105 / 100, a rough compensation value from Linux kernel driver tests).
After these changes, accuracy deviation for 64B packets is within ~5%, while large packets show lower deviation.
--- drivers/net/txgbe/base/txgbe_regs.h | 3 +++ drivers/net/txgbe/txgbe_ethdev.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)
drivers/net/txgbe/base/txgbe_regs.h +3 -0
@@ -1670,6 +1670,9 @@ enum txgbe_5tuple_protocol {#define TXGBE_TDM_FACTOR_INT_SHIFT 16#define TXGBE_TDM_FACTOR_FRA_SHIFT 2 +#define TXGBE_TDM_RL_ADJ 0x1820C +/* Ethernet framing overhead: 7B Ethernet preamble + 1B SFD + 1B EFD + 12B IPG */ +#define TXGBE_FRAME_OVERHEAD 21#define TXGBE_TDM_RL_VM_IDX 0x018218#define TXGBE_TDM_RL_VM_CFG 0x01821C#define TXGBE_TDM_RL_CFG 0x018400
drivers/net/txgbe/txgbe_ethdev.c +1 -1
@@ -4314,7 +4314,6 @@ txgbe_set_queue_rate_limit(struct rte_eth_dev *dev,u16 frac; link_speed = dev->data->dev_link.link_speed; - tx_rate = tx_rate *105 /100 ;/* Calculate the rate factor values to set */ factor_int = link_speed / tx_rate; frac = (link_speed % tx_rate) *10000 / tx_rate;
@@ -4324,6 +4323,7 @@ txgbe_set_queue_rate_limit(struct rte_eth_dev *dev, factor_fra =0 ; } +wr32 (hw,TXGBE_TDM_RL_ADJ ,TXGBE_FRAME_OVERHEAD );wr32 (hw,TXGBE_TDM_RL_QUEUE_IDX , queue_idx);wr32m (hw,TXGBE_TDM_RL_QUEUE_CFG ,TXGBE_TDM_FACTOR_INT_MASK , factor_int <<TXGBE_TDM_FACTOR_INT_SHIFT );
Signature · 1 line
2.21.0.windows.1
PATCH v8 6/21 net/txgbe: fix link status check condition
In reply to Zaiyu WangThe original code incorrectly used 'if (link_up)' instead of 'if (*link_up)', causing the condition to always evaluate to true because the pointer itself is non-NULL. This led to incorrect speed assignment.
--- drivers/net/txgbe/base/txgbe_aml.c | 2 +- drivers/net/txgbe/base/txgbe_aml40.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/txgbe/base/txgbe_aml.c +1 -1
@@ -67,7 +67,7 @@ s32 txgbe_check_mac_link_aml(struct txgbe_hw *hw, u32 *speed, *link_up = false; } -if (link_up) { +if (*link_up) {switch (links_reg &TXGBE_CFG_PORT_ST_AML_LINK_MASK ) {case TXGBE_CFG_PORT_ST_AML_LINK_25G : *speed =TXGBE_LINK_SPEED_25GB_FULL ;
drivers/net/txgbe/base/txgbe_aml40.c +1 -1
@@ -68,7 +68,7 @@ s32 txgbe_check_mac_link_aml40(struct txgbe_hw *hw, u32 *speed, *link_up = false; } -if (link_up) { +if (*link_up) {if ((links_reg &TXGBE_CFG_PORT_ST_AML_LINK_40G ) ==TXGBE_CFG_PORT_ST_AML_LINK_40G ) *speed =TXGBE_LINK_SPEED_40GB_FULL ;
Signature · 1 line
2.21.0.windows.1
PATCH v8 7/21 net/txgbe: fix Tx desc free logic
In reply to Zaiyu WangOn some server environments, this driver caused TDM non-fatal errors or PCIe request errors during Tx operation
In Amber-Lite NIC's Tx head write-back mode, the hardware periodically writes back a head index pointing to the next descriptor it is adout to process in Tx ring. All descriptors before the head are considered processed by hardware and can be safely freed by the driver.
The root cause is that the driver can safely free a batch of descriptors only when the hardware's write-back head pointer has advanced beyond all descriptors in that batch, meaning they have all been processed by the hardware. If the driver frees a descriptor before the hardware has finished processing it, invalid memory access may occur, leading to the observed bug.
To fix the issue, correct the boundary check in all three Tx cleanup functions, each of which was missing the proper condition to prevent freeing unprocessed descriptors.
--- drivers/net/txgbe/txgbe_rxtx.c | 16 +++++------ drivers/net/txgbe/txgbe_rxtx.h | 35 +++++++++++++++++++++++ drivers/net/txgbe/txgbe_rxtx_vec_common.h | 10 +++---- 3 files changed, 48 insertions(+), 13 deletions(-)
drivers/net/txgbe/txgbe_rxtx.c +8 -8
@@ -98,12 +98,11 @@ txgbe_tx_free_bufs(struct txgbe_tx_queue *txq)if (tx_last_dd >= txq->nb_tx_desc) tx_last_dd -= txq->nb_tx_desc; -volatile uint16_t head = (uint16_t )*txq->headwb_mem; +uint32_t h =rte_atomic_load_explicit (txq->headwb_mem, + rte_memory_order_acquire); +const uint16_t head = (uint16_t )h; -if (txq->tx_next_dd > head && head > tx_last_dd) -return 0 ; -else if (tx_last_dd > txq->tx_next_dd && - (head > tx_last_dd || head < txq->tx_next_dd)) +if (!txgbe_tx_headwb_desc_done (head, tx_last_dd, txq->tx_next_dd))return 0 ; }else {/* check DD bit on threshold descriptor */
@@ -645,12 +644,13 @@ txgbe_xmit_cleanup(struct txgbe_tx_queue *txq) status = txr[desc_to_clean_to].dw3;if (txq->headwb_mem) { -u32 head = *txq->headwb_mem; +uint32_t h =rte_atomic_load_explicit (txq->headwb_mem, + rte_memory_order_acquire); +const uint16_t head = (uint16_t )h;PMD_TX_FREE_LOG (DEBUG ,"queue[%02d]: headwb_mem = %03d, desc_to_clean_to = %03d" , txq->reg_idx, head, desc_to_clean_to); -/* we have caught up to head, no work left to do */ -if (desc_to_clean_to == head) +if (!txgbe_tx_headwb_desc_done (head, last_desc_cleaned, desc_to_clean_to))return -(1 ); }else {if (!(status &rte_cpu_to_le_32 (TXGBE_TXD_DD ))) {
drivers/net/txgbe/txgbe_rxtx.h +35 -0
@@ -426,6 +426,41 @@ struct txgbe_txq_ops {void (*reset)(struct txgbe_tx_queue *txq); }; +/** +* Check whether Tx descriptors in the range (last, next] are done +* in Tx head write-back mode. +* +* In head write-back mode, the hardware periodically updates *headwb_mem +* with the index of the next descriptor it will process. +* All descriptors before the head are considered processed by hardware and can +* be safely freed. The descriptor pointed to by head itself is not yet processed. +* +* @param head +* Current hardware head index read from headwb_mem. +* @param last +* The highest-index descriptor cleaned in the previous round +* (exclusive: descriptors at or before this index are already freed). +* @param next +* The highest-index descriptor to be cleaned in this round +* (inclusive: this descriptor is the target of the current cleanup). +* @return +* true if all descriptors in the range (last, next] have been completed +* by hardware and can be freed, false otherwise. +*/ +static inline bool +txgbe_tx_headwb_desc_done (uint16_t head,uint16_t last,uint16_t next) +{ +if (next == head) +return false; +else if (next > head && head > last) +return false; +/* wrap case */ +else if (last > next && (head > last || head < next)) +return false; + +return true; +} +/* Takes an ethdev and a queue and sets up the tx function to be used based on * the queue parameters. Used in tx_queue_setup by primary process and then * in dev_init by secondary process when attaching to an existing ethdev.
drivers/net/txgbe/txgbe_rxtx_vec_common.h +5 -5
@@ -94,11 +94,11 @@ txgbe_tx_free_bufs(struct txgbe_tx_queue *txq) txq->tx_next_dd - txq->tx_free_thresh;if (tx_last_dd >= txq->nb_tx_desc) tx_last_dd -= txq->nb_tx_desc; -volatile uint16_t head = (uint16_t )*txq->headwb_mem; -if (txq->tx_next_dd > head && head > tx_last_dd) -return 0 ; -else if (tx_last_dd > txq->tx_next_dd && - (head > tx_last_dd || head < txq->tx_next_dd)) +uint32_t h =rte_atomic_load_explicit (txq->headwb_mem, + rte_memory_order_acquire); +const uint16_t head = (uint16_t )h; + +if (!txgbe_tx_headwb_desc_done (head, tx_last_dd, txq->tx_next_dd))return 0 ; }else {/* check DD bit on threshold descriptor */
Signature · 1 line
2.21.0.windows.1
PATCH v8 8/21 net/txgbe: fix link flow control registers for Amber-Lite
In reply to Zaiyu WangThe flow control counter registers on AML NICs differ from those on SP NICs. Update the register offsets accordingly to ensure the counters work correctly.
--- drivers/net/txgbe/base/txgbe_hw.c | 7 ++++++ drivers/net/txgbe/base/txgbe_regs.h | 2 ++ drivers/net/txgbe/base/txgbe_type.h | 4 ++++ drivers/net/txgbe/txgbe_ethdev.c | 34 +++++++++++++++++++---------- 4 files changed, 36 insertions(+), 11 deletions(-)
drivers/net/txgbe/base/txgbe_hw.c +7 -0
@@ -394,6 +394,13 @@ s32 txgbe_clear_hw_cntrs(struct txgbe_hw *hw)rd32 (hw,TXGBE_PBTXLNKXON );rd32 (hw,TXGBE_PBTXLNKXOFF ); +if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) { +wr32 (hw,TXGBE_PBRXLNKXON_AML ,0 ); +wr32 (hw,TXGBE_PBRXLNKXOFF_AML ,0 ); + hw->last_stats.rx_xon_packets =0 ; + hw->last_stats.rx_xoff_packets =0 ; + } +/* DMA Stats */ rd32 (hw,TXGBE_DMARXPKT );rd32 (hw,TXGBE_DMATXPKT );
drivers/net/txgbe/base/txgbe_regs.h +2 -0
@@ -1085,6 +1085,8 @@ enum txgbe_5tuple_protocol {#define TXGBE_PBRXDROP 0x019068#define TXGBE_PBRXLNKXOFF 0x011988#define TXGBE_PBRXLNKXON 0x011E0C +#define TXGBE_PBRXLNKXOFF_AML 0x011F80 +#define TXGBE_PBRXLNKXON_AML 0x011F84#define TXGBE_PBRXUPXON (up) (0x011E30 + (up) * 4)#define TXGBE_PBRXUPXOFF (up) (0x011E10 + (up) * 4)
drivers/net/txgbe/base/txgbe_type.h +4 -0
@@ -876,6 +876,10 @@ struct txgbe_hw {u64 tx_qp_bytes;u64 rx_qp_mc_packets; } qp_last[TXGBE_MAX_QP ]; +struct { +u64 rx_xon_packets; +u64 rx_xoff_packets; + } last_stats;rte_spinlock_t phy_lock;/*amlite: new SW-FW mbox */
drivers/net/txgbe/txgbe_ethdev.c +23 -11
@@ -2264,16 +2264,18 @@ txgbe_dev_reset(struct rte_eth_dev *dev)return ret; } +#define TXGBE_UPDATE_COUNTER_32BIT_GENERIC (reg, last, count, reset) \ + do { \ + uint32_t current = rd32(hw, reg); \ + if ((current) < (last)) \ + current += 0x100000000ULL; \ + if (reset) \ + (last) = current; \ + (count) = (uint32_t)((current) - (last)); \ + } while (0) +#define UPDATE_QP_COUNTER_32bit (reg, last_counter, counter) \ - { \ - uint32_t current_counter = rd32(hw, reg); \ - if (current_counter < last_counter) \ - current_counter += 0x100000000LL; \ - if (!hw->offset_loaded) \ - last_counter = current_counter; \ - counter = current_counter - last_counter; \ - counter &= 0xFFFFFFFFLL; \ - } + TXGBE_UPDATE_COUNTER_32BIT_GENERIC(reg, last_counter, counter, !hw->offset_loaded)#define UPDATE_QP_COUNTER_36bit (reg_lsb, reg_msb, last_counter, counter) \ { \
@@ -2331,8 +2333,18 @@ txgbe_read_stats_registers(struct txgbe_hw *hw, hw_stats->up[i].rx_up_dropped +=rd32 (hw,TXGBE_PBRXMISS (i)); } - hw_stats->rx_xon_packets +=rd32 (hw,TXGBE_PBRXLNKXON ); - hw_stats->rx_xoff_packets +=rd32 (hw,TXGBE_PBRXLNKXOFF ); + +if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) { +TXGBE_UPDATE_COUNTER_32BIT_GENERIC (TXGBE_PBRXLNKXON_AML , + hw->last_stats.rx_xon_packets, + hw_stats->rx_xon_packets, !hw->offset_loaded); +TXGBE_UPDATE_COUNTER_32BIT_GENERIC (TXGBE_PBRXLNKXOFF_AML , + hw->last_stats.rx_xoff_packets, + hw_stats->rx_xoff_packets, !hw->offset_loaded); + }else { + hw_stats->rx_xon_packets +=rd32 (hw,TXGBE_PBRXLNKXON ); + hw_stats->rx_xoff_packets +=rd32 (hw,TXGBE_PBRXLNKXOFF ); + } hw_stats->tx_xon_packets +=rd32 (hw,TXGBE_PBTXLNKXON ); hw_stats->tx_xoff_packets +=rd32 (hw,TXGBE_PBTXLNKXOFF );
Signature · 1 line
2.21.0.windows.1
PATCH v8 9/21 net/txgbe: fix link flow control config for Sapphire
In reply to Zaiyu WangSP chips have a hardware bug preventing XON flow control support, so the driver disables it.
--- drivers/net/txgbe/base/txgbe_hw.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/txgbe/base/txgbe_hw.c +4 -2
@@ -1037,8 +1037,10 @@ s32 txgbe_fc_enable(struct txgbe_hw *hw)for (i =0 ; i <TXGBE_DCB_TC_MAX ; i++) {if ((hw->fc.current_mode & txgbe_fc_tx_pause) && hw->fc.high_water[i]) { - fcrtl =TXGBE_FCWTRLO_TH (hw->fc.low_water[i]) | -TXGBE_FCWTRLO_XON ; + fcrtl =TXGBE_FCWTRLO_TH (hw->fc.low_water[i]); +/* Only AML support XON */ +if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) + fcrtl |=TXGBE_FCWTRLO_XON ; fcrth =TXGBE_FCWTRHI_TH (hw->fc.high_water[i]) |TXGBE_FCWTRHI_XOFF ; }else {
Signature · 1 line
2.21.0.windows.1
PATCH v8 10/21 net/txgbe: fix a mass of unknown interrupts
In reply to Zaiyu WangWhen RSC is enabled, Rx ring IVAR is set to configure ITR. It causes Rx ring interrupts report on the default msix_vector. Thus a mass of unknown interrupts occupy CPU.
Fix the issue by setting ring IVAR only when the rxq interrupt is enabled.
--- drivers/net/txgbe/txgbe_rxtx.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-)
drivers/net/txgbe/txgbe_rxtx.c +17 -13
@@ -4347,6 +4347,8 @@ static int txgbe_set_rsc(struct rte_eth_dev *dev) {struct rte_eth_rxmode *rx_conf = &dev->data->dev_conf.rxmode; +struct rte_pci_device *pci_dev =RTE_CLASS_TO_BUS_DEVICE (dev, *pci_dev); +struct rte_intr_handle *intr_handle = pci_dev->intr_handle;struct txgbe_hw *hw =TXGBE_DEV_HW (dev);struct rte_eth_dev_info dev_info = {0 };bool rsc_capable = false;
@@ -4397,8 +4399,6 @@ txgbe_set_rsc(struct rte_eth_dev *dev)rd32 (hw,TXGBE_RXCFG (rxq->reg_idx));uint32_t psrtype =rd32 (hw,TXGBE_POOLRSS (rxq->reg_idx)); -uint32_t eitr = -rd32 (hw,TXGBE_ITR (rxq->reg_idx));/* * txgbe PMD doesn't support header-split at the moment.
@@ -4417,6 +4417,9 @@ txgbe_set_rsc(struct rte_eth_dev *dev) srrctl |=txgbe_get_rscctl_maxdesc (rxq->mb_pool); psrtype |=TXGBE_POOLRSS_L4HDR ; +wr32 (hw,TXGBE_RXCFG (rxq->reg_idx), srrctl); +wr32 (hw,TXGBE_POOLRSS (rxq->reg_idx), psrtype); +/* * RSC: Set ITR interval corresponding to 2K ints/s. *
@@ -4430,19 +4433,20 @@ txgbe_set_rsc(struct rte_eth_dev *dev)* For a sparse streaming case this setting will yield * at most 500us latency for a single RSC aggregation. */ - eitr &= ~TXGBE_ITR_IVAL_MASK ; - eitr |=TXGBE_ITR_IVAL_10G (TXGBE_QUEUE_ITR_INTERVAL_DEFAULT ); - eitr |=TXGBE_ITR_WRDSA ; +if (rte_intr_dp_is_en (intr_handle)) { +uint32_t eitr =rd32 (hw,TXGBE_ITR (rxq->reg_idx)); -wr32 (hw,TXGBE_RXCFG (rxq->reg_idx), srrctl); -wr32 (hw,TXGBE_POOLRSS (rxq->reg_idx), psrtype); -wr32 (hw,TXGBE_ITR (rxq->reg_idx), eitr); + eitr &= ~TXGBE_ITR_IVAL_MASK ; + eitr |=TXGBE_ITR_IVAL_10G (TXGBE_QUEUE_ITR_INTERVAL_DEFAULT ); + eitr |=TXGBE_ITR_WRDSA ; +wr32 (hw,TXGBE_ITR (rxq->reg_idx), eitr); -/* -* RSC requires the mapping of the queue to the -* interrupt vector. -*/ -txgbe_set_ivar_map (hw,0 , rxq->reg_idx, i); +/* +* RSC requires the mapping of the queue to the +* interrupt vector. +*/ +txgbe_set_ivar_map (hw,0 , rxq->reg_idx, i); + } } dev->data->lro =1 ;
Signature · 1 line
2.21.0.windows.1
PATCH v8 11/21 net/txgbe: fix traffic class priority configuration
In reply to Zaiyu WangAfter applying the following testpmd command, 802.1Q packets with specific priorities were not properly directed to the corresponding traffic classes:
port config 0 dcb vt off 4 pfc off
The old driver had two issues:
1. The hardware uses a 4-bit mapping register per traffic class for priority-to-TC mapping, but the driver incorrectly configured it as 3 bits.
2. The DCB TX configuration mistakenly wrote to the RX register.
Fix both issues, ensuring that tc-prio mapping works as expected. Additionally, remove the stale and inconsistent TXGBE_DCBUP2TC_DEC macro as it has no callers.
--- drivers/net/txgbe/base/txgbe_dcb_hw.c | 2 +- drivers/net/txgbe/base/txgbe_regs.h | 6 ++---- drivers/net/txgbe/txgbe_rxtx.c | 7 ++----- 3 files changed, 5 insertions(+), 10 deletions(-)
drivers/net/txgbe/base/txgbe_dcb_hw.c +1 -1
@@ -154,7 +154,7 @@ s32 txgbe_dcb_config_tx_data_arbiter_raptor(struct txgbe_hw *hw, u16 *refill,for (i =0 ; i <TXGBE_DCB_UP_MAX ; i++) reg |=TXGBE_DCBUP2TC_MAP (i, map[i]); -wr32 (hw,TXGBE_PBRXUP2TC , reg); +wr32 (hw,TXGBE_PBTXUP2TC , reg);/* Configure traffic class credits and priority */ for (i =0 ; i <TXGBE_DCB_TC_MAX ; i++) {
drivers/net/txgbe/base/txgbe_regs.h +2 -4
@@ -503,10 +503,8 @@#define TXGBE_PBRXCTL 0x019000#define TXGBE_PBRXCTL_ST MS(0, 0x1)#define TXGBE_PBRXCTL_ENA MS(31, 0x1) -#define TXGBE_PBRXUP2TC 0x019008#define TXGBE_PBTXUP2TC 0x01C800 -#define TXGBE_DCBUP2TC_MAP (tc, v) LS(v, 3 * (tc), 0x7) -#define TXGBE_DCBUP2TC_DEC (tc, r) RS(r, 3 * (tc), 0x7) +#define TXGBE_DCBUP2TC_MAP (tc, v) LS(v, 4 * (tc), 0x7)#define TXGBE_PBRXSIZE (tc) (0x019020 + (tc) * 4)#define TXGBE_PBRXSIZE_KB (v) LS(v, 10, 0x3FF)
@@ -1705,7 +1703,7 @@ enum txgbe_5tuple_protocol {#define TXGBE_RDM_PF_HIDE (_i) (0x12090 + ((_i) * 4))#define TXGBE_RPUP2TC 0x019008 -#define TXGBE_RPUP2TC_UP_SHIFT 3 +#define TXGBE_RPUP2TC_UP_SHIFT 4#define TXGBE_RPUP2TC_UP_MASK 0x7#define TXGBE_RDM_DCACHE_CTL 0x0120A8
drivers/net/txgbe/txgbe_rxtx.c +2 -5
@@ -3378,11 +3378,8 @@ txgbe_vmdq_dcb_configure(struct rte_eth_dev *dev) queue_mapping =0 ;for (i =0 ; i <RTE_ETH_DCB_NUM_USER_PRIORITIES ; i++) -/* -* mapping is done with 3 bits per priority, -* so shift by i*3 each time -*/ - queue_mapping |= ((cfg->dcb_tc[i] &0x07 ) << (i *3 )); + queue_mapping |= ((cfg->dcb_tc[i] &TXGBE_RPUP2TC_UP_MASK ) << + (i *TXGBE_RPUP2TC_UP_SHIFT ));wr32 (hw,TXGBE_RPUP2TC , queue_mapping);
Signature · 1 line
2.21.0.windows.1
PATCH v8 12/21 net/txgbe: fix link stability for 25G NIC
In reply to Zaiyu WangThe link was previously configured via firmware, but this approach resulted in unstable link behavior. To resolve the issue, re-add the PHY configuration flow directly into the driver.
--- drivers/net/txgbe/base/meson.build | 1 + drivers/net/txgbe/base/txgbe_aml.c | 105 +- drivers/net/txgbe/base/txgbe_aml.h | 6 +- drivers/net/txgbe/base/txgbe_e56.c | 2488 +++++++++++++++++++++++++ drivers/net/txgbe/base/txgbe_e56.h | 1746 +++++++++++++++++ drivers/net/txgbe/base/txgbe_e56_bp.h | 279 +++ drivers/net/txgbe/base/txgbe_hw.c | 35 +- drivers/net/txgbe/base/txgbe_phy.h | 1 - drivers/net/txgbe/base/txgbe_regs.h | 2 + drivers/net/txgbe/base/txgbe_type.h | 12 + drivers/net/txgbe/txgbe_ethdev.c | 83 +- drivers/net/txgbe/txgbe_ethdev.h | 4 + 12 files changed, 4703 insertions(+), 59 deletions(-) create mode 100644 drivers/net/txgbe/base/txgbe_e56.c create mode 100644 drivers/net/txgbe/base/txgbe_e56.h create mode 100644 drivers/net/txgbe/base/txgbe_e56_bp.h
drivers/net/txgbe/base/meson.build +1 -0
@@ -12,4 +12,5 @@ base_sources = files( 'txgbe_mng.c', 'txgbe_phy.c', 'txgbe_vf.c', + 'txgbe_e56.c', )
drivers/net/txgbe/base/txgbe_aml.c +80 -25
177 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_aml.h +4 -2
@@ -16,7 +16,9 @@ s32 txgbe_get_link_capabilities_aml(struct txgbe_hw *hw, u32 *speed, bool *autoneg);u32 txgbe_get_media_type_aml (struct txgbe_hw *hw);void txgbe_wait_for_link_up_aml (struct txgbe_hw *hw,u32 speed); -s32 txgbe_setup_mac_link_aml (struct txgbe_hw *hw,u32 speed, -bool autoneg_wait_to_complete); +s32 txgbe_setup_phy_link_aml (struct txgbe_hw *hw, +u32 speed, +bool autoneg_wait_to_complete, +bool *need_reset);void txgbe_init_mac_link_ops_aml (struct txgbe_hw *hw);#endif /* _TXGBE_AML_H_ */
drivers/net/txgbe/base/txgbe_e56.c new file +2488 -0
2,488 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_e56.h new file +1746 -0
319 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_e56_bp.h new file +279 -0
279 lines not on this page · raw message
drivers/net/txgbe/txgbe_ethdev.c +82 -1
83 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.21.0.windows.1
Part of the diff is not shown here. View the raw message.
Re: [PATCH v8 12/21] net/txgbe: fix link stability for 25G NIC
drivers/net/txgbe/base/txgbe_e56.c line 12
Quoted 4 lines · On Wed, 17 Jun 2026 16:12:59 +0800 Zaiyu Wang <[email protected]> wrote:
drivers/net/txgbe/base/txgbe_e56.c new file +4
-0+void +set_fields_e56 (unsigned int *src_data,unsigned int bit_high, +unsigned int bit_low,unsigned int set_value) +{
Function could be static here?
drivers/net/txgbe/base/txgbe_type.h line 68
Quoted 2 lines
drivers/net/txgbe/base/txgbe_type.h +2
-0+#define CL74_KRTR_TRAINNING_TIMEOUT 6000/* 3000ms c74 trainning timeout */ +#define AN_TRAINNING_MODE 0/* 0: not dis an 1: dis an */
Checkpatch thinks this is a spelling error did you mean "training"
Another typo here.
WARNING: [TYPO_SPELLING] 'sequeence' may be misspelled - perhaps 'sequence'? # drivers/net/txgbe/base/txgbe_e56_bp.c:2465:
+ /* 19. rxs calibration and adaotation sequeence */
RE: [PATCH v8 12/21] net/txgbe: fix link stability for 25G NIC
Quoted 9 lines
-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Wednesday, June 17, 2026 11:54 PM
To: Zaiyu Wang <[email protected]>; Zaiyu Wang <[email protected]>
Cc: [email protected]; [email protected]; Jiawen Wu <[email protected]>; [email protected]; [email protected]; Jiawen Wu <[email protected]>
Subject: Re: [PATCH v8 12/21] net/txgbe: fix link stability for 25G NIC
Quoted 8 lines
drivers/net/txgbe/base/txgbe_e56.c
Quoted 3 lines · On Wed, 17 Jun 2026 16:12:59 +0800 Zaiyu Wang <[email protected]> wrote:
drivers/net/txgbe/base/txgbe_e56.c new file +3
-0+void +set_fields_e56 (unsigned int *src_data,unsigned int bit_high, +unsigned int bit_low,unsigned int set_value) {Function could be static here?
Hi Stephen,
Thanks for your time. This function is used in both txgbe_e56.c (for general PHY configuration) and txgbe_e56_bp.c (for backplane mode configuration). Therefore, making it static would not be feasible?
I have also fixed the other issues you pointed out, including the spelling corrections, replacing tabs with spaces in log messages, and removing the term "master" from comments.
Best regards,
Zaiyu
Re: [PATCH v8 12/21] net/txgbe: fix link stability for 25G NIC
Quoted 13 lines · On Mon, 22 Jun 2026 19:09:32 +0800 Zaiyu Wang <[email protected]> wrote:
Quoted 5 lines
drivers/net/txgbe/base/txgbe_e56.c
Quoted 3 lines
drivers/net/txgbe/base/txgbe_e56.c new file +3
-0+void +set_fields_e56 (unsigned int *src_data,unsigned int bit_high, +unsigned int bit_low,unsigned int set_value) {Function could be static here?
Hi Stephen,
Thanks for your time. This function is used in bothtxgbe_e56.c(for general PHY configuration) andtxgbe_e56_bp.c(for backplane mode configuration). Therefore, making it static would not be feasible?
I have also fixed the other issues you pointed out, including the spelling corrections, replacing tabs with spaces in log messages, and removing the term "master" from comments.
Quoted 2 lines
Best regards,
Zaiyu
Why I noticed was that it is a global function not following naming conventions. Either make it inline in a header or rename.
RE: [PATCH v8 12/21] net/txgbe: fix link stability for 25G NIC
Quoted 9 lines
-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Monday, June 22, 2026 10:53 PM
To: Zaiyu Wang <[email protected]>; Zaiyu Wang <[email protected]>
Cc: [email protected]; [email protected]
Subject: Re: [PATCH v8 12/21] net/txgbe: fix link stability for 25G NIC
Quoted 16 lines
Quoted 13 lines · On Mon, 22 Jun 2026 19:09:32 +0800 Zaiyu Wang <[email protected]> wrote:
Quoted 5 lines
drivers/net/txgbe/base/txgbe_e56.c
Quoted 3 lines
drivers/net/txgbe/base/txgbe_e56.c new file +3
-0+void +set_fields_e56 (unsigned int *src_data,unsigned int bit_high, +unsigned int bit_low,unsigned int set_value) {Function could be static here?
Hi Stephen,
Thanks for your time. This function is used in bothtxgbe_e56.c(for general PHY
configuration) andtxgbe_e56_bp.c(for backplane mode configuration). Therefore, making it static would not be feasible?
I have also fixed the other issues you pointed out, including the spelling corrections, replacing tabs with spaces in log messages, and removing the
term "master"
Quoted 9 lines
from comments.
Quoted 3 lines
Best regards,
ZaiyuWhy I noticed was that it is a global function not following naming conventions. Either make it inline in a header or rename.
Thank you for the clarification.
I agree that renaming it would be a better approach.
PATCH v8 13/21 net/txgbe: fix link stability for 40G NIC
In reply to Zaiyu WangThe link was previously configured via firmware, but this approach resulted in unstable link behavior. To resolve the issue, re-add the PHY configuration flow directly into the driver.
--- drivers/net/txgbe/base/txgbe_aml40.c | 73 +- drivers/net/txgbe/base/txgbe_aml40.h | 6 +- drivers/net/txgbe/base/txgbe_e56.c | 1473 ++++++++++++++++++++++++-- drivers/net/txgbe/base/txgbe_e56.h | 9 +- drivers/net/txgbe/txgbe_ethdev.c | 4 +- 5 files changed, 1447 insertions(+), 118 deletions(-)
drivers/net/txgbe/base/txgbe_aml40.c +56 -17
@@ -13,6 +13,7 @@#include "txgbe_hw.h" #include "txgbe_aml.h" #include "txgbe_aml40.h" +#include "txgbe_e56.h" void txgbe_init_ops_aml40 (struct txgbe_hw *hw) {
@@ -24,6 +25,7 @@ void txgbe_init_ops_aml40(struct txgbe_hw *hw)/* PHY */ phy->get_media_type = txgbe_get_media_type_aml40; + phy->setup_link_core = txgbe_setup_phy_link_aml40;/* LINK */ mac->init_mac_link_ops = txgbe_init_mac_link_ops_aml40;
@@ -52,6 +54,13 @@ s32 txgbe_check_mac_link_aml40(struct txgbe_hw *hw, u32 *speed,if (link_up_wait_to_complete) {for (i =0 ; i < hw->mac.max_link_up_time; i++) { +if (!hw->link_valid) { + *link_up = false; + +msleep (100 ); +continue ; + } +if (!(links_reg &TXGBE_PORTSTAT_UP )) { *link_up = false; }else {
@@ -68,6 +77,9 @@ s32 txgbe_check_mac_link_aml40(struct txgbe_hw *hw, u32 *speed, *link_up = false; } +if (!hw->link_valid) + *link_up = false; +if (*link_up) {if ((links_reg &TXGBE_CFG_PORT_ST_AML_LINK_40G ) ==TXGBE_CFG_PORT_ST_AML_LINK_40G )
@@ -107,20 +119,24 @@ u32 txgbe_get_media_type_aml40(struct txgbe_hw *hw)return txgbe_media_type_fiber_qsfp; } -s32 txgbe_setup_mac_link_aml40 (struct txgbe_hw *hw, -u32 speed, -bool autoneg_wait_to_complete) +s32 txgbe_setup_phy_link_aml40 (struct txgbe_hw *hw, +u32 speed, +bool autoneg_wait_to_complete, +bool *need_reset) {bool autoneg = false;s32 status =0 ; +s32 ret_status =0 ;u32 link_speed =TXGBE_LINK_SPEED_UNKNOWN ;bool link_up = false; +int i;u32 link_capabilities =TXGBE_LINK_SPEED_UNKNOWN ; +u32 value; -if (hw->phy.sfp_type == txgbe_sfp_type_not_present) { -DEBUGOUT ("SFP not detected, skip setup mac link" ); -return 0 ; - } + *need_reset = false; + +if (hw->phy.sfp_type == txgbe_sfp_type_not_present) + hw->phy.identify_sfp (hw);/* Check to see if speed passed in is supported. */ status = hw->mac.get_link_capabilities(hw,
@@ -132,18 +148,42 @@ s32 txgbe_setup_mac_link_aml40(struct txgbe_hw *hw,if (speed ==TXGBE_LINK_SPEED_UNKNOWN )return TXGBE_ERR_LINK_SETUP ; - status = hw->mac.check_link (hw, &link_speed, &link_up, - autoneg_wait_to_complete); +for (i =0 ; i <4 ; i++) { +txgbe_e56_check_phy_link (hw, &link_speed, &link_up); +if (link_up) +break ; +msleep (250 ); + }if (link_speed == speed && link_up) -return status; - -if (speed &TXGBE_LINK_SPEED_40GB_FULL ) - speed =0x20 ; - - status = hw->phy.set_link_hostif (hw, (u8 )speed, autoneg, true); + goto out; + +rte_spinlock_lock (&hw->phy_lock); + ret_status =txgbe_set_link_to_amlite (hw, speed); +if (ret_status ==TXGBE_ERR_TIMEOUT ) + hw->link_valid = false; +rte_spinlock_unlock (&hw->phy_lock); + +for (i =0 ; i <4 ; i++) { +txgbe_e56_check_phy_link (hw, &link_speed, &link_up); +if (link_up) + goto out; +msleep (250 ); + } -txgbe_wait_for_link_up_aml (hw, speed); +out: +if (link_up) { + value =rd32 (hw,TXGBE_PORTSTAT ); +if (!(value &TXGBE_PORTSTAT_UP )) { +DEBUGOUT ("MAC link 0x14404: 0x%x" , value); + *need_reset = true; + value =rd32 (hw,0x110b0 ); +DEBUGOUT ("MAC intr status 0x110b0: 0x%x" , value); + } + }else { + *need_reset = true; +DEBUGOUT ("Link reconfiguration required. Reset scheduled in 2000ms." ); + }return status; }
@@ -159,6 +199,5 @@ void txgbe_init_mac_link_ops_aml40(struct txgbe_hw *hw) mac->flap_tx_laser = txgbe_flap_tx_laser_multispeed_fiber; - mac->setup_link = txgbe_setup_mac_link_aml40; mac->set_rate_select_speed = txgbe_set_hard_rate_select_speed; }
drivers/net/txgbe/base/txgbe_aml40.h +4 -2
@@ -14,7 +14,9 @@ s32 txgbe_check_mac_link_aml40(struct txgbe_hw *hw,s32 txgbe_get_link_capabilities_aml40 (struct txgbe_hw *hw,u32 *speed,bool *autoneg);u32 txgbe_get_media_type_aml40 (struct txgbe_hw *hw); -s32 txgbe_setup_mac_link_aml40 (struct txgbe_hw *hw,u32 speed, -bool autoneg_wait_to_complete); +s32 txgbe_setup_phy_link_aml40 (struct txgbe_hw *hw, +u32 speed, +bool autoneg_wait_to_complete, +bool *need_reset);void txgbe_init_mac_link_ops_aml40 (struct txgbe_hw *hw);#endif /* _TXGBE_AML40_H_ */
drivers/net/txgbe/base/txgbe_e56.c +1378 -95
1,560 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_e56.h +7 -2
@@ -438,7 +438,12 @@ typedef union {#define E56PHY_FETX_FFE_TRAIN_CFG_0_KRT_FETX_INIT_FFE_CFG_2 9, 8#define E56PHY_FETX_FFE_TRAIN_CFG_0_KRT_FETX_INIT_FFE_CFG_3 13, 12 -#define PHYINIT_TIMEOUT 1000/* PHY initialization timeout value in 0.5ms unit */ +/* PHYINIT_TIMEOUT, a loop iteration counter, not a fixed time unit. +* The actual timeout duration depends on the usec_delay() or msleep() +* value used inside the polling loop. For example, when usec_delay(500) +* is used, the total timeout is approximately PHYINIT_TIMEOUT * 500 us. +*/ +#define PHYINIT_TIMEOUT 1000#define E56G__BASEADDR 0x0
@@ -1729,7 +1734,7 @@ typedef union {void set_fields_e56 (unsigned int *src_data,unsigned int bit_high,unsigned int bit_low,unsigned int set_value); -int txgbe_e56_rx_rd_second_code_40g (struct txgbe_hw *hw,int *SECOND_CODE ,int lane); +void txgbe_e56_rx_rd_second_code_40g (struct txgbe_hw *hw,int *SECOND_CODE ,int lane);void txgbe_e56_rx_rd_second_code (struct txgbe_hw *hw,int *SECOND_CODE );u32 txgbe_e56_cfg_40g (struct txgbe_hw *hw);u32 txgbe_e56_cfg_25g (struct txgbe_hw *hw);
drivers/net/txgbe/txgbe_ethdev.c +2 -2
@@ -2054,7 +2054,7 @@ txgbe_dev_stop(struct rte_eth_dev *dev)PMD_INIT_FUNC_TRACE (); -if (hw->mac.type == txgbe_mac_aml) +if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40)rte_eal_alarm_cancel (txgbe_dev_setup_link_alarm_handler_aml, hw);rte_eal_alarm_cancel (txgbe_dev_detect_sfp, dev);
@@ -3206,7 +3206,7 @@ txgbe_dev_setup_link_thread_handler(void *param)struct txgbe_hw *hw =TXGBE_DEV_HW (dev);rte_thread_detach (rte_thread_self ()); -if (hw->mac.type == txgbe_mac_aml) +if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40)txgbe_dev_setup_link_alarm_handler_aml (hw);else txgbe_dev_setup_link_alarm_handler (dev);
Signature · 1 line
2.21.0.windows.1
Re: [PATCH v8 13/21] net/txgbe: fix link stability for 40G NIC
drivers/net/txgbe/base/txgbe_e56.c txgbe_e56_get_temp(struct txgbe_hw *hw, int *temp) · line 186
Quoted 6 lines · On Wed, 17 Jun 2026 16:13:00 +0800 Zaiyu Wang <[email protected]> wrote:
drivers/net/txgbe/base/txgbe_e56.c +6
-0+/* CMS Config Master */ + addr =E56G_CMS_ANA_OVRDVAL_7_ADDR ; + rdata =rd32_ephy (hw, addr); + ((E56G_CMS_ANA_OVRDVAL_7 *)&rdata)->ana_lcpll_lf_vco_swing_ctrl_i =0xf ; +wr32_ephy (hw, addr, rdata); +
DPDK has replaced all use of the terms master/slave with alternative words. This gets flagged by check patch. Please consider other alternatives.
WARNING:TYPO_SPELLING: 'Master' may be misspelled - perhaps 'Primary'? #210: FILE: drivers/net/txgbe/base/txgbe_e56.c:181:
+ /* CMS Config Master */
^^^^^^
WARNING:TYPO_SPELLING: 'Master' may be misspelled - perhaps 'Primary'? #231: FILE: drivers/net/txgbe/base/txgbe_e56.c:202:
+ /* TXS Config Master */
^^^^^^
WARNING:TYPO_SPELLING: 'master' may be misspelled - perhaps 'primary'? #267: FILE: drivers/net/txgbe/base/txgbe_e56.c:238:
+ /* RXS Config master */
^^^^^^
WARNING:TYPO_SPELLING: 'master' may be misspelled - perhaps 'primary'? #484: FILE: drivers/net/txgbe/base/txgbe_e56.c:455:
+ /* PDIG Config master */
^^^^^^
PATCH v8 14/21 net/txgbe: fix link stability for Amber-Lite backplane mode
In reply to Zaiyu WangThe link was previously configured via firmware, but this approach resulted in unstable link behavior. To resolve the issue, re-add the PHY configuration flow directly into the driver.
--- drivers/net/txgbe/base/meson.build | 1 + drivers/net/txgbe/base/txgbe.h | 2 + drivers/net/txgbe/base/txgbe_aml.c | 65 +- drivers/net/txgbe/base/txgbe_aml40.c | 43 +- drivers/net/txgbe/base/txgbe_e56.c | 22 +- drivers/net/txgbe/base/txgbe_e56.h | 2 + drivers/net/txgbe/base/txgbe_e56_bp.c | 2597 +++++++++++++++++++++++++ drivers/net/txgbe/base/txgbe_e56_bp.h | 3 + drivers/net/txgbe/base/txgbe_hw.c | 6 + drivers/net/txgbe/base/txgbe_hw.h | 4 +- drivers/net/txgbe/base/txgbe_osdep.h | 4 + drivers/net/txgbe/base/txgbe_phy.c | 21 + drivers/net/txgbe/base/txgbe_phy.h | 22 + drivers/net/txgbe/base/txgbe_type.h | 25 +- drivers/net/txgbe/txgbe_ethdev.c | 109 +- drivers/net/txgbe/txgbe_ethdev.h | 2 +- 16 files changed, 2898 insertions(+), 30 deletions(-) create mode 100644 drivers/net/txgbe/base/txgbe_e56_bp.c
drivers/net/txgbe/base/meson.build +1 -0
@@ -13,4 +13,5 @@ base_sources = files( 'txgbe_phy.c', 'txgbe_vf.c', 'txgbe_e56.c', + 'txgbe_e56_bp.c', )
drivers/net/txgbe/base/txgbe.h +2 -0
@@ -13,5 +13,7 @@#include "txgbe_hw.h" #include "txgbe_vf.h" #include "txgbe_dcb.h" +#include "txgbe_e56.h" +#include "txgbe_e56_bp.h" #endif /* _TXGBE_H_ */
drivers/net/txgbe/base/txgbe_aml.c +54 -11
102 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_aml40.c +39 -4
73 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_e56.c +12 -10
@@ -53,7 +53,7 @@ int txgbe_e56_int_cmp(const void *a, const void *b) }s32 txgbe_e56_check_phy_link (struct txgbe_hw *hw,u32 *speed, -bool *link_up) +bool *link_up) {u32 rdata =0 ;u32 links_reg =0 ;
@@ -101,7 +101,8 @@ u32 txgbe_e56_tx_ffe_cfg(struct txgbe_hw *hw, u32 speed) post =S10G_TX_FFE_CFG_POST ; }else if (speed ==TXGBE_LINK_SPEED_25GB_FULL ) {if (hw->phy.sfp_type == txgbe_sfp_type_da_cu_core0 || - hw->phy.sfp_type == txgbe_sfp_type_da_cu_core1) { + hw->phy.sfp_type == txgbe_sfp_type_da_cu_core1 || +txgbe_is_backplane (hw)) { ffe_main =S25G_TX_FFE_CFG_DAC_MAIN ; pre1 =S25G_TX_FFE_CFG_DAC_PRE1 ; pre2 =S25G_TX_FFE_CFG_DAC_PRE2 ;
@@ -119,7 +120,8 @@ u32 txgbe_e56_tx_ffe_cfg(struct txgbe_hw *hw, u32 speed) post =S10G_TX_FFE_CFG_POST ;if (hw->phy.sfp_type == txgbe_qsfp_type_40g_cu_core0 || - hw->phy.sfp_type == txgbe_qsfp_type_40g_cu_core1) { + hw->phy.sfp_type == txgbe_qsfp_type_40g_cu_core1 || +txgbe_is_backplane (hw)) { ffe_main =S40G_TX_FFE_CFG_MAIN ; pre1 =S40G_TX_FFE_CFG_PRE1 ; pre2 =S40G_TX_FFE_CFG_PRE2 ;
@@ -1508,7 +1510,7 @@ txgbe_e56_rxs_osc_init_for_temp_track_range(struct txgbe_hw *hw, u32 speed) rdata =rd32_ephy (hw, addr);if (timer++ >PHYINIT_TIMEOUT ) { -DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!\n" ); +DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!" );return -1 ; } }
@@ -1542,7 +1544,7 @@ txgbe_e56_rxs_osc_init_for_temp_track_range(struct txgbe_hw *hw, u32 speed)if (((rdata >> (i *8 )) &0x3f ) ==0x21 )break ;if (timer++ >PHYINIT_TIMEOUT ) { -DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!\n" ); +DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!" );return -1 ; } }
@@ -1618,7 +1620,7 @@ txgbe_e56_rxs_osc_init_for_temp_track_range(struct txgbe_hw *hw, u32 speed) addr =E56PHY_CTRL_FSM_RX_STAT_0_ADDR ; rdata =rd32_ephy (hw, addr);if (timer++ >PHYINIT_TIMEOUT ) { -DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!\n" ); +DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!" );return -1 ; } }
@@ -1664,7 +1666,7 @@ txgbe_e56_rxs_osc_init_for_temp_track_range(struct txgbe_hw *hw, u32 speed)if (((rdata >> (i *8 )) &0x3f ) ==0x21 )break ;if (timer++ >PHYINIT_TIMEOUT ) { -DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!\n" ); +DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!" );return -1 ; } }
@@ -1929,7 +1931,7 @@ int txgbe_temp_track_seq_40g(struct txgbe_hw *hw, u32 speed)CMVAR_UFINE_FMIN_WRAP =S25G_CMVAR_UFINE_FMIN_WRAP ;CMVAR_FINE_FMIN_WRAP =S25G_CMVAR_FINE_FMIN_WRAP ; }else { -DEBUGOUT ("Error Speed\n" ); +DEBUGOUT ("Error Speed" );return 0 ; }
@@ -3190,7 +3192,7 @@ static int txgbe_e56_disable_rx40G(struct txgbe_hw *hw) rdata =rd32_ephy (hw, addr);usec_delay (100 );if (timer++ >PHYINIT_TIMEOUT ) { -DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!\n" ); +DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!" );break ; } }
@@ -3296,7 +3298,7 @@ static int txgbe_e56_disable_rx(struct txgbe_hw *hw)break ;usec_delay (100 );if (timer++ >PHYINIT_TIMEOUT ) { -DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!\n" ); +DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!" );break ; } }
drivers/net/txgbe/base/txgbe_e56.h +2 -0
@@ -1744,6 +1744,8 @@ int txgbe_temp_track_seq(struct txgbe_hw *hw, u32 speed);int txgbe_e56_get_temp (struct txgbe_hw *hw,int *temp);int txgbe_set_link_to_amlite (struct txgbe_hw *hw,u32 speed);int txgbe_e56_reconfig_rx (struct txgbe_hw *hw,u32 speed); +s32 txgbe_e56_check_phy_link (struct txgbe_hw *hw,u32 *speed, +bool *link_up);s32 txgbe_e56_fec_set (struct txgbe_hw *hw);s32 txgbe_e56_fec_polling (struct txgbe_hw *hw,bool *link_up);u32 txgbe_e56_tx_ffe_cfg (struct txgbe_hw *hw,u32 speed);
drivers/net/txgbe/base/txgbe_e56_bp.c new file +2597 -0
2,597 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_e56_bp.h +3 -0
@@ -276,4 +276,7 @@ typedef union {#define E56PHY_CMS_ANA_OVRDVAL_10_ADDR (E56PHY_CMS_BASE_ADDR + 0xD8)#define E56PHY_CMS_ANA_OVRDVAL_7_ANA_LCPLL_LF_LPF_SETCODE_CALIB_I 8, 4 +int txgbe_e56_set_phy_link_mode (struct txgbe_hw *hw, +u8 bp_link_mode,u32 need_restart); +int handle_e56_bkp_an73_flow (struct txgbe_hw *hw);#endif
drivers/net/txgbe/base/txgbe_hw.c +6 -0
@@ -4071,6 +4071,12 @@ s32 txgbe_reset_pipeline_raptor(struct txgbe_hw *hw)return err; } +bool txgbe_is_backplane (struct txgbe_hw *hw) +{ +return hw->phy.get_media_type (hw) == txgbe_media_type_backplane ? + true : false; +} +bool txgbe_gpio_ext_check (struct txgbe_hw *hw,u8 gpio_ext_mask) {u32 gpio_ext =rd32 (hw,TXGBE_GPIOEXT );
drivers/net/txgbe/base/txgbe_hw.h +2 -2
@@ -118,6 +118,6 @@ s32 txgbe_reinit_fdir_tables(struct txgbe_hw *hw);bool txgbe_verify_lesm_fw_enabled_raptor (struct txgbe_hw *hw);s32 txgbe_fmgr_cmd_op (struct txgbe_hw *hw,u32 cmd,u32 cmd_addr);s32 txgbe_flash_read_dword (struct txgbe_hw *hw,u32 addr,u32 *data); -s32 txgbe_e56_check_phy_link (struct txgbe_hw *hw,u32 *speed, -bool *link_up); +bool txgbe_is_backplane (struct txgbe_hw *hw); +bool txgbe_gpio_ext_check (struct txgbe_hw *hw,u8 gpio_ext_mask);#endif /* _TXGBE_HW_H_ */
drivers/net/txgbe/base/txgbe_osdep.h +4 -0
@@ -162,6 +162,10 @@ static inline u64 REVERT_BIT_MASK64(u64 mask) ((mask &0xFFFFFFFF00000000 ) >>32 ); } +#define BITS_PER_LONG (__SIZEOF_LONG__ * 8) +#define GENMASK (h, l) \ + (((~0UL) << (l)) & (~0UL >> (BITS_PER_LONG - 1 - (h)))) +#define IOMEM #define BIT (nr) (1UL << (nr))
drivers/net/txgbe/base/txgbe_phy.c +21 -0
@@ -2503,6 +2503,27 @@ void txgbe_set_phy_temp(struct txgbe_hw *hw) } } +int txgbe_is_dac_cable (struct txgbe_hw *hw) +{ +if (hw->phy.sfp_type == txgbe_sfp_type_da_cu_core0 || + hw->phy.sfp_type == txgbe_sfp_type_da_cu_core1 || + hw->phy.sfp_type == txgbe_sfp_type_da_act_lmt_core0 || + hw->phy.sfp_type == txgbe_sfp_type_da_act_lmt_core1 || + hw->phy.sfp_type == txgbe_qsfp_type_40g_cu_core0 || + hw->phy.sfp_type == txgbe_qsfp_type_40g_cu_core1) +return true; + +return false; +} + +int txgbe_xpcs_an_enabled (struct txgbe_hw *hw) +{ +if (!(txgbe_is_dac_cable (hw) ||txgbe_is_backplane (hw))) +return false; + +return hw->devarg.auto_neg ? true : false; +} +/** * txgbe_kr_handle - Handle the interrupt of auto-negotiation * @hw: pointer to hardware structure
drivers/net/txgbe/base/txgbe_phy.h +22 -0
@@ -105,6 +105,8 @@#define VR_AN_INTR_CMPLT MS16(0, 0x1)#define VR_AN_INTR_LINK MS16(1, 0x1)#define VR_AN_INTR_PG_RCV MS16(2, 0x1) +#define TXGBE_E56_AN_TXDIS MS16(3, 0x1) +#define TXGBE_E56_AN_PG_RCV MS16(4, 0x1)#define VR_AN_KR_MODE_CL 0x078003#define VR_AN_KR_MODE_CL_PDET MS16(0, 0x1)#define VR_XS_OR_PCS_MMD_DIGI_CTL1 0x038000
@@ -428,6 +430,24 @@#define TXGBE_BP_M_NAUTO 0#define TXGBE_BP_M_AUTO 1 +#define kr_read_poll (op, val, cond, sleep_us, \ + times, args...) \ +({ \ + unsigned long __sleep_us = (sleep_us); \ + u32 __times = (times); \ + u32 i; \ + int __cond = 0; \ + for (i = 0; i < __times; i++) { \ + (val) = op(args); \ + if (cond) { \ + __cond = 1; \ + break; \ + } \ + usec_delay(__sleep_us);\ + } \ + (__cond) ? 0 : -1; \ +}) +#ifndef CL72_KRTR_PRBS_MODE_EN #define CL72_KRTR_PRBS_MODE_EN 0xFFFF/* open kr prbs check */ #endif
@@ -490,6 +510,8 @@ void txgbe_autoc_write(struct txgbe_hw *hw, u64 value);void txgbe_bp_mode_set (struct txgbe_hw *hw);void txgbe_set_phy_temp (struct txgbe_hw *hw);void txgbe_bp_down_event (struct txgbe_hw *hw); +int txgbe_is_dac_cable (struct txgbe_hw *hw); +int txgbe_xpcs_an_enabled (struct txgbe_hw *hw);s32 txgbe_kr_handle (struct txgbe_hw *hw);#endif /* _TXGBE_PHY_H_ */
drivers/net/txgbe/base/txgbe_type.h +24 -1
@@ -719,6 +719,7 @@ struct txgbe_phy_info {u32 addr;u32 id;enum txgbe_sfp_type sfp_type; +u32 fiber_suppport_speed;bool sfp_setup_needed;u32 revision;u32 media_type;
@@ -740,6 +741,7 @@ struct txgbe_phy_info {u16 ffe_pre2;u16 ffe_post;u16 fec_mode; +u16 bp_capa; };#define TXGBE_DEVARG_BP_AUTO "auto_neg"
@@ -899,7 +901,28 @@ struct txgbe_hw {u32 cur_fec_link;int temperature;u32 bp_link_mode; -}; +bool dac_sfp; +bool bypass_ctle; +u32 curbp_link_mode; +bool an_done;
Lines of this file are not shown. View the raw message.
drivers/net/txgbe/txgbe_ethdev.c +108 -1
109 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.21.0.windows.1
Part of the diff is not shown here. View the raw message.
PATCH v8 15/21 net/txgbe: fix FEC mode configuration on 25G NIC
In reply to Zaiyu WangThe 25G NIC offers off, RS, Base-R, and auto FEC modes. When reconfiguring the PHY, the FEC mode must match on both sides; otherwise, the link cannot come up. The current driver fails to maintain this requirement, causing link instability.
Add proper FEC mode handling during PHY reconfiguration to guarantee link establishment.
--- drivers/net/txgbe/base/txgbe_aml.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/net/txgbe/base/txgbe_aml.c +12 -1
@@ -282,6 +282,14 @@ s32 txgbe_setup_phy_link_aml(struct txgbe_hw *hw, !(hw->fec_mode & hw->cur_fec_link))) goto out; +if (speed ==TXGBE_LINK_SPEED_25GB_FULL && + link_speed ==TXGBE_LINK_SPEED_25GB_FULL ) { +txgbe_e56_fec_polling (hw, &link_up); + +if (link_up) + goto out; + } +rte_spinlock_lock (&hw->phy_lock); ret_status =txgbe_set_link_to_amlite (hw, speed);rte_spinlock_unlock (&hw->phy_lock);
@@ -360,7 +368,10 @@ static s32 txgbe_setup_mac_link_multispeed_fiber_aml(struct txgbe_hw *hw,/* If we already have link at this speed, just jump out */ txgbe_e56_check_phy_link (hw, &link_speed, &link_up); -if (link_speed ==TXGBE_LINK_SPEED_25GB_FULL && link_up) + hw->cur_fec_link =txgbe_phy_fec_get (hw); + +if (link_speed ==TXGBE_LINK_SPEED_25GB_FULL && link_up && + hw->fec_mode & hw->cur_fec_link) goto out;/* Allow module to change analog characteristics (10G -> 25G) */
Signature · 1 line
2.21.0.windows.1
PATCH v8 16/21 net/txgbe: fix SFP module identification
In reply to Zaiyu WangSome optical modules were not correctly recognized due to ambiguous classification in the original detection flow. Rework the module identification logic to cover all module types. Also narrow the I2C lock scope to avoid potential race conditions during module access.
--- drivers/net/txgbe/base/txgbe_hw.c | 2 - drivers/net/txgbe/base/txgbe_phy.c | 341 ++++++++++------------------ drivers/net/txgbe/base/txgbe_phy.h | 18 +- drivers/net/txgbe/base/txgbe_type.h | 2 + 4 files changed, 134 insertions(+), 229 deletions(-)
drivers/net/txgbe/base/txgbe_hw.c +0 -2
@@ -2909,8 +2909,6 @@ s32 txgbe_init_ops_generic(struct txgbe_hw *hw) phy->read_i2c_eeprom = txgbe_read_i2c_eeprom; phy->write_i2c_eeprom = txgbe_write_i2c_eeprom; phy->identify_sfp = txgbe_identify_module; - phy->read_i2c_byte_unlocked = txgbe_read_i2c_byte_unlocked; - phy->write_i2c_byte_unlocked = txgbe_write_i2c_byte_unlocked; phy->check_overtemp = txgbe_check_overtemp; phy->reset = txgbe_reset_phy; phy->set_link_hostif = txgbe_hic_ephy_set_link;
drivers/net/txgbe/base/txgbe_phy.c +119 -222
471 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_phy.h +13 -5
@@ -261,7 +261,9 @@#define TXGBE_SFF_SFF_8472_COMP 0x5E#define TXGBE_SFF_SFF_8472_OSCB 0x6E#define TXGBE_SFF_SFF_8472_ESCB 0x76 +#define TXGBE_SFF_QSFP_PAGE_SELECT 0x7F +#define TXGBE_SFF_IDENTIFIER_QSFP 0x0C#define TXGBE_SFF_IDENTIFIER_QSFP_PLUS 0x0D#define TXGBE_SFF_QSFP_VENDOR_OUI_BYTE0 0xA5#define TXGBE_SFF_QSFP_VENDOR_OUI_BYTE1 0xA6
@@ -289,6 +291,9 @@#define TXGBE_SFF_4x10GBASESR_CAP 0x11#define TXGBE_SFF_40GBASEPSM4_PARALLEL 0x12#define TXGBE_SFF_40GBASE_SWMD4_CAP 0x1f +#define TXGBE_SFF_COPPER_5M 0x5 +#define TXGBE_SFF_COPPER_3M 0x3 +#define TXGBE_SFF_COPPER_1M 0x1#define TXGBE_SFF_DA_SPEC_ACTIVE_LIMITING 0x4#define TXGBE_SFF_25GAUI_C2M_AOC_BER_5 0x1
@@ -296,6 +301,11 @@#define TXGBE_SFF_25GAUI_C2M_AOC_BER_12 0x18#define TXGBE_SFF_25GAUI_C2M_ACC_BER_12 0x19 +#define TXGBE_ETHERNET_COMP_OFFSET 0x83 +#define TXGBE_SFF_ETHERNET_40G_CR4 MS(3, 0x1) +#define TXGBE_SFF_ETHERNET_40G_SR4 MS(2, 0x1) +#define TXGBE_SFF_ETHERNET_40G_LR4 MS(1, 0x1) +#define TXGBE_SFF_SOFT_RS_SELECT_MASK 0x8#define TXGBE_SFF_SOFT_RS_SELECT_10G 0x8#define TXGBE_SFF_SOFT_RS_SELECT_1G 0x0
@@ -493,14 +503,12 @@ s32 txgbe_identify_qsfp_module(struct txgbe_hw *hw);s32 txgbe_check_overtemp (struct txgbe_hw *hw);s32 txgbe_read_i2c_byte (struct txgbe_hw *hw,u8 byte_offset,u8 dev_addr,u8 *data); -s32 txgbe_read_i2c_byte_unlocked (struct txgbe_hw *hw,u8 byte_offset, -u8 dev_addr,u8 *data);s32 txgbe_write_i2c_byte (struct txgbe_hw *hw,u8 byte_offset,u8 dev_addr,u8 data); -s32 txgbe_write_i2c_byte_unlocked (struct txgbe_hw *hw,u8 byte_offset, -u8 dev_addr,u8 data);s32 txgbe_read_i2c_sff8472 (struct txgbe_hw *hw,u8 byte_offset, -u8 *sff8472_data); +u8 *sff8472_data); +s32 txgbe_read_i2c_sff8636 (struct txgbe_hw *hw,u8 page,u8 byte_offset, +u8 *sff8636_data);s32 txgbe_read_i2c_eeprom (struct txgbe_hw *hw,u8 byte_offset,u8 *eeprom_data); s32 txgbe_write_i2c_eeprom(struct txgbe_hw *hw, u8 byte_offset,
drivers/net/txgbe/base/txgbe_type.h +2 -0
@@ -702,6 +702,8 @@ struct txgbe_phy_info { u8 dev_addr, u8 data);s32 (*read_i2c_sff8472)(struct txgbe_hw *hw,u8 byte_offset,u8 *sff8472_data); +s32 (*read_i2c_sff8636)(struct txgbe_hw *hw,u8 page,u8 byte_offset, +u8 *sff8636_data);s32 (*read_i2c_eeprom)(struct txgbe_hw *hw,u8 byte_offset,u8 *eeprom_data); s32 (*write_i2c_eeprom)(struct txgbe_hw *hw, u8 byte_offset,
Signature · 1 line
2.21.0.windows.1
PATCH v8 17/21 net/txgbe: fix get module info operation
In reply to Zaiyu WangThe original I2C access flow in the module information retrieval process was flawed. Correct the implementation to properly fetch module info.
--- drivers/net/txgbe/base/txgbe_phy.h | 6 +- drivers/net/txgbe/txgbe_ethdev.c | 118 +++++++++++++++++++++++------ 2 files changed, 98 insertions(+), 26 deletions(-)
drivers/net/txgbe/base/txgbe_phy.h +5 -1
@@ -258,10 +258,14 @@#define TXGBE_SFF_CABLE_DA_ACTIVE 0x8#define TXGBE_SFF_CABLE_SPEC_COMP 0x3C#define TXGBE_SFF_SFF_8472_SWAP 0x5C +#define TXGBE_SFF_DDM_IMPLEMENTED 0x40#define TXGBE_SFF_SFF_8472_COMP 0x5E#define TXGBE_SFF_SFF_8472_OSCB 0x6E#define TXGBE_SFF_SFF_8472_ESCB 0x76 -#define TXGBE_SFF_QSFP_PAGE_SELECT 0x7F +#define TXGBE_SFF_SFF_REVISION_ADDR 0x01 +#define TXGBE_SFF_QSFP_PAGE_SELECT 0x7F + +#define TXGBE_MODULE_QSFP_MAX_LEN 640#define TXGBE_SFF_IDENTIFIER_QSFP 0x0C#define TXGBE_SFF_IDENTIFIER_QSFP_PLUS 0x0D
drivers/net/txgbe/txgbe_ethdev.c +93 -25
134 lines not on this page · raw message
Signature · 1 line
2.21.0.windows.1
PATCH v8 18/21 net/txgbe: fix get EEPROM operation
In reply to Zaiyu WangThe original I2C access flow in the module information retrieval process was flawed. Correct the implementation to properly fetch module info.
--- drivers/net/txgbe/base/txgbe_phy.h | 1 + drivers/net/txgbe/txgbe_ethdev.c | 81 +++++++++++++++++++++++++++--- 2 files changed, 76 insertions(+), 6 deletions(-)
drivers/net/txgbe/base/txgbe_phy.h +1 -0
@@ -245,6 +245,7 @@/* EEPROM (dev_addr = 0xA0) */ #define TXGBE_I2C_EEPROM_DEV_ADDR 0xA0#define TXGBE_SFF_IDENTIFIER 0x00 +#define TXGBE_SFF_8636_STATUS_OFFSET 0x02#define TXGBE_SFF_IDENTIFIER_SFP 0x03#define TXGBE_SFF_VENDOR_OUI_BYTE0 0x25#define TXGBE_SFF_VENDOR_OUI_BYTE1 0x26
drivers/net/txgbe/txgbe_ethdev.c +75 -6
98 lines not on this page · raw message
Signature · 1 line
2.21.0.windows.1
PATCH v8 19/21 net/txgbe: fix to reset Tx write-back pointer
In reply to Zaiyu WangThe write-back pointer was not reset when the Tx queue was reset. This leads to the wrong Tx desc free logic. Move the resetting of pointer into txq->ops->reset(txq).
--- drivers/net/txgbe/txgbe_rxtx.c | 45 +++++++++++++---------- drivers/net/txgbe/txgbe_rxtx.h | 1 + drivers/net/txgbe/txgbe_rxtx_vec_common.h | 7 ++++ 3 files changed, 33 insertions(+), 20 deletions(-)
drivers/net/txgbe/txgbe_rxtx.c +25 -20
@@ -2313,6 +2313,12 @@ txgbe_reset_tx_queue(struct txgbe_tx_queue *txq) txq->tx_next_dd = (uint16_t )(txq->tx_free_thresh -1 ); txq->tx_tail =0 ; +/* Zero out headwb_mem memory */ +if (txq->headwb_mem) { +for (i =0 ; i < txq->headwb_size; i++) + txq->headwb_mem[i] =0 ; + } +/* * Always allow 1 descriptor to be un-allocated to avoid * a H/W race condition
@@ -2412,7 +2418,7 @@ txgbe_get_tx_port_offloads(struct rte_eth_dev *dev)return tx_offload_capa; } -static int +static void txgbe_setup_headwb_resources (struct rte_eth_dev *dev,void *tx_queue,unsigned int socket_id)
@@ -2420,33 +2426,33 @@ txgbe_setup_headwb_resources(struct rte_eth_dev *dev,struct txgbe_hw *hw =TXGBE_DEV_HW (dev);const struct rte_memzone *headwb;struct txgbe_tx_queue *txq = tx_queue; -u8 i, headwb_size =0 ; +u8 headwb_size =0 ; -if (hw->mac.type != txgbe_mac_aml && hw->mac.type != txgbe_mac_aml40) { - txq->headwb_mem =NULL ; -return 0 ; - } +if (hw->mac.type != txgbe_mac_aml && hw->mac.type != txgbe_mac_aml40) + goto out; + +if (!hw->devarg.tx_headwb) + goto out; - headwb_size = hw->devarg.tx_headwb_size; + headwb_size = txq->headwb_size; headwb =rte_eth_dma_zone_reserve (dev,"tx_headwb_mem" , txq->queue_id,sizeof (u32) * headwb_size,TXGBE_ALIGN , socket_id);if (headwb ==NULL ) { -DEBUGOUT ("Fail to setup headwb resources: no mem" ); -txgbe_tx_queue_release (txq); -return -ENOMEM ; +PMD_DRV_LOG (INFO , +"Failed to allocate headwb memory for Tx queue %u, change to SP mode" , + txq->queue_id); + goto out; } txq->headwb = headwb; txq->headwb_dma =TMZ_PADDR (headwb); txq->headwb_mem = (uint32_t *)TMZ_VADDR (headwb); +return ; -/* Zero out headwb_mem memory */ -for (i =0 ; i < headwb_size; i++) - txq->headwb_mem[i] =0 ; - -return 0 ; +out: + txq->headwb_mem =NULL ; }int __rte_cold
@@ -2542,6 +2548,7 @@ txgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, txq->offloads = offloads; txq->ops = &def_txq_ops; txq->tx_deferred_start = tx_conf->tx_deferred_start; + txq->headwb_size = hw->devarg.tx_headwb_size;#ifdef RTE_LIB_SECURITY txq->using_ipsec = !!(dev->data->dev_conf.txmode.offloads &RTE_ETH_TX_OFFLOAD_SECURITY );
@@ -2577,8 +2584,7 @@ txgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,/* set up scalar TX function as appropriate */ txgbe_set_tx_function (dev, txq); -if (hw->devarg.tx_headwb) - err =txgbe_setup_headwb_resources (dev, txq, socket_id); +txgbe_setup_headwb_resources (dev, txq, socket_id); txq->ops->reset (txq); txq->desc_error =0 ;
@@ -4755,15 +4761,14 @@ txgbe_dev_tx_init(struct rte_eth_dev *dev)wr32 (hw,TXGBE_TXRP (txq->reg_idx),0 );wr32 (hw,TXGBE_TXWP (txq->reg_idx),0 ); -if ((hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) && - hw->devarg.tx_headwb) { +if (txq->headwb_mem) {uint32_t txdctl;wr32 (hw,TXGBE_PX_TR_HEAD_ADDRL (txq->reg_idx), (uint32_t )(txq->headwb_dma &BIT_MASK32 ));wr32 (hw,TXGBE_PX_TR_HEAD_ADDRH (txq->reg_idx), (uint32_t )(txq->headwb_dma >>32 )); -if (hw->devarg.tx_headwb_size ==16 ) +if (txq->headwb_size ==16 ) txdctl =TXGBE_PX_TR_CFG_HEAD_WB |TXGBE_PX_TR_CFG_HEAD_WB_64BYTE ;else
drivers/net/txgbe/txgbe_rxtx.h +1 -0
@@ -416,6 +416,7 @@ struct txgbe_tx_queue {uint64_t desc_error;bool resetting;const struct rte_memzone *headwb; +uint16_t headwb_size;uint64_t headwb_dma;volatile uint32_t *headwb_mem; };
drivers/net/txgbe/txgbe_rxtx_vec_common.h +7 -0
@@ -252,6 +252,13 @@ _txgbe_reset_tx_queue_vec(struct txgbe_tx_queue *txq) txq->tx_next_dd = (uint16_t )(txq->tx_free_thresh -1 ); txq->tx_tail =0 ; + +/* Zero out headwb_mem memory */ +if (txq->headwb_mem) { +for (i =0 ; i < txq->headwb_size; i++) + txq->headwb_mem[i] =0 ; + } +/* * Always allow 1 descriptor to be un-allocated to avoid * a H/W race condition
Signature · 1 line
2.21.0.windows.1
PATCH v8 20/21 net/txgbe: fix to enable Tx desc check
In reply to Zaiyu WangNow lib security is enabled by default, and cannot be disabled if the driver is intended to be used. So Tdm_desc_chk is always unable to enable. Remove this restriction, and just enable the corresponding queue check.
--- drivers/net/txgbe/txgbe_rxtx.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/net/txgbe/txgbe_rxtx.c +6 -5
@@ -4761,6 +4761,12 @@ txgbe_dev_tx_init(struct rte_eth_dev *dev)wr32 (hw,TXGBE_TXRP (txq->reg_idx),0 );wr32 (hw,TXGBE_TXWP (txq->reg_idx),0 ); +#ifdef RTE_LIB_SECURITY + if (!txq->using_ipsec) +#endif +wr32m (hw,TXGBE_TDM_DESC_CHK (txq->reg_idx /32 ), +RTE_BIT32 (txq->reg_idx %32 ),RTE_BIT32 (txq->reg_idx %32 )); +if (txq->headwb_mem) {uint32_t txdctl;
@@ -4778,11 +4784,6 @@ txgbe_dev_tx_init(struct rte_eth_dev *dev) } } -#ifndef RTE_LIB_SECURITY -for (i =0 ; i <4 ; i++) -wr32 (hw,TXGBE_TDM_DESC_CHK (i),0xFFFFFFFF ); -#endif -/* Device configured with multiple TX queues. */ txgbe_dev_mq_tx_configure (dev); }
Signature · 1 line
2.21.0.windows.1
PATCH v8 21/21 net/txgbe: fix temperature track for AML NIC
In reply to Zaiyu WangPreviously, temperature tracking for the amlite NIC was handled by firmware together with the hardware setup. However, the firmware-based PHY configuration has proven to be unstable.
Re-add the temperature tracking function directly in the driver and invoke it periodically to ensure the PHY remains calibrated. According to the hardware recommendation, the tracking sequence should be run at least every 100 ms to keep temperature drift within 5 °C. Considering the software and hardware overhead, a 2-second interval is used as a practical trade-off that still meets stability requirements while minimizing performance impact.
The periodic tracking is implemented using a timer in the driver, and the sequence itself is the same as the one originally performed during link setup.
--- drivers/net/txgbe/txgbe_ethdev.c | 44 +++++++++++++++++++++++++++++++- drivers/net/txgbe/txgbe_ethdev.h | 1 + 2 files changed, 44 insertions(+), 1 deletion(-)
drivers/net/txgbe/txgbe_ethdev.c +43 -1
@@ -2011,8 +2011,10 @@ txgbe_dev_start(struct rte_eth_dev *dev)txgbe_filter_restore (dev); hw->bp_event_interval =100 *1000 ; -if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) +if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) {rte_eal_alarm_set (hw->bp_event_interval, txgbe_dev_e56_check_bp_event, dev); +rte_eal_alarm_set (1000 *1000 *2 , txgbe_dev_check_aml_temp_event, dev); + }if (tm_conf->root && !tm_conf->committed) PMD_DRV_LOG(WARNING,
@@ -2060,6 +2062,7 @@ txgbe_dev_stop(struct rte_eth_dev *dev)if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) {rte_eal_alarm_cancel (txgbe_dev_e56_check_bp_event, dev); +rte_eal_alarm_cancel (txgbe_dev_check_aml_temp_event, dev);rte_eal_alarm_cancel (txgbe_dev_setup_link_alarm_handler_aml, hw); }
@@ -2932,6 +2935,45 @@ txgbe_dev_supported_ptypes_get(struct rte_eth_dev *dev, size_t *no_of_elements)return NULL ; } +void txgbe_dev_check_aml_temp_event (void *param) +{ +struct rte_eth_dev *dev = (struct rte_eth_dev *)param; +struct txgbe_hw *hw =TXGBE_DEV_HW (dev); +uint32_t link_speed =0 , val =0 ; +s32 status =0 ; +int temp; + +if (hw ==NULL ) +return ; + + status =txgbe_e56_get_temp (hw, &temp); +if (status) + temp =DEFAULT_TEMP ; + +if (!(temp - hw->temperature >4 || + hw->temperature - temp >4 )) + goto out; + + hw->temperature = temp; + val =rd32 (hw,TXGBE_PORT ); +if (val &TXGBE_AMLITE_LED_LINK_40G ) + link_speed =TXGBE_LINK_SPEED_40GB_FULL ; +else if (val &TXGBE_AMLITE_LED_LINK_25G ) + link_speed =TXGBE_LINK_SPEED_25GB_FULL ; +else + link_speed =TXGBE_LINK_SPEED_10GB_FULL ; + +rte_spinlock_lock (&hw->phy_lock); +if (hw->mac.type == txgbe_mac_aml) +txgbe_temp_track_seq (hw, link_speed); +else if (hw->mac.type == txgbe_mac_aml40) +txgbe_temp_track_seq_40g (hw, link_speed); +rte_spinlock_unlock (&hw->phy_lock); + +out: +rte_eal_alarm_set (1000 *1000 *2 , txgbe_dev_check_aml_temp_event, dev); +} +void txgbe_dev_e56_check_bp_event (void *param) {struct rte_eth_dev *dev = (struct rte_eth_dev *)param;
drivers/net/txgbe/txgbe_ethdev.h +1 -0
@@ -747,5 +747,6 @@ void txgbe_vlan_hw_strip_bitmap_set(struct rte_eth_dev *dev, uint16_t queue, bool on);void txgbe_config_vlan_strip_on_all_queues (struct rte_eth_dev *dev,int mask); +void txgbe_dev_check_aml_temp_event (void *param);void txgbe_dev_e56_check_bp_event (void *param);#endif /* _TXGBE_ETHDEV_H_ */
Signature · 1 line
2.21.0.windows.1
Quoted 71 lines · On Wed, 17 Jun 2026 16:12:47 +0800 Zaiyu Wang <[email protected]> wrote:
This series fixes several issues found on Wangxun Emerald, Sapphire and Amber-lite NICs, with a focus on link-related problems.
---
v8:
- Fixed compilation error by replacingRTE_ETH_DEV_TO_PCIwithRTE_CLASS_TO_BUS_DEVICE
---
v7:
- Fixed inverted semantics ofis_flat_memto match SFF8636
---
v6:
- Fixed more issues identified by AI review
---
v5:
- Fixed issues identified by AI review
---
v4:
- Fixed issues identified by devtools scripts
---
v3:
- Addressed Stephen's comments
---
v2:
- Fixed compilation error and code style issues
---Zaiyu Wang (21):
net/txgbe: remove duplicate xstats counters net/ngbe: remove duplicate xstats counters net/ngbe: add missing CDR config for YT PHY net/ngbe: fix VF promiscuous and allmulticast net/txgbe: fix inaccuracy in Tx rate limiting net/txgbe: fix link status check condition net/txgbe: fix Tx desc free logic
net/txgbe: fix link flow control registers for Amber-Lite net/txgbe: fix link flow control config for Sapphire net/txgbe: fix a mass of unknown interrupts net/txgbe: fix traffic class priority configuration net/txgbe: fix link stability for 25G NIC net/txgbe: fix link stability for 40G NIC net/txgbe: fix link stability for Amber-Lite backplane mode net/txgbe: fix FEC mode configuration on 25G NIC net/txgbe: fix SFP module identification net/txgbe: fix get module info operation net/txgbe: fix get EEPROM operation
net/txgbe: fix to reset Tx write-back pointer net/txgbe: fix to enable Tx desc check
net/txgbe: fix temperature track for AML NICdrivers/net/ngbe/base/ngbe_phy_yt.c | 3 + drivers/net/ngbe/ngbe_ethdev.c | 5 - drivers/net/ngbe/ngbe_ethdev_vf.c | 11 +- drivers/net/txgbe/base/meson.build | 2 + drivers/net/txgbe/base/txgbe.h | 2 + drivers/net/txgbe/base/txgbe_aml.c | 185 +- drivers/net/txgbe/base/txgbe_aml.h | 6 +- drivers/net/txgbe/base/txgbe_aml40.c | 114 +- drivers/net/txgbe/base/txgbe_aml40.h | 6 +- drivers/net/txgbe/base/txgbe_dcb_hw.c | 2 +- drivers/net/txgbe/base/txgbe_e56.c | 3773 +++++++++++++++++++++ drivers/net/txgbe/base/txgbe_e56.h | 1753 ++++++++++ drivers/net/txgbe/base/txgbe_e56_bp.c | 2597 ++++++++++++++ drivers/net/txgbe/base/txgbe_e56_bp.h | 282 ++ drivers/net/txgbe/base/txgbe_hw.c | 54 +- drivers/net/txgbe/base/txgbe_hw.h | 4 +- drivers/net/txgbe/base/txgbe_osdep.h | 4 + drivers/net/txgbe/base/txgbe_phy.c | 362 +- drivers/net/txgbe/base/txgbe_phy.h | 46 +- drivers/net/txgbe/base/txgbe_regs.h | 13 +- drivers/net/txgbe/base/txgbe_type.h | 43 +- drivers/net/txgbe/txgbe_ethdev.c | 472 ++- drivers/net/txgbe/txgbe_ethdev.h | 7 +-
Quoted 9 lines
drivers/net/txgbe/txgbe_rxtx.c | 109 +- drivers/net/txgbe/txgbe_rxtx.h | 36 + drivers/net/txgbe/txgbe_rxtx_vec_common.h | 17 +- 26 files changed, 9464 insertions(+), 444 deletions(-) create mode 100644 drivers/net/txgbe/base/txgbe_e56.c create mode 100644 drivers/net/txgbe/base/txgbe_e56.h create mode 100644 drivers/net/txgbe/base/txgbe_e56_bp.c create mode 100644 drivers/net/txgbe/base/txgbe_e56_bp.h
Please fix several checkpatch errors and resubmit.
Although this is a false positive:
WARNING:TYPO_SPELLING: 'tread' may be misspelled - perhaps 'thread'? #2647: FILE: drivers/net/txgbe/base/txgbe_e56_bp.c:2303:
+ BP_LOG("\tread 7001b data %0x\n", rd32_epcs(hw, 0x7001b));
It is still a bad idea to put control characters like tab in the log. The log is often going via syslog/journal on production systems and tabs don't do what you expect there.
v9 cover Wangxun Fixes
In reply to Zaiyu WangThis series fixes several issues found on Wangxun Emerald, Sapphire and Amber-lite NICs, with a focus on link-related problems.
---
v9:
- Fixed several checkpatch errors
---
v8:
- Fixed compilation error by replacing RTE_ETH_DEV_TO_PCI with RTE_CLASS_TO_BUS_DEVICE
---
v7:
- Fixed inverted semantics of is_flat_mem to match SFF8636
---
v6:
- Fixed more issues identified by AI review
---
v5:
- Fixed issues identified by AI review
---
v4:
- Fixed issues identified by devtools scripts
---
v3:
- Addressed Stephen's comments
---
v2:
- Fixed compilation error and code style issues
---
Zaiyu Wang (21):
net/txgbe: remove duplicate xstats counters net/ngbe: remove duplicate xstats counters net/ngbe: add missing CDR config for YT PHY net/ngbe: fix VF promiscuous and allmulticast net/txgbe: fix inaccuracy in Tx rate limiting net/txgbe: fix link status check condition net/txgbe: fix Tx desc free logic
net/txgbe: fix link flow control registers for Amber-Lite net/txgbe: fix link flow control config for Sapphire net/txgbe: fix a mass of unknown interrupts net/txgbe: fix traffic class priority configuration net/txgbe: fix link stability for 25G NIC net/txgbe: fix link stability for 40G NIC net/txgbe: fix link stability for Amber-Lite backplane mode net/txgbe: fix FEC mode configuration on 25G NIC net/txgbe: fix SFP module identification net/txgbe: fix get module info operation net/txgbe: fix get EEPROM operation
net/txgbe: fix to reset Tx write-back pointer net/txgbe: fix to enable Tx desc check
net/txgbe: fix temperature track for AML NIC
drivers/net/ngbe/base/ngbe_phy_yt.c | 3 + drivers/net/ngbe/ngbe_ethdev.c | 5 - drivers/net/ngbe/ngbe_ethdev_vf.c | 11 +- drivers/net/txgbe/base/meson.build | 2 + drivers/net/txgbe/base/txgbe.h | 2 + drivers/net/txgbe/base/txgbe_aml.c | 185 +- drivers/net/txgbe/base/txgbe_aml.h | 6 +- drivers/net/txgbe/base/txgbe_aml40.c | 114 +- drivers/net/txgbe/base/txgbe_aml40.h | 6 +- drivers/net/txgbe/base/txgbe_dcb_hw.c | 2 +- drivers/net/txgbe/base/txgbe_e56.c | 3773 +++++++++++++++++++++ drivers/net/txgbe/base/txgbe_e56.h | 1753 ++++++++++ drivers/net/txgbe/base/txgbe_e56_bp.c | 2597 ++++++++++++++ drivers/net/txgbe/base/txgbe_e56_bp.h | 282 ++ drivers/net/txgbe/base/txgbe_hw.c | 54 +- drivers/net/txgbe/base/txgbe_hw.h | 4 +- drivers/net/txgbe/base/txgbe_osdep.h | 4 + drivers/net/txgbe/base/txgbe_phy.c | 362 +- drivers/net/txgbe/base/txgbe_phy.h | 46 +- drivers/net/txgbe/base/txgbe_regs.h | 13 +- drivers/net/txgbe/base/txgbe_type.h | 43 +- drivers/net/txgbe/txgbe_ethdev.c | 472 ++- drivers/net/txgbe/txgbe_ethdev.h | 7 +- drivers/net/txgbe/txgbe_rxtx.c | 109 +- drivers/net/txgbe/txgbe_rxtx.h | 36 + drivers/net/txgbe/txgbe_rxtx_vec_common.h | 17 +- 26 files changed, 9464 insertions(+), 444 deletions(-) create mode 100644 drivers/net/txgbe/base/txgbe_e56.c create mode 100644 drivers/net/txgbe/base/txgbe_e56.h create mode 100644 drivers/net/txgbe/base/txgbe_e56_bp.c create mode 100644 drivers/net/txgbe/base/txgbe_e56_bp.h
Signature · 1 line
2.21.0.windows.1
PATCH v9 1/21 net/txgbe: remove duplicate xstats counters
Remove four redundant counters (tx_xon_packets, rx_xon_packets, tx_xoff_packets and rx_xoff_packets) from xstats, as they were duplicates of tx_flow_control_xon_packets and others. Both sets were reading the same registers but being output twice under different names. After removing these entries, the flow control counters in DPDK now align with those in our Linux kernel driver.
--- drivers/net/txgbe/txgbe_ethdev.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/net/txgbe/txgbe_ethdev.c +0 -5
@@ -261,11 +261,6 @@ static const struct rte_txgbe_xstats_name_off rte_txgbe_stats_strings[] = {HW_XSTAT (tx_size_1024_to_max_packets),/* Flow Control */ -HW_XSTAT (tx_xon_packets), -HW_XSTAT (rx_xon_packets), -HW_XSTAT (tx_xoff_packets), -HW_XSTAT (rx_xoff_packets), -HW_XSTAT_NAME (tx_xon_packets,"tx_flow_control_xon_packets" ),HW_XSTAT_NAME (rx_xon_packets,"rx_flow_control_xon_packets" ), HW_XSTAT_NAME(tx_xoff_packets, "tx_flow_control_xoff_packets"),
Signature · 1 line
2.21.0.windows.1
PATCH v9 2/21 net/ngbe: remove duplicate xstats counters
In reply to Zaiyu WangRemove four redundant counters (tx_xon_packets, rx_xon_packets, tx_xoff_packets and rx_xoff_packets) from xstats, as they were duplicates of tx_flow_control_xon_packets and others. Both sets were reading the same registers but being output twice under different names. After removing these entries, the flow control counters in DPDK now align with those in our Linux kernel driver.
--- drivers/net/ngbe/ngbe_ethdev.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/net/ngbe/ngbe_ethdev.c +0 -5
@@ -227,11 +227,6 @@ static const struct rte_ngbe_xstats_name_off rte_ngbe_stats_strings[] = {HW_XSTAT (tx_size_1024_to_max_packets),/* Flow Control */ -HW_XSTAT (tx_xon_packets), -HW_XSTAT (rx_xon_packets), -HW_XSTAT (tx_xoff_packets), -HW_XSTAT (rx_xoff_packets), -HW_XSTAT_NAME (tx_xon_packets,"tx_flow_control_xon_packets" ),HW_XSTAT_NAME (rx_xon_packets,"rx_flow_control_xon_packets" ), HW_XSTAT_NAME(tx_xoff_packets, "tx_flow_control_xoff_packets"),
Signature · 1 line
2.21.0.windows.1
PATCH v9 3/21 net/ngbe: add missing CDR config for YT PHY
In reply to Zaiyu WangAccording to the PHY vendor, when YT8531S operates in UTP-to-Fiber or RGMII-to-Fiber mode with auto-negotiation disabled (Force mode), additional CDR (Clock Data Recovery) configuration is required to improve link connectivity. Without this config, link may be unstable or fail to establish.
--- drivers/net/ngbe/base/ngbe_phy_yt.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ngbe/base/ngbe_phy_yt.c +3 -0
@@ -264,6 +264,9 @@ s32 ngbe_setup_phy_link_yt(struct ngbe_hw *hw, u32 speed, value =YT_BCR_RESET |YT_BCR_ANE |YT_BCR_RESTART_AN |YT_BCR_DUPLEX |YT_BCR_SPEED_SELECT1 ; }else { +/* force mode need to config cdr */ +ngbe_write_phy_reg_sds_ext_yt (hw,0x3 ,0 ,0x1434 ); +ngbe_write_phy_reg_sds_ext_yt (hw,0xe ,0 ,0x163 ); value =YT_BCR_RESET |YT_BCR_DUPLEX ;if (speed &NGBE_LINK_SPEED_1GB_FULL ) value |=YT_BCR_SPEED_SELECT1 ;
Signature · 1 line
2.21.0.windows.1
PATCH v9 4/21 net/ngbe: fix VF promiscuous and allmulticast
In reply to Zaiyu WangThe configuration of allmulti and promiscuous modes conflicts together. For instance, if we enable promiscuous mode, then enable and disable allmulti, then the promiscuous mode is wrongly disabled.
To resolve this, the following changes are made:
- do nothing when we set/unset allmulti if promiscuous mode is on
- restore the proper mode (none or allmulti) when we disable promiscuous mode
--- drivers/net/ngbe/ngbe_ethdev_vf.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/net/ngbe/ngbe_ethdev_vf.c +9 -2
@@ -1196,9 +1196,13 @@ static int ngbevf_dev_promiscuous_disable(struct rte_eth_dev *dev) {struct ngbe_hw *hw =ngbe_dev_hw (dev); +int mode =NGBEVF_XCAST_MODE_NONE ;int ret; -switch (hw->mac.update_xcast_mode (hw,NGBEVF_XCAST_MODE_NONE )) { +if (dev->data->all_multicast) + mode =NGBEVF_XCAST_MODE_ALLMULTI ; + +switch (hw->mac.update_xcast_mode (hw, mode)) {case 0 : ret =0 ;break ;
@@ -1219,7 +1223,7 @@ ngbevf_dev_allmulticast_enable(struct rte_eth_dev *dev)struct ngbe_hw *hw =ngbe_dev_hw (dev);int ret; -if (dev->data->promiscuous ==1 ) +if (dev->data->promiscuous)return 0 ;switch (hw->mac.update_xcast_mode (hw,NGBEVF_XCAST_MODE_ALLMULTI )) {
@@ -1243,6 +1247,9 @@ ngbevf_dev_allmulticast_disable(struct rte_eth_dev *dev)struct ngbe_hw *hw =ngbe_dev_hw (dev);int ret; +if (dev->data->promiscuous) +return 0 ; +switch (hw->mac.update_xcast_mode (hw,NGBEVF_XCAST_MODE_MULTI )) {case 0 : ret =0 ;
Signature · 1 line
2.21.0.windows.1
PATCH v9 5/21 net/txgbe: fix inaccuracy in Tx rate limiting
In reply to Zaiyu WangAmber-lite NIC's TX rate limiting has large deviations for small packets. To address this, the following changes are made:
1. Set TDM_RL_ADJ (0x1820c) to 21B (includes 7B Ethernet preamble, 1B SFD, 1B EFD, and 12B IPG).
2) Remove the rate offset in the driver (e.g., 105 / 100, a rough compensation value from Linux kernel driver tests).
After these changes, accuracy deviation for 64B packets is within ~5%, while large packets show lower deviation.
--- drivers/net/txgbe/base/txgbe_regs.h | 3 +++ drivers/net/txgbe/txgbe_ethdev.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)
drivers/net/txgbe/base/txgbe_regs.h +3 -0
@@ -1670,6 +1670,9 @@ enum txgbe_5tuple_protocol {#define TXGBE_TDM_FACTOR_INT_SHIFT 16#define TXGBE_TDM_FACTOR_FRA_SHIFT 2 +#define TXGBE_TDM_RL_ADJ 0x1820C +/* Ethernet framing overhead: 7B Ethernet preamble + 1B SFD + 1B EFD + 12B IPG */ +#define TXGBE_FRAME_OVERHEAD 21#define TXGBE_TDM_RL_VM_IDX 0x018218#define TXGBE_TDM_RL_VM_CFG 0x01821C#define TXGBE_TDM_RL_CFG 0x018400
drivers/net/txgbe/txgbe_ethdev.c +1 -1
@@ -4314,7 +4314,6 @@ txgbe_set_queue_rate_limit(struct rte_eth_dev *dev,u16 frac; link_speed = dev->data->dev_link.link_speed; - tx_rate = tx_rate *105 /100 ;/* Calculate the rate factor values to set */ factor_int = link_speed / tx_rate; frac = (link_speed % tx_rate) *10000 / tx_rate;
@@ -4324,6 +4323,7 @@ txgbe_set_queue_rate_limit(struct rte_eth_dev *dev, factor_fra =0 ; } +wr32 (hw,TXGBE_TDM_RL_ADJ ,TXGBE_FRAME_OVERHEAD );wr32 (hw,TXGBE_TDM_RL_QUEUE_IDX , queue_idx);wr32m (hw,TXGBE_TDM_RL_QUEUE_CFG ,TXGBE_TDM_FACTOR_INT_MASK , factor_int <<TXGBE_TDM_FACTOR_INT_SHIFT );
Signature · 1 line
2.21.0.windows.1
PATCH v9 6/21 net/txgbe: fix link status check condition
In reply to Zaiyu WangThe original code incorrectly used 'if (link_up)' instead of 'if (*link_up)', causing the condition to always evaluate to true because the pointer itself is non-NULL. This led to incorrect speed assignment.
--- drivers/net/txgbe/base/txgbe_aml.c | 2 +- drivers/net/txgbe/base/txgbe_aml40.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/txgbe/base/txgbe_aml.c +1 -1
@@ -67,7 +67,7 @@ s32 txgbe_check_mac_link_aml(struct txgbe_hw *hw, u32 *speed, *link_up = false; } -if (link_up) { +if (*link_up) {switch (links_reg &TXGBE_CFG_PORT_ST_AML_LINK_MASK ) {case TXGBE_CFG_PORT_ST_AML_LINK_25G : *speed =TXGBE_LINK_SPEED_25GB_FULL ;
drivers/net/txgbe/base/txgbe_aml40.c +1 -1
@@ -68,7 +68,7 @@ s32 txgbe_check_mac_link_aml40(struct txgbe_hw *hw, u32 *speed, *link_up = false; } -if (link_up) { +if (*link_up) {if ((links_reg &TXGBE_CFG_PORT_ST_AML_LINK_40G ) ==TXGBE_CFG_PORT_ST_AML_LINK_40G ) *speed =TXGBE_LINK_SPEED_40GB_FULL ;
Signature · 1 line
2.21.0.windows.1
PATCH v9 7/21 net/txgbe: fix Tx desc free logic
In reply to Zaiyu WangOn some server environments, this driver caused TDM non-fatal errors or PCIe request errors during Tx operation
In Amber-Lite NIC's Tx head write-back mode, the hardware periodically writes back a head index pointing to the next descriptor it is adout to process in Tx ring. All descriptors before the head are considered processed by hardware and can be safely freed by the driver.
The root cause is that the driver can safely free a batch of descriptors only when the hardware's write-back head pointer has advanced beyond all descriptors in that batch, meaning they have all been processed by the hardware. If the driver frees a descriptor before the hardware has finished processing it, invalid memory access may occur, leading to the observed bug.
To fix the issue, correct the boundary check in all three Tx cleanup functions, each of which was missing the proper condition to prevent freeing unprocessed descriptors.
--- drivers/net/txgbe/txgbe_rxtx.c | 16 +++++------ drivers/net/txgbe/txgbe_rxtx.h | 35 +++++++++++++++++++++++ drivers/net/txgbe/txgbe_rxtx_vec_common.h | 10 +++---- 3 files changed, 48 insertions(+), 13 deletions(-)
drivers/net/txgbe/txgbe_rxtx.c +8 -8
@@ -98,12 +98,11 @@ txgbe_tx_free_bufs(struct txgbe_tx_queue *txq)if (tx_last_dd >= txq->nb_tx_desc) tx_last_dd -= txq->nb_tx_desc; -volatile uint16_t head = (uint16_t )*txq->headwb_mem; +uint32_t h =rte_atomic_load_explicit (txq->headwb_mem, + rte_memory_order_acquire); +const uint16_t head = (uint16_t )h; -if (txq->tx_next_dd > head && head > tx_last_dd) -return 0 ; -else if (tx_last_dd > txq->tx_next_dd && - (head > tx_last_dd || head < txq->tx_next_dd)) +if (!txgbe_tx_headwb_desc_done (head, tx_last_dd, txq->tx_next_dd))return 0 ; }else {/* check DD bit on threshold descriptor */
@@ -645,12 +644,13 @@ txgbe_xmit_cleanup(struct txgbe_tx_queue *txq) status = txr[desc_to_clean_to].dw3;if (txq->headwb_mem) { -u32 head = *txq->headwb_mem; +uint32_t h =rte_atomic_load_explicit (txq->headwb_mem, + rte_memory_order_acquire); +const uint16_t head = (uint16_t )h;PMD_TX_FREE_LOG (DEBUG ,"queue[%02d]: headwb_mem = %03d, desc_to_clean_to = %03d" , txq->reg_idx, head, desc_to_clean_to); -/* we have caught up to head, no work left to do */ -if (desc_to_clean_to == head) +if (!txgbe_tx_headwb_desc_done (head, last_desc_cleaned, desc_to_clean_to))return -(1 ); }else {if (!(status &rte_cpu_to_le_32 (TXGBE_TXD_DD ))) {
drivers/net/txgbe/txgbe_rxtx.h +35 -0
@@ -426,6 +426,41 @@ struct txgbe_txq_ops {void (*reset)(struct txgbe_tx_queue *txq); }; +/** +* Check whether Tx descriptors in the range (last, next] are done +* in Tx head write-back mode. +* +* In head write-back mode, the hardware periodically updates *headwb_mem +* with the index of the next descriptor it will process. +* All descriptors before the head are considered processed by hardware and can +* be safely freed. The descriptor pointed to by head itself is not yet processed. +* +* @param head +* Current hardware head index read from headwb_mem. +* @param last +* The highest-index descriptor cleaned in the previous round +* (exclusive: descriptors at or before this index are already freed). +* @param next +* The highest-index descriptor to be cleaned in this round +* (inclusive: this descriptor is the target of the current cleanup). +* @return +* true if all descriptors in the range (last, next] have been completed +* by hardware and can be freed, false otherwise. +*/ +static inline bool +txgbe_tx_headwb_desc_done (uint16_t head,uint16_t last,uint16_t next) +{ +if (next == head) +return false; +else if (next > head && head > last) +return false; +/* wrap case */ +else if (last > next && (head > last || head < next)) +return false; + +return true; +} +/* Takes an ethdev and a queue and sets up the tx function to be used based on * the queue parameters. Used in tx_queue_setup by primary process and then * in dev_init by secondary process when attaching to an existing ethdev.
drivers/net/txgbe/txgbe_rxtx_vec_common.h +5 -5
@@ -94,11 +94,11 @@ txgbe_tx_free_bufs(struct txgbe_tx_queue *txq) txq->tx_next_dd - txq->tx_free_thresh;if (tx_last_dd >= txq->nb_tx_desc) tx_last_dd -= txq->nb_tx_desc; -volatile uint16_t head = (uint16_t )*txq->headwb_mem; -if (txq->tx_next_dd > head && head > tx_last_dd) -return 0 ; -else if (tx_last_dd > txq->tx_next_dd && - (head > tx_last_dd || head < txq->tx_next_dd)) +uint32_t h =rte_atomic_load_explicit (txq->headwb_mem, + rte_memory_order_acquire); +const uint16_t head = (uint16_t )h; + +if (!txgbe_tx_headwb_desc_done (head, tx_last_dd, txq->tx_next_dd))return 0 ; }else {/* check DD bit on threshold descriptor */
Signature · 1 line
2.21.0.windows.1
Re: [PATCH v9 07/21] net/txgbe: fix Tx desc free logic
drivers/net/txgbe/txgbe_rxtx.c txgbe_tx_free_bufs(struct txgbe_tx_queue *txq) · line 102
Quoted 11 lines · On Mon, 22 Jun 2026 19:10:55 +0800 Zaiyu Wang <[email protected]> wrote:
drivers/net/txgbe/txgbe_rxtx.c +2
-1@@ -98,12 +98,11 @@ txgbe_tx_free_bufs(struct txgbe_tx_queue *txq)if (tx_last_dd >= txq->nb_tx_desc) tx_last_dd -= txq->nb_tx_desc; -volatile uint16_t head = (uint16_t )*txq->headwb_mem; +uint32_t h =rte_atomic_load_explicit (txq->headwb_mem, + rte_memory_order_acquire);
This will fail build on clang since txq->headwb_mem is declared as volatile not _Atomic type.
Please fix, and resubmit both patch series.
Re: [PATCH v9 07/21] net/txgbe: fix Tx desc free logic
In reply to Zaiyu Wangdrivers/net/txgbe/txgbe_rxtx.c txgbe_tx_free_bufs(struct txgbe_tx_queue *txq) · line 102
Quoted 11 lines · On Mon, 22 Jun 2026 19:10:55 +0800 Zaiyu Wang <[email protected]> wrote:
drivers/net/txgbe/txgbe_rxtx.c +2
-1@@ -98,12 +98,11 @@ txgbe_tx_free_bufs(struct txgbe_tx_queue *txq)if (tx_last_dd >= txq->nb_tx_desc) tx_last_dd -= txq->nb_tx_desc; -volatile uint16_t head = (uint16_t )*txq->headwb_mem; +uint32_t h =rte_atomic_load_explicit (txq->headwb_mem, + rte_memory_order_acquire);
This will fail build on clang since txq->headwb_mem is declared as volatile not _Atomic type.
Please fix, and resubmit both patch series.
$ CC=clang-21 meson setup build -Denable_stdatomic=true
$ ninja -C build
../drivers/net/txgbe/txgbe_rxtx.c:101:16: error: address argument to atomic operation must be a pointer to _Atomic type ('volatile uint32_t *' (aka 'volatile unsigned int *') invalid)
101 | uint32_t h = rte_atomic_load_explicit(txq->headwb_mem,
| ^ ~~~~~~~~~~~~~~~
../lib/eal/include/rte_stdatomic.h:69:2: note: expanded from macro 'rte_atomic_load_explicit'
69 | atomic_load_explicit(ptr, memorder)
| ^ ~~~
/usr/lib/llvm-21/lib/clang/21/include/stdatomic.h:145:30: note: expanded from macro 'atomic_load_explicit'
145 | #define atomic_load_explicit __c11_atomic_load
| ^
../drivers/net/txgbe/txgbe_rxtx.c:647:16: error: address argument to atomic operation must be a pointer to _Atomic type ('volatile uint32_t *' (aka 'volatile unsigned int *') invalid)
647 | uint32_t h = rte_atomic_load_explicit(txq->headwb_mem,
| ^ ~~~~~~~~~~~~~~~
../lib/eal/include/rte_stdatomic.h:69:2: note: expanded from macro 'rte_atomic_load_explicit'
69 | atomic_load_explicit(ptr, memorder)
| ^ ~~~
/usr/lib/llvm-21/lib/clang/21/include/stdatomic.h:145:30: note: expanded from macro 'atomic_load_explicit'
145 | #define atomic_load_explicit __c11_atomic_load
| ^
2 errors generated.RE: [PATCH v9 07/21] net/txgbe: fix Tx desc free logic
Quoted 2 lines
This will fail build on clang since
txq->headwb_memis declared as volatile not_Atomic
type.
Quoted 2 lines
Please fix, and resubmit both patch series.
Hi Stephen,
Thank you for pointing this out. I apologize for the oversight - I failed to pay proper attention to the failure from ci/github-robot: build, and mistakenly focused only on the ci/Intel-compilation and others.
This error has been fixed in v10. Additionally, the unprefixed symbols that did not meet the naming conventions have been renamed with the txgbe_ prefix.
Our other patch series will be resubmitted later. The code for VF sensing PF down differs from our OOT driver, and its functionality requires further validation before submission.
PATCH v9 8/21 net/txgbe: fix link flow control registers for Amber-Lite
In reply to Zaiyu WangThe flow control counter registers on AML NICs differ from those on SP NICs. Update the register offsets accordingly to ensure the counters work correctly.
--- drivers/net/txgbe/base/txgbe_hw.c | 7 ++++++ drivers/net/txgbe/base/txgbe_regs.h | 2 ++ drivers/net/txgbe/base/txgbe_type.h | 4 ++++ drivers/net/txgbe/txgbe_ethdev.c | 34 +++++++++++++++++++---------- 4 files changed, 36 insertions(+), 11 deletions(-)
drivers/net/txgbe/base/txgbe_hw.c +7 -0
@@ -394,6 +394,13 @@ s32 txgbe_clear_hw_cntrs(struct txgbe_hw *hw)rd32 (hw,TXGBE_PBTXLNKXON );rd32 (hw,TXGBE_PBTXLNKXOFF ); +if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) { +wr32 (hw,TXGBE_PBRXLNKXON_AML ,0 ); +wr32 (hw,TXGBE_PBRXLNKXOFF_AML ,0 ); + hw->last_stats.rx_xon_packets =0 ; + hw->last_stats.rx_xoff_packets =0 ; + } +/* DMA Stats */ rd32 (hw,TXGBE_DMARXPKT );rd32 (hw,TXGBE_DMATXPKT );
drivers/net/txgbe/base/txgbe_regs.h +2 -0
@@ -1085,6 +1085,8 @@ enum txgbe_5tuple_protocol {#define TXGBE_PBRXDROP 0x019068#define TXGBE_PBRXLNKXOFF 0x011988#define TXGBE_PBRXLNKXON 0x011E0C +#define TXGBE_PBRXLNKXOFF_AML 0x011F80 +#define TXGBE_PBRXLNKXON_AML 0x011F84#define TXGBE_PBRXUPXON (up) (0x011E30 + (up) * 4)#define TXGBE_PBRXUPXOFF (up) (0x011E10 + (up) * 4)
drivers/net/txgbe/base/txgbe_type.h +4 -0
@@ -876,6 +876,10 @@ struct txgbe_hw {u64 tx_qp_bytes;u64 rx_qp_mc_packets; } qp_last[TXGBE_MAX_QP ]; +struct { +u64 rx_xon_packets; +u64 rx_xoff_packets; + } last_stats;rte_spinlock_t phy_lock;/*amlite: new SW-FW mbox */
drivers/net/txgbe/txgbe_ethdev.c +23 -11
@@ -2264,16 +2264,18 @@ txgbe_dev_reset(struct rte_eth_dev *dev)return ret; } +#define TXGBE_UPDATE_COUNTER_32BIT_GENERIC (reg, last, count, reset) \ + do { \ + uint32_t current = rd32(hw, reg); \ + if ((current) < (last)) \ + current += 0x100000000ULL; \ + if (reset) \ + (last) = current; \ + (count) = (uint32_t)((current) - (last)); \ + } while (0) +#define UPDATE_QP_COUNTER_32bit (reg, last_counter, counter) \ - { \ - uint32_t current_counter = rd32(hw, reg); \ - if (current_counter < last_counter) \ - current_counter += 0x100000000LL; \ - if (!hw->offset_loaded) \ - last_counter = current_counter; \ - counter = current_counter - last_counter; \ - counter &= 0xFFFFFFFFLL; \ - } + TXGBE_UPDATE_COUNTER_32BIT_GENERIC(reg, last_counter, counter, !hw->offset_loaded)#define UPDATE_QP_COUNTER_36bit (reg_lsb, reg_msb, last_counter, counter) \ { \
@@ -2331,8 +2333,18 @@ txgbe_read_stats_registers(struct txgbe_hw *hw, hw_stats->up[i].rx_up_dropped +=rd32 (hw,TXGBE_PBRXMISS (i)); } - hw_stats->rx_xon_packets +=rd32 (hw,TXGBE_PBRXLNKXON ); - hw_stats->rx_xoff_packets +=rd32 (hw,TXGBE_PBRXLNKXOFF ); + +if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) { +TXGBE_UPDATE_COUNTER_32BIT_GENERIC (TXGBE_PBRXLNKXON_AML , + hw->last_stats.rx_xon_packets, + hw_stats->rx_xon_packets, !hw->offset_loaded); +TXGBE_UPDATE_COUNTER_32BIT_GENERIC (TXGBE_PBRXLNKXOFF_AML , + hw->last_stats.rx_xoff_packets, + hw_stats->rx_xoff_packets, !hw->offset_loaded); + }else { + hw_stats->rx_xon_packets +=rd32 (hw,TXGBE_PBRXLNKXON ); + hw_stats->rx_xoff_packets +=rd32 (hw,TXGBE_PBRXLNKXOFF ); + } hw_stats->tx_xon_packets +=rd32 (hw,TXGBE_PBTXLNKXON ); hw_stats->tx_xoff_packets +=rd32 (hw,TXGBE_PBTXLNKXOFF );
Signature · 1 line
2.21.0.windows.1
PATCH v9 9/21 net/txgbe: fix link flow control config for Sapphire
In reply to Zaiyu WangSP chips have a hardware bug preventing XON flow control support, so the driver disables it.
--- drivers/net/txgbe/base/txgbe_hw.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/txgbe/base/txgbe_hw.c +4 -2
@@ -1037,8 +1037,10 @@ s32 txgbe_fc_enable(struct txgbe_hw *hw)for (i =0 ; i <TXGBE_DCB_TC_MAX ; i++) {if ((hw->fc.current_mode & txgbe_fc_tx_pause) && hw->fc.high_water[i]) { - fcrtl =TXGBE_FCWTRLO_TH (hw->fc.low_water[i]) | -TXGBE_FCWTRLO_XON ; + fcrtl =TXGBE_FCWTRLO_TH (hw->fc.low_water[i]); +/* Only AML support XON */ +if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) + fcrtl |=TXGBE_FCWTRLO_XON ; fcrth =TXGBE_FCWTRHI_TH (hw->fc.high_water[i]) |TXGBE_FCWTRHI_XOFF ; }else {
Signature · 1 line
2.21.0.windows.1
PATCH v9 10/21 net/txgbe: fix a mass of unknown interrupts
In reply to Zaiyu WangWhen RSC is enabled, Rx ring IVAR is set to configure ITR. It causes Rx ring interrupts report on the default msix_vector. Thus a mass of unknown interrupts occupy CPU.
Fix the issue by setting ring IVAR only when the rxq interrupt is enabled.
--- drivers/net/txgbe/txgbe_rxtx.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-)
drivers/net/txgbe/txgbe_rxtx.c +17 -13
@@ -4347,6 +4347,8 @@ static int txgbe_set_rsc(struct rte_eth_dev *dev) {struct rte_eth_rxmode *rx_conf = &dev->data->dev_conf.rxmode; +struct rte_pci_device *pci_dev =RTE_CLASS_TO_BUS_DEVICE (dev, *pci_dev); +struct rte_intr_handle *intr_handle = pci_dev->intr_handle;struct txgbe_hw *hw =TXGBE_DEV_HW (dev);struct rte_eth_dev_info dev_info = {0 };bool rsc_capable = false;
@@ -4397,8 +4399,6 @@ txgbe_set_rsc(struct rte_eth_dev *dev)rd32 (hw,TXGBE_RXCFG (rxq->reg_idx));uint32_t psrtype =rd32 (hw,TXGBE_POOLRSS (rxq->reg_idx)); -uint32_t eitr = -rd32 (hw,TXGBE_ITR (rxq->reg_idx));/* * txgbe PMD doesn't support header-split at the moment.
@@ -4417,6 +4417,9 @@ txgbe_set_rsc(struct rte_eth_dev *dev) srrctl |=txgbe_get_rscctl_maxdesc (rxq->mb_pool); psrtype |=TXGBE_POOLRSS_L4HDR ; +wr32 (hw,TXGBE_RXCFG (rxq->reg_idx), srrctl); +wr32 (hw,TXGBE_POOLRSS (rxq->reg_idx), psrtype); +/* * RSC: Set ITR interval corresponding to 2K ints/s. *
@@ -4430,19 +4433,20 @@ txgbe_set_rsc(struct rte_eth_dev *dev)* For a sparse streaming case this setting will yield * at most 500us latency for a single RSC aggregation. */ - eitr &= ~TXGBE_ITR_IVAL_MASK ; - eitr |=TXGBE_ITR_IVAL_10G (TXGBE_QUEUE_ITR_INTERVAL_DEFAULT ); - eitr |=TXGBE_ITR_WRDSA ; +if (rte_intr_dp_is_en (intr_handle)) { +uint32_t eitr =rd32 (hw,TXGBE_ITR (rxq->reg_idx)); -wr32 (hw,TXGBE_RXCFG (rxq->reg_idx), srrctl); -wr32 (hw,TXGBE_POOLRSS (rxq->reg_idx), psrtype); -wr32 (hw,TXGBE_ITR (rxq->reg_idx), eitr); + eitr &= ~TXGBE_ITR_IVAL_MASK ; + eitr |=TXGBE_ITR_IVAL_10G (TXGBE_QUEUE_ITR_INTERVAL_DEFAULT ); + eitr |=TXGBE_ITR_WRDSA ; +wr32 (hw,TXGBE_ITR (rxq->reg_idx), eitr); -/* -* RSC requires the mapping of the queue to the -* interrupt vector. -*/ -txgbe_set_ivar_map (hw,0 , rxq->reg_idx, i); +/* +* RSC requires the mapping of the queue to the +* interrupt vector. +*/ +txgbe_set_ivar_map (hw,0 , rxq->reg_idx, i); + } } dev->data->lro =1 ;
Signature · 1 line
2.21.0.windows.1
PATCH v9 11/21 net/txgbe: fix traffic class priority configuration
In reply to Zaiyu WangAfter applying the following testpmd command, 802.1Q packets with specific priorities were not properly directed to the corresponding traffic classes:
port config 0 dcb vt off 4 pfc off
The old driver had two issues:
1. The hardware uses a 4-bit mapping register per traffic class for priority-to-TC mapping, but the driver incorrectly configured it as 3 bits.
2. The DCB TX configuration mistakenly wrote to the RX register.
Fix both issues, ensuring that tc-prio mapping works as expected. Additionally, remove the stale and inconsistent TXGBE_DCBUP2TC_DEC macro as it has no callers.
--- drivers/net/txgbe/base/txgbe_dcb_hw.c | 2 +- drivers/net/txgbe/base/txgbe_regs.h | 6 ++---- drivers/net/txgbe/txgbe_rxtx.c | 7 ++----- 3 files changed, 5 insertions(+), 10 deletions(-)
drivers/net/txgbe/base/txgbe_dcb_hw.c +1 -1
@@ -154,7 +154,7 @@ s32 txgbe_dcb_config_tx_data_arbiter_raptor(struct txgbe_hw *hw, u16 *refill,for (i =0 ; i <TXGBE_DCB_UP_MAX ; i++) reg |=TXGBE_DCBUP2TC_MAP (i, map[i]); -wr32 (hw,TXGBE_PBRXUP2TC , reg); +wr32 (hw,TXGBE_PBTXUP2TC , reg);/* Configure traffic class credits and priority */ for (i =0 ; i <TXGBE_DCB_TC_MAX ; i++) {
drivers/net/txgbe/base/txgbe_regs.h +2 -4
@@ -503,10 +503,8 @@#define TXGBE_PBRXCTL 0x019000#define TXGBE_PBRXCTL_ST MS(0, 0x1)#define TXGBE_PBRXCTL_ENA MS(31, 0x1) -#define TXGBE_PBRXUP2TC 0x019008#define TXGBE_PBTXUP2TC 0x01C800 -#define TXGBE_DCBUP2TC_MAP (tc, v) LS(v, 3 * (tc), 0x7) -#define TXGBE_DCBUP2TC_DEC (tc, r) RS(r, 3 * (tc), 0x7) +#define TXGBE_DCBUP2TC_MAP (tc, v) LS(v, 4 * (tc), 0x7)#define TXGBE_PBRXSIZE (tc) (0x019020 + (tc) * 4)#define TXGBE_PBRXSIZE_KB (v) LS(v, 10, 0x3FF)
@@ -1705,7 +1703,7 @@ enum txgbe_5tuple_protocol {#define TXGBE_RDM_PF_HIDE (_i) (0x12090 + ((_i) * 4))#define TXGBE_RPUP2TC 0x019008 -#define TXGBE_RPUP2TC_UP_SHIFT 3 +#define TXGBE_RPUP2TC_UP_SHIFT 4#define TXGBE_RPUP2TC_UP_MASK 0x7#define TXGBE_RDM_DCACHE_CTL 0x0120A8
drivers/net/txgbe/txgbe_rxtx.c +2 -5
@@ -3378,11 +3378,8 @@ txgbe_vmdq_dcb_configure(struct rte_eth_dev *dev) queue_mapping =0 ;for (i =0 ; i <RTE_ETH_DCB_NUM_USER_PRIORITIES ; i++) -/* -* mapping is done with 3 bits per priority, -* so shift by i*3 each time -*/ - queue_mapping |= ((cfg->dcb_tc[i] &0x07 ) << (i *3 )); + queue_mapping |= ((cfg->dcb_tc[i] &TXGBE_RPUP2TC_UP_MASK ) << + (i *TXGBE_RPUP2TC_UP_SHIFT ));wr32 (hw,TXGBE_RPUP2TC , queue_mapping);
Signature · 1 line
2.21.0.windows.1
PATCH v9 12/21 net/txgbe: fix link stability for 25G NIC
In reply to Zaiyu WangThe link was previously configured via firmware, but this approach resulted in unstable link behavior. To resolve the issue, re-add the PHY configuration flow directly into the driver.
--- drivers/net/txgbe/base/meson.build | 1 + drivers/net/txgbe/base/txgbe_aml.c | 105 +- drivers/net/txgbe/base/txgbe_aml.h | 6 +- drivers/net/txgbe/base/txgbe_e56.c | 2488 +++++++++++++++++++++++++ drivers/net/txgbe/base/txgbe_e56.h | 1746 +++++++++++++++++ drivers/net/txgbe/base/txgbe_e56_bp.h | 279 +++ drivers/net/txgbe/base/txgbe_hw.c | 35 +- drivers/net/txgbe/base/txgbe_phy.h | 1 - drivers/net/txgbe/base/txgbe_regs.h | 2 + drivers/net/txgbe/base/txgbe_type.h | 12 + drivers/net/txgbe/txgbe_ethdev.c | 83 +- drivers/net/txgbe/txgbe_ethdev.h | 4 + 12 files changed, 4703 insertions(+), 59 deletions(-) create mode 100644 drivers/net/txgbe/base/txgbe_e56.c create mode 100644 drivers/net/txgbe/base/txgbe_e56.h create mode 100644 drivers/net/txgbe/base/txgbe_e56_bp.h
drivers/net/txgbe/base/meson.build +1 -0
@@ -12,4 +12,5 @@ base_sources = files( 'txgbe_mng.c', 'txgbe_phy.c', 'txgbe_vf.c', + 'txgbe_e56.c', )
drivers/net/txgbe/base/txgbe_aml.c +80 -25
177 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_aml.h +4 -2
@@ -16,7 +16,9 @@ s32 txgbe_get_link_capabilities_aml(struct txgbe_hw *hw, u32 *speed, bool *autoneg);u32 txgbe_get_media_type_aml (struct txgbe_hw *hw);void txgbe_wait_for_link_up_aml (struct txgbe_hw *hw,u32 speed); -s32 txgbe_setup_mac_link_aml (struct txgbe_hw *hw,u32 speed, -bool autoneg_wait_to_complete); +s32 txgbe_setup_phy_link_aml (struct txgbe_hw *hw, +u32 speed, +bool autoneg_wait_to_complete, +bool *need_reset);void txgbe_init_mac_link_ops_aml (struct txgbe_hw *hw);#endif /* _TXGBE_AML_H_ */
drivers/net/txgbe/base/txgbe_e56.c new file +2488 -0
2,488 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_e56.h new file +1746 -0
319 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_e56_bp.h new file +279 -0
279 lines not on this page · raw message
drivers/net/txgbe/txgbe_ethdev.c +82 -1
83 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.21.0.windows.1
Part of the diff is not shown here. View the raw message.
PATCH v9 13/21 net/txgbe: fix link stability for 40G NIC
In reply to Zaiyu WangThe link was previously configured via firmware, but this approach resulted in unstable link behavior. To resolve the issue, re-add the PHY configuration flow directly into the driver.
--- drivers/net/txgbe/base/txgbe_aml40.c | 73 +- drivers/net/txgbe/base/txgbe_aml40.h | 6 +- drivers/net/txgbe/base/txgbe_e56.c | 1473 ++++++++++++++++++++++++-- drivers/net/txgbe/base/txgbe_e56.h | 9 +- drivers/net/txgbe/txgbe_ethdev.c | 4 +- 5 files changed, 1447 insertions(+), 118 deletions(-)
drivers/net/txgbe/base/txgbe_aml40.c +56 -17
@@ -13,6 +13,7 @@#include "txgbe_hw.h" #include "txgbe_aml.h" #include "txgbe_aml40.h" +#include "txgbe_e56.h" void txgbe_init_ops_aml40 (struct txgbe_hw *hw) {
@@ -24,6 +25,7 @@ void txgbe_init_ops_aml40(struct txgbe_hw *hw)/* PHY */ phy->get_media_type = txgbe_get_media_type_aml40; + phy->setup_link_core = txgbe_setup_phy_link_aml40;/* LINK */ mac->init_mac_link_ops = txgbe_init_mac_link_ops_aml40;
@@ -52,6 +54,13 @@ s32 txgbe_check_mac_link_aml40(struct txgbe_hw *hw, u32 *speed,if (link_up_wait_to_complete) {for (i =0 ; i < hw->mac.max_link_up_time; i++) { +if (!hw->link_valid) { + *link_up = false; + +msleep (100 ); +continue ; + } +if (!(links_reg &TXGBE_PORTSTAT_UP )) { *link_up = false; }else {
@@ -68,6 +77,9 @@ s32 txgbe_check_mac_link_aml40(struct txgbe_hw *hw, u32 *speed, *link_up = false; } +if (!hw->link_valid) + *link_up = false; +if (*link_up) {if ((links_reg &TXGBE_CFG_PORT_ST_AML_LINK_40G ) ==TXGBE_CFG_PORT_ST_AML_LINK_40G )
@@ -107,20 +119,24 @@ u32 txgbe_get_media_type_aml40(struct txgbe_hw *hw)return txgbe_media_type_fiber_qsfp; } -s32 txgbe_setup_mac_link_aml40 (struct txgbe_hw *hw, -u32 speed, -bool autoneg_wait_to_complete) +s32 txgbe_setup_phy_link_aml40 (struct txgbe_hw *hw, +u32 speed, +bool autoneg_wait_to_complete, +bool *need_reset) {bool autoneg = false;s32 status =0 ; +s32 ret_status =0 ;u32 link_speed =TXGBE_LINK_SPEED_UNKNOWN ;bool link_up = false; +int i;u32 link_capabilities =TXGBE_LINK_SPEED_UNKNOWN ; +u32 value; -if (hw->phy.sfp_type == txgbe_sfp_type_not_present) { -DEBUGOUT ("SFP not detected, skip setup mac link" ); -return 0 ; - } + *need_reset = false; + +if (hw->phy.sfp_type == txgbe_sfp_type_not_present) + hw->phy.identify_sfp (hw);/* Check to see if speed passed in is supported. */ status = hw->mac.get_link_capabilities(hw,
@@ -132,18 +148,42 @@ s32 txgbe_setup_mac_link_aml40(struct txgbe_hw *hw,if (speed ==TXGBE_LINK_SPEED_UNKNOWN )return TXGBE_ERR_LINK_SETUP ; - status = hw->mac.check_link (hw, &link_speed, &link_up, - autoneg_wait_to_complete); +for (i =0 ; i <4 ; i++) { +txgbe_e56_check_phy_link (hw, &link_speed, &link_up); +if (link_up) +break ; +msleep (250 ); + }if (link_speed == speed && link_up) -return status; - -if (speed &TXGBE_LINK_SPEED_40GB_FULL ) - speed =0x20 ; - - status = hw->phy.set_link_hostif (hw, (u8 )speed, autoneg, true); + goto out; + +rte_spinlock_lock (&hw->phy_lock); + ret_status =txgbe_set_link_to_amlite (hw, speed); +if (ret_status ==TXGBE_ERR_TIMEOUT ) + hw->link_valid = false; +rte_spinlock_unlock (&hw->phy_lock); + +for (i =0 ; i <4 ; i++) { +txgbe_e56_check_phy_link (hw, &link_speed, &link_up); +if (link_up) + goto out; +msleep (250 ); + } -txgbe_wait_for_link_up_aml (hw, speed); +out: +if (link_up) { + value =rd32 (hw,TXGBE_PORTSTAT ); +if (!(value &TXGBE_PORTSTAT_UP )) { +DEBUGOUT ("MAC link 0x14404: 0x%x" , value); + *need_reset = true; + value =rd32 (hw,0x110b0 ); +DEBUGOUT ("MAC intr status 0x110b0: 0x%x" , value); + } + }else { + *need_reset = true; +DEBUGOUT ("Link reconfiguration required. Reset scheduled in 2000ms." ); + }return status; }
@@ -159,6 +199,5 @@ void txgbe_init_mac_link_ops_aml40(struct txgbe_hw *hw) mac->flap_tx_laser = txgbe_flap_tx_laser_multispeed_fiber; - mac->setup_link = txgbe_setup_mac_link_aml40; mac->set_rate_select_speed = txgbe_set_hard_rate_select_speed; }
drivers/net/txgbe/base/txgbe_aml40.h +4 -2
@@ -14,7 +14,9 @@ s32 txgbe_check_mac_link_aml40(struct txgbe_hw *hw,s32 txgbe_get_link_capabilities_aml40 (struct txgbe_hw *hw,u32 *speed,bool *autoneg);u32 txgbe_get_media_type_aml40 (struct txgbe_hw *hw); -s32 txgbe_setup_mac_link_aml40 (struct txgbe_hw *hw,u32 speed, -bool autoneg_wait_to_complete); +s32 txgbe_setup_phy_link_aml40 (struct txgbe_hw *hw, +u32 speed, +bool autoneg_wait_to_complete, +bool *need_reset);void txgbe_init_mac_link_ops_aml40 (struct txgbe_hw *hw);#endif /* _TXGBE_AML40_H_ */
drivers/net/txgbe/base/txgbe_e56.c +1378 -95
1,560 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_e56.h +7 -2
@@ -438,7 +438,12 @@ typedef union {#define E56PHY_FETX_FFE_TRAIN_CFG_0_KRT_FETX_INIT_FFE_CFG_2 9, 8#define E56PHY_FETX_FFE_TRAIN_CFG_0_KRT_FETX_INIT_FFE_CFG_3 13, 12 -#define PHYINIT_TIMEOUT 1000/* PHY initialization timeout value in 0.5ms unit */ +/* PHYINIT_TIMEOUT, a loop iteration counter, not a fixed time unit. +* The actual timeout duration depends on the usec_delay() or msleep() +* value used inside the polling loop. For example, when usec_delay(500) +* is used, the total timeout is approximately PHYINIT_TIMEOUT * 500 us. +*/ +#define PHYINIT_TIMEOUT 1000#define E56G__BASEADDR 0x0
@@ -1729,7 +1734,7 @@ typedef union {void set_fields_e56 (unsigned int *src_data,unsigned int bit_high,unsigned int bit_low,unsigned int set_value); -int txgbe_e56_rx_rd_second_code_40g (struct txgbe_hw *hw,int *SECOND_CODE ,int lane); +void txgbe_e56_rx_rd_second_code_40g (struct txgbe_hw *hw,int *SECOND_CODE ,int lane);void txgbe_e56_rx_rd_second_code (struct txgbe_hw *hw,int *SECOND_CODE );u32 txgbe_e56_cfg_40g (struct txgbe_hw *hw);u32 txgbe_e56_cfg_25g (struct txgbe_hw *hw);
drivers/net/txgbe/txgbe_ethdev.c +2 -2
@@ -2054,7 +2054,7 @@ txgbe_dev_stop(struct rte_eth_dev *dev)PMD_INIT_FUNC_TRACE (); -if (hw->mac.type == txgbe_mac_aml) +if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40)rte_eal_alarm_cancel (txgbe_dev_setup_link_alarm_handler_aml, hw);rte_eal_alarm_cancel (txgbe_dev_detect_sfp, dev);
@@ -3206,7 +3206,7 @@ txgbe_dev_setup_link_thread_handler(void *param)struct txgbe_hw *hw =TXGBE_DEV_HW (dev);rte_thread_detach (rte_thread_self ()); -if (hw->mac.type == txgbe_mac_aml) +if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40)txgbe_dev_setup_link_alarm_handler_aml (hw);else txgbe_dev_setup_link_alarm_handler (dev);
Signature · 1 line
2.21.0.windows.1
PATCH v9 14/21 net/txgbe: fix link stability for Amber-Lite backplane mode
In reply to Zaiyu WangThe link was previously configured via firmware, but this approach resulted in unstable link behavior. To resolve the issue, re-add the PHY configuration flow directly into the driver.
--- drivers/net/txgbe/base/meson.build | 1 + drivers/net/txgbe/base/txgbe.h | 2 + drivers/net/txgbe/base/txgbe_aml.c | 65 +- drivers/net/txgbe/base/txgbe_aml40.c | 43 +- drivers/net/txgbe/base/txgbe_e56.c | 22 +- drivers/net/txgbe/base/txgbe_e56.h | 2 + drivers/net/txgbe/base/txgbe_e56_bp.c | 2597 +++++++++++++++++++++++++ drivers/net/txgbe/base/txgbe_e56_bp.h | 3 + drivers/net/txgbe/base/txgbe_hw.c | 6 + drivers/net/txgbe/base/txgbe_hw.h | 4 +- drivers/net/txgbe/base/txgbe_osdep.h | 4 + drivers/net/txgbe/base/txgbe_phy.c | 21 + drivers/net/txgbe/base/txgbe_phy.h | 22 + drivers/net/txgbe/base/txgbe_type.h | 25 +- drivers/net/txgbe/txgbe_ethdev.c | 109 +- drivers/net/txgbe/txgbe_ethdev.h | 2 +- 16 files changed, 2898 insertions(+), 30 deletions(-) create mode 100644 drivers/net/txgbe/base/txgbe_e56_bp.c
drivers/net/txgbe/base/meson.build +1 -0
@@ -13,4 +13,5 @@ base_sources = files( 'txgbe_phy.c', 'txgbe_vf.c', 'txgbe_e56.c', + 'txgbe_e56_bp.c', )
drivers/net/txgbe/base/txgbe.h +2 -0
@@ -13,5 +13,7 @@#include "txgbe_hw.h" #include "txgbe_vf.h" #include "txgbe_dcb.h" +#include "txgbe_e56.h" +#include "txgbe_e56_bp.h" #endif /* _TXGBE_H_ */
drivers/net/txgbe/base/txgbe_aml.c +54 -11
102 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_aml40.c +39 -4
73 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_e56.c +12 -10
@@ -53,7 +53,7 @@ int txgbe_e56_int_cmp(const void *a, const void *b) }s32 txgbe_e56_check_phy_link (struct txgbe_hw *hw,u32 *speed, -bool *link_up) +bool *link_up) {u32 rdata =0 ;u32 links_reg =0 ;
@@ -101,7 +101,8 @@ u32 txgbe_e56_tx_ffe_cfg(struct txgbe_hw *hw, u32 speed) post =S10G_TX_FFE_CFG_POST ; }else if (speed ==TXGBE_LINK_SPEED_25GB_FULL ) {if (hw->phy.sfp_type == txgbe_sfp_type_da_cu_core0 || - hw->phy.sfp_type == txgbe_sfp_type_da_cu_core1) { + hw->phy.sfp_type == txgbe_sfp_type_da_cu_core1 || +txgbe_is_backplane (hw)) { ffe_main =S25G_TX_FFE_CFG_DAC_MAIN ; pre1 =S25G_TX_FFE_CFG_DAC_PRE1 ; pre2 =S25G_TX_FFE_CFG_DAC_PRE2 ;
@@ -119,7 +120,8 @@ u32 txgbe_e56_tx_ffe_cfg(struct txgbe_hw *hw, u32 speed) post =S10G_TX_FFE_CFG_POST ;if (hw->phy.sfp_type == txgbe_qsfp_type_40g_cu_core0 || - hw->phy.sfp_type == txgbe_qsfp_type_40g_cu_core1) { + hw->phy.sfp_type == txgbe_qsfp_type_40g_cu_core1 || +txgbe_is_backplane (hw)) { ffe_main =S40G_TX_FFE_CFG_MAIN ; pre1 =S40G_TX_FFE_CFG_PRE1 ; pre2 =S40G_TX_FFE_CFG_PRE2 ;
@@ -1508,7 +1510,7 @@ txgbe_e56_rxs_osc_init_for_temp_track_range(struct txgbe_hw *hw, u32 speed) rdata =rd32_ephy (hw, addr);if (timer++ >PHYINIT_TIMEOUT ) { -DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!\n" ); +DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!" );return -1 ; } }
@@ -1542,7 +1544,7 @@ txgbe_e56_rxs_osc_init_for_temp_track_range(struct txgbe_hw *hw, u32 speed)if (((rdata >> (i *8 )) &0x3f ) ==0x21 )break ;if (timer++ >PHYINIT_TIMEOUT ) { -DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!\n" ); +DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!" );return -1 ; } }
@@ -1618,7 +1620,7 @@ txgbe_e56_rxs_osc_init_for_temp_track_range(struct txgbe_hw *hw, u32 speed) addr =E56PHY_CTRL_FSM_RX_STAT_0_ADDR ; rdata =rd32_ephy (hw, addr);if (timer++ >PHYINIT_TIMEOUT ) { -DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!\n" ); +DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!" );return -1 ; } }
@@ -1664,7 +1666,7 @@ txgbe_e56_rxs_osc_init_for_temp_track_range(struct txgbe_hw *hw, u32 speed)if (((rdata >> (i *8 )) &0x3f ) ==0x21 )break ;if (timer++ >PHYINIT_TIMEOUT ) { -DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!\n" ); +DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!" );return -1 ; } }
@@ -1929,7 +1931,7 @@ int txgbe_temp_track_seq_40g(struct txgbe_hw *hw, u32 speed)CMVAR_UFINE_FMIN_WRAP =S25G_CMVAR_UFINE_FMIN_WRAP ;CMVAR_FINE_FMIN_WRAP =S25G_CMVAR_FINE_FMIN_WRAP ; }else { -DEBUGOUT ("Error Speed\n" ); +DEBUGOUT ("Error Speed" );return 0 ; }
@@ -3190,7 +3192,7 @@ static int txgbe_e56_disable_rx40G(struct txgbe_hw *hw) rdata =rd32_ephy (hw, addr);usec_delay (100 );if (timer++ >PHYINIT_TIMEOUT ) { -DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!\n" ); +DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!" );break ; } }
@@ -3296,7 +3298,7 @@ static int txgbe_e56_disable_rx(struct txgbe_hw *hw)break ;usec_delay (100 );if (timer++ >PHYINIT_TIMEOUT ) { -DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!\n" ); +DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!" );break ; } }
drivers/net/txgbe/base/txgbe_e56.h +2 -0
@@ -1744,6 +1744,8 @@ int txgbe_temp_track_seq(struct txgbe_hw *hw, u32 speed);int txgbe_e56_get_temp (struct txgbe_hw *hw,int *temp);int txgbe_set_link_to_amlite (struct txgbe_hw *hw,u32 speed);int txgbe_e56_reconfig_rx (struct txgbe_hw *hw,u32 speed); +s32 txgbe_e56_check_phy_link (struct txgbe_hw *hw,u32 *speed, +bool *link_up);s32 txgbe_e56_fec_set (struct txgbe_hw *hw);s32 txgbe_e56_fec_polling (struct txgbe_hw *hw,bool *link_up);u32 txgbe_e56_tx_ffe_cfg (struct txgbe_hw *hw,u32 speed);
drivers/net/txgbe/base/txgbe_e56_bp.c new file +2597 -0
2,597 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_e56_bp.h +3 -0
@@ -276,4 +276,7 @@ typedef union {#define E56PHY_CMS_ANA_OVRDVAL_10_ADDR (E56PHY_CMS_BASE_ADDR + 0xD8)#define E56PHY_CMS_ANA_OVRDVAL_7_ANA_LCPLL_LF_LPF_SETCODE_CALIB_I 8, 4 +int txgbe_e56_set_phy_link_mode (struct txgbe_hw *hw, +u8 bp_link_mode,u32 need_restart); +int handle_e56_bkp_an73_flow (struct txgbe_hw *hw);#endif
drivers/net/txgbe/base/txgbe_hw.c +6 -0
@@ -4071,6 +4071,12 @@ s32 txgbe_reset_pipeline_raptor(struct txgbe_hw *hw)return err; } +bool txgbe_is_backplane (struct txgbe_hw *hw) +{ +return hw->phy.get_media_type (hw) == txgbe_media_type_backplane ? + true : false; +} +bool txgbe_gpio_ext_check (struct txgbe_hw *hw,u8 gpio_ext_mask) {u32 gpio_ext =rd32 (hw,TXGBE_GPIOEXT );
drivers/net/txgbe/base/txgbe_hw.h +2 -2
@@ -118,6 +118,6 @@ s32 txgbe_reinit_fdir_tables(struct txgbe_hw *hw);bool txgbe_verify_lesm_fw_enabled_raptor (struct txgbe_hw *hw);s32 txgbe_fmgr_cmd_op (struct txgbe_hw *hw,u32 cmd,u32 cmd_addr);s32 txgbe_flash_read_dword (struct txgbe_hw *hw,u32 addr,u32 *data); -s32 txgbe_e56_check_phy_link (struct txgbe_hw *hw,u32 *speed, -bool *link_up); +bool txgbe_is_backplane (struct txgbe_hw *hw); +bool txgbe_gpio_ext_check (struct txgbe_hw *hw,u8 gpio_ext_mask);#endif /* _TXGBE_HW_H_ */
drivers/net/txgbe/base/txgbe_osdep.h +4 -0
@@ -162,6 +162,10 @@ static inline u64 REVERT_BIT_MASK64(u64 mask) ((mask &0xFFFFFFFF00000000 ) >>32 ); } +#define BITS_PER_LONG (__SIZEOF_LONG__ * 8) +#define GENMASK (h, l) \ + (((~0UL) << (l)) & (~0UL >> (BITS_PER_LONG - 1 - (h)))) +#define IOMEM #define BIT (nr) (1UL << (nr))
drivers/net/txgbe/base/txgbe_phy.c +21 -0
@@ -2503,6 +2503,27 @@ void txgbe_set_phy_temp(struct txgbe_hw *hw) } } +int txgbe_is_dac_cable (struct txgbe_hw *hw) +{ +if (hw->phy.sfp_type == txgbe_sfp_type_da_cu_core0 || + hw->phy.sfp_type == txgbe_sfp_type_da_cu_core1 || + hw->phy.sfp_type == txgbe_sfp_type_da_act_lmt_core0 || + hw->phy.sfp_type == txgbe_sfp_type_da_act_lmt_core1 || + hw->phy.sfp_type == txgbe_qsfp_type_40g_cu_core0 || + hw->phy.sfp_type == txgbe_qsfp_type_40g_cu_core1) +return true; + +return false; +} + +int txgbe_xpcs_an_enabled (struct txgbe_hw *hw) +{ +if (!(txgbe_is_dac_cable (hw) ||txgbe_is_backplane (hw))) +return false; + +return hw->devarg.auto_neg ? true : false; +} +/** * txgbe_kr_handle - Handle the interrupt of auto-negotiation * @hw: pointer to hardware structure
drivers/net/txgbe/base/txgbe_phy.h +22 -0
@@ -105,6 +105,8 @@#define VR_AN_INTR_CMPLT MS16(0, 0x1)#define VR_AN_INTR_LINK MS16(1, 0x1)#define VR_AN_INTR_PG_RCV MS16(2, 0x1) +#define TXGBE_E56_AN_TXDIS MS16(3, 0x1) +#define TXGBE_E56_AN_PG_RCV MS16(4, 0x1)#define VR_AN_KR_MODE_CL 0x078003#define VR_AN_KR_MODE_CL_PDET MS16(0, 0x1)#define VR_XS_OR_PCS_MMD_DIGI_CTL1 0x038000
@@ -428,6 +430,24 @@#define TXGBE_BP_M_NAUTO 0#define TXGBE_BP_M_AUTO 1 +#define kr_read_poll (op, val, cond, sleep_us, \ + times, args...) \ +({ \ + unsigned long __sleep_us = (sleep_us); \ + u32 __times = (times); \ + u32 i; \ + int __cond = 0; \ + for (i = 0; i < __times; i++) { \ + (val) = op(args); \ + if (cond) { \ + __cond = 1; \ + break; \ + } \ + usec_delay(__sleep_us);\ + } \ + (__cond) ? 0 : -1; \ +}) +#ifndef CL72_KRTR_PRBS_MODE_EN #define CL72_KRTR_PRBS_MODE_EN 0xFFFF/* open kr prbs check */ #endif
@@ -490,6 +510,8 @@ void txgbe_autoc_write(struct txgbe_hw *hw, u64 value);void txgbe_bp_mode_set (struct txgbe_hw *hw);void txgbe_set_phy_temp (struct txgbe_hw *hw);void txgbe_bp_down_event (struct txgbe_hw *hw); +int txgbe_is_dac_cable (struct txgbe_hw *hw); +int txgbe_xpcs_an_enabled (struct txgbe_hw *hw);s32 txgbe_kr_handle (struct txgbe_hw *hw);#endif /* _TXGBE_PHY_H_ */
drivers/net/txgbe/base/txgbe_type.h +24 -1
@@ -719,6 +719,7 @@ struct txgbe_phy_info {u32 addr;u32 id;enum txgbe_sfp_type sfp_type; +u32 fiber_suppport_speed;bool sfp_setup_needed;u32 revision;u32 media_type;
@@ -740,6 +741,7 @@ struct txgbe_phy_info {u16 ffe_pre2;u16 ffe_post;u16 fec_mode; +u16 bp_capa; };#define TXGBE_DEVARG_BP_AUTO "auto_neg"
@@ -899,7 +901,28 @@ struct txgbe_hw {u32 cur_fec_link;int temperature;u32 bp_link_mode; -}; +bool dac_sfp; +bool bypass_ctle; +u32 curbp_link_mode; +bool an_done;
Lines of this file are not shown. View the raw message.
drivers/net/txgbe/txgbe_ethdev.c +108 -1
109 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.21.0.windows.1
Part of the diff is not shown here. View the raw message.
PATCH v9 15/21 net/txgbe: fix FEC mode configuration on 25G NIC
In reply to Zaiyu WangThe 25G NIC offers off, RS, Base-R, and auto FEC modes. When reconfiguring the PHY, the FEC mode must match on both sides; otherwise, the link cannot come up. The current driver fails to maintain this requirement, causing link instability.
Add proper FEC mode handling during PHY reconfiguration to guarantee link establishment.
--- drivers/net/txgbe/base/txgbe_aml.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/net/txgbe/base/txgbe_aml.c +12 -1
@@ -282,6 +282,14 @@ s32 txgbe_setup_phy_link_aml(struct txgbe_hw *hw, !(hw->fec_mode & hw->cur_fec_link))) goto out; +if (speed ==TXGBE_LINK_SPEED_25GB_FULL && + link_speed ==TXGBE_LINK_SPEED_25GB_FULL ) { +txgbe_e56_fec_polling (hw, &link_up); + +if (link_up) + goto out; + } +rte_spinlock_lock (&hw->phy_lock); ret_status =txgbe_set_link_to_amlite (hw, speed);rte_spinlock_unlock (&hw->phy_lock);
@@ -360,7 +368,10 @@ static s32 txgbe_setup_mac_link_multispeed_fiber_aml(struct txgbe_hw *hw,/* If we already have link at this speed, just jump out */ txgbe_e56_check_phy_link (hw, &link_speed, &link_up); -if (link_speed ==TXGBE_LINK_SPEED_25GB_FULL && link_up) + hw->cur_fec_link =txgbe_phy_fec_get (hw); + +if (link_speed ==TXGBE_LINK_SPEED_25GB_FULL && link_up && + hw->fec_mode & hw->cur_fec_link) goto out;/* Allow module to change analog characteristics (10G -> 25G) */
Signature · 1 line
2.21.0.windows.1
PATCH v9 16/21 net/txgbe: fix SFP module identification
In reply to Zaiyu WangSome optical modules were not correctly recognized due to ambiguous classification in the original detection flow. Rework the module identification logic to cover all module types. Also narrow the I2C lock scope to avoid potential race conditions during module access.
--- drivers/net/txgbe/base/txgbe_hw.c | 2 - drivers/net/txgbe/base/txgbe_phy.c | 341 ++++++++++------------------ drivers/net/txgbe/base/txgbe_phy.h | 18 +- drivers/net/txgbe/base/txgbe_type.h | 2 + 4 files changed, 134 insertions(+), 229 deletions(-)
drivers/net/txgbe/base/txgbe_hw.c +0 -2
@@ -2909,8 +2909,6 @@ s32 txgbe_init_ops_generic(struct txgbe_hw *hw) phy->read_i2c_eeprom = txgbe_read_i2c_eeprom; phy->write_i2c_eeprom = txgbe_write_i2c_eeprom; phy->identify_sfp = txgbe_identify_module; - phy->read_i2c_byte_unlocked = txgbe_read_i2c_byte_unlocked; - phy->write_i2c_byte_unlocked = txgbe_write_i2c_byte_unlocked; phy->check_overtemp = txgbe_check_overtemp; phy->reset = txgbe_reset_phy; phy->set_link_hostif = txgbe_hic_ephy_set_link;
drivers/net/txgbe/base/txgbe_phy.c +119 -222
471 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_phy.h +13 -5
@@ -261,7 +261,9 @@#define TXGBE_SFF_SFF_8472_COMP 0x5E#define TXGBE_SFF_SFF_8472_OSCB 0x6E#define TXGBE_SFF_SFF_8472_ESCB 0x76 +#define TXGBE_SFF_QSFP_PAGE_SELECT 0x7F +#define TXGBE_SFF_IDENTIFIER_QSFP 0x0C#define TXGBE_SFF_IDENTIFIER_QSFP_PLUS 0x0D#define TXGBE_SFF_QSFP_VENDOR_OUI_BYTE0 0xA5#define TXGBE_SFF_QSFP_VENDOR_OUI_BYTE1 0xA6
@@ -289,6 +291,9 @@#define TXGBE_SFF_4x10GBASESR_CAP 0x11#define TXGBE_SFF_40GBASEPSM4_PARALLEL 0x12#define TXGBE_SFF_40GBASE_SWMD4_CAP 0x1f +#define TXGBE_SFF_COPPER_5M 0x5 +#define TXGBE_SFF_COPPER_3M 0x3 +#define TXGBE_SFF_COPPER_1M 0x1#define TXGBE_SFF_DA_SPEC_ACTIVE_LIMITING 0x4#define TXGBE_SFF_25GAUI_C2M_AOC_BER_5 0x1
@@ -296,6 +301,11 @@#define TXGBE_SFF_25GAUI_C2M_AOC_BER_12 0x18#define TXGBE_SFF_25GAUI_C2M_ACC_BER_12 0x19 +#define TXGBE_ETHERNET_COMP_OFFSET 0x83 +#define TXGBE_SFF_ETHERNET_40G_CR4 MS(3, 0x1) +#define TXGBE_SFF_ETHERNET_40G_SR4 MS(2, 0x1) +#define TXGBE_SFF_ETHERNET_40G_LR4 MS(1, 0x1) +#define TXGBE_SFF_SOFT_RS_SELECT_MASK 0x8#define TXGBE_SFF_SOFT_RS_SELECT_10G 0x8#define TXGBE_SFF_SOFT_RS_SELECT_1G 0x0
@@ -493,14 +503,12 @@ s32 txgbe_identify_qsfp_module(struct txgbe_hw *hw);s32 txgbe_check_overtemp (struct txgbe_hw *hw);s32 txgbe_read_i2c_byte (struct txgbe_hw *hw,u8 byte_offset,u8 dev_addr,u8 *data); -s32 txgbe_read_i2c_byte_unlocked (struct txgbe_hw *hw,u8 byte_offset, -u8 dev_addr,u8 *data);s32 txgbe_write_i2c_byte (struct txgbe_hw *hw,u8 byte_offset,u8 dev_addr,u8 data); -s32 txgbe_write_i2c_byte_unlocked (struct txgbe_hw *hw,u8 byte_offset, -u8 dev_addr,u8 data);s32 txgbe_read_i2c_sff8472 (struct txgbe_hw *hw,u8 byte_offset, -u8 *sff8472_data); +u8 *sff8472_data); +s32 txgbe_read_i2c_sff8636 (struct txgbe_hw *hw,u8 page,u8 byte_offset, +u8 *sff8636_data);s32 txgbe_read_i2c_eeprom (struct txgbe_hw *hw,u8 byte_offset,u8 *eeprom_data); s32 txgbe_write_i2c_eeprom(struct txgbe_hw *hw, u8 byte_offset,
drivers/net/txgbe/base/txgbe_type.h +2 -0
@@ -702,6 +702,8 @@ struct txgbe_phy_info { u8 dev_addr, u8 data);s32 (*read_i2c_sff8472)(struct txgbe_hw *hw,u8 byte_offset,u8 *sff8472_data); +s32 (*read_i2c_sff8636)(struct txgbe_hw *hw,u8 page,u8 byte_offset, +u8 *sff8636_data);s32 (*read_i2c_eeprom)(struct txgbe_hw *hw,u8 byte_offset,u8 *eeprom_data); s32 (*write_i2c_eeprom)(struct txgbe_hw *hw, u8 byte_offset,
Signature · 1 line
2.21.0.windows.1
PATCH v9 17/21 net/txgbe: fix get module info operation
In reply to Zaiyu WangThe original I2C access flow in the module information retrieval process was flawed. Correct the implementation to properly fetch module info.
--- drivers/net/txgbe/base/txgbe_phy.h | 6 +- drivers/net/txgbe/txgbe_ethdev.c | 118 +++++++++++++++++++++++------ 2 files changed, 98 insertions(+), 26 deletions(-)
drivers/net/txgbe/base/txgbe_phy.h +5 -1
@@ -258,10 +258,14 @@#define TXGBE_SFF_CABLE_DA_ACTIVE 0x8#define TXGBE_SFF_CABLE_SPEC_COMP 0x3C#define TXGBE_SFF_SFF_8472_SWAP 0x5C +#define TXGBE_SFF_DDM_IMPLEMENTED 0x40#define TXGBE_SFF_SFF_8472_COMP 0x5E#define TXGBE_SFF_SFF_8472_OSCB 0x6E#define TXGBE_SFF_SFF_8472_ESCB 0x76 -#define TXGBE_SFF_QSFP_PAGE_SELECT 0x7F +#define TXGBE_SFF_SFF_REVISION_ADDR 0x01 +#define TXGBE_SFF_QSFP_PAGE_SELECT 0x7F + +#define TXGBE_MODULE_QSFP_MAX_LEN 640#define TXGBE_SFF_IDENTIFIER_QSFP 0x0C#define TXGBE_SFF_IDENTIFIER_QSFP_PLUS 0x0D
drivers/net/txgbe/txgbe_ethdev.c +93 -25
134 lines not on this page · raw message
Signature · 1 line
2.21.0.windows.1
PATCH v9 18/21 net/txgbe: fix get EEPROM operation
In reply to Zaiyu WangThe original I2C access flow in the module information retrieval process was flawed. Correct the implementation to properly fetch module info.
--- drivers/net/txgbe/base/txgbe_phy.h | 1 + drivers/net/txgbe/txgbe_ethdev.c | 81 +++++++++++++++++++++++++++--- 2 files changed, 76 insertions(+), 6 deletions(-)
drivers/net/txgbe/base/txgbe_phy.h +1 -0
@@ -245,6 +245,7 @@/* EEPROM (dev_addr = 0xA0) */ #define TXGBE_I2C_EEPROM_DEV_ADDR 0xA0#define TXGBE_SFF_IDENTIFIER 0x00 +#define TXGBE_SFF_8636_STATUS_OFFSET 0x02#define TXGBE_SFF_IDENTIFIER_SFP 0x03#define TXGBE_SFF_VENDOR_OUI_BYTE0 0x25#define TXGBE_SFF_VENDOR_OUI_BYTE1 0x26
drivers/net/txgbe/txgbe_ethdev.c +75 -6
98 lines not on this page · raw message
Signature · 1 line
2.21.0.windows.1
PATCH v9 19/21 net/txgbe: fix to reset Tx write-back pointer
In reply to Zaiyu WangThe write-back pointer was not reset when the Tx queue was reset. This leads to the wrong Tx desc free logic. Move the resetting of pointer into txq->ops->reset(txq).
--- drivers/net/txgbe/txgbe_rxtx.c | 45 +++++++++++++---------- drivers/net/txgbe/txgbe_rxtx.h | 1 + drivers/net/txgbe/txgbe_rxtx_vec_common.h | 7 ++++ 3 files changed, 33 insertions(+), 20 deletions(-)
drivers/net/txgbe/txgbe_rxtx.c +25 -20
@@ -2313,6 +2313,12 @@ txgbe_reset_tx_queue(struct txgbe_tx_queue *txq) txq->tx_next_dd = (uint16_t )(txq->tx_free_thresh -1 ); txq->tx_tail =0 ; +/* Zero out headwb_mem memory */ +if (txq->headwb_mem) { +for (i =0 ; i < txq->headwb_size; i++) + txq->headwb_mem[i] =0 ; + } +/* * Always allow 1 descriptor to be un-allocated to avoid * a H/W race condition
@@ -2412,7 +2418,7 @@ txgbe_get_tx_port_offloads(struct rte_eth_dev *dev)return tx_offload_capa; } -static int +static void txgbe_setup_headwb_resources (struct rte_eth_dev *dev,void *tx_queue,unsigned int socket_id)
@@ -2420,33 +2426,33 @@ txgbe_setup_headwb_resources(struct rte_eth_dev *dev,struct txgbe_hw *hw =TXGBE_DEV_HW (dev);const struct rte_memzone *headwb;struct txgbe_tx_queue *txq = tx_queue; -u8 i, headwb_size =0 ; +u8 headwb_size =0 ; -if (hw->mac.type != txgbe_mac_aml && hw->mac.type != txgbe_mac_aml40) { - txq->headwb_mem =NULL ; -return 0 ; - } +if (hw->mac.type != txgbe_mac_aml && hw->mac.type != txgbe_mac_aml40) + goto out; + +if (!hw->devarg.tx_headwb) + goto out; - headwb_size = hw->devarg.tx_headwb_size; + headwb_size = txq->headwb_size; headwb =rte_eth_dma_zone_reserve (dev,"tx_headwb_mem" , txq->queue_id,sizeof (u32) * headwb_size,TXGBE_ALIGN , socket_id);if (headwb ==NULL ) { -DEBUGOUT ("Fail to setup headwb resources: no mem" ); -txgbe_tx_queue_release (txq); -return -ENOMEM ; +PMD_DRV_LOG (INFO , +"Failed to allocate headwb memory for Tx queue %u, change to SP mode" , + txq->queue_id); + goto out; } txq->headwb = headwb; txq->headwb_dma =TMZ_PADDR (headwb); txq->headwb_mem = (uint32_t *)TMZ_VADDR (headwb); +return ; -/* Zero out headwb_mem memory */ -for (i =0 ; i < headwb_size; i++) - txq->headwb_mem[i] =0 ; - -return 0 ; +out: + txq->headwb_mem =NULL ; }int __rte_cold
@@ -2542,6 +2548,7 @@ txgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, txq->offloads = offloads; txq->ops = &def_txq_ops; txq->tx_deferred_start = tx_conf->tx_deferred_start; + txq->headwb_size = hw->devarg.tx_headwb_size;#ifdef RTE_LIB_SECURITY txq->using_ipsec = !!(dev->data->dev_conf.txmode.offloads &RTE_ETH_TX_OFFLOAD_SECURITY );
@@ -2577,8 +2584,7 @@ txgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,/* set up scalar TX function as appropriate */ txgbe_set_tx_function (dev, txq); -if (hw->devarg.tx_headwb) - err =txgbe_setup_headwb_resources (dev, txq, socket_id); +txgbe_setup_headwb_resources (dev, txq, socket_id); txq->ops->reset (txq); txq->desc_error =0 ;
@@ -4755,15 +4761,14 @@ txgbe_dev_tx_init(struct rte_eth_dev *dev)wr32 (hw,TXGBE_TXRP (txq->reg_idx),0 );wr32 (hw,TXGBE_TXWP (txq->reg_idx),0 ); -if ((hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) && - hw->devarg.tx_headwb) { +if (txq->headwb_mem) {uint32_t txdctl;wr32 (hw,TXGBE_PX_TR_HEAD_ADDRL (txq->reg_idx), (uint32_t )(txq->headwb_dma &BIT_MASK32 ));wr32 (hw,TXGBE_PX_TR_HEAD_ADDRH (txq->reg_idx), (uint32_t )(txq->headwb_dma >>32 )); -if (hw->devarg.tx_headwb_size ==16 ) +if (txq->headwb_size ==16 ) txdctl =TXGBE_PX_TR_CFG_HEAD_WB |TXGBE_PX_TR_CFG_HEAD_WB_64BYTE ;else
drivers/net/txgbe/txgbe_rxtx.h +1 -0
@@ -416,6 +416,7 @@ struct txgbe_tx_queue {uint64_t desc_error;bool resetting;const struct rte_memzone *headwb; +uint16_t headwb_size;uint64_t headwb_dma;volatile uint32_t *headwb_mem; };
drivers/net/txgbe/txgbe_rxtx_vec_common.h +7 -0
@@ -252,6 +252,13 @@ _txgbe_reset_tx_queue_vec(struct txgbe_tx_queue *txq) txq->tx_next_dd = (uint16_t )(txq->tx_free_thresh -1 ); txq->tx_tail =0 ; + +/* Zero out headwb_mem memory */ +if (txq->headwb_mem) { +for (i =0 ; i < txq->headwb_size; i++) + txq->headwb_mem[i] =0 ; + } +/* * Always allow 1 descriptor to be un-allocated to avoid * a H/W race condition
Signature · 1 line
2.21.0.windows.1
PATCH v9 20/21 net/txgbe: fix to enable Tx desc check
In reply to Zaiyu WangNow lib security is enabled by default, and cannot be disabled if the driver is intended to be used. So Tdm_desc_chk is always unable to enable. Remove this restriction, and just enable the corresponding queue check.
--- drivers/net/txgbe/txgbe_rxtx.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/net/txgbe/txgbe_rxtx.c +6 -5
@@ -4761,6 +4761,12 @@ txgbe_dev_tx_init(struct rte_eth_dev *dev)wr32 (hw,TXGBE_TXRP (txq->reg_idx),0 );wr32 (hw,TXGBE_TXWP (txq->reg_idx),0 ); +#ifdef RTE_LIB_SECURITY + if (!txq->using_ipsec) +#endif +wr32m (hw,TXGBE_TDM_DESC_CHK (txq->reg_idx /32 ), +RTE_BIT32 (txq->reg_idx %32 ),RTE_BIT32 (txq->reg_idx %32 )); +if (txq->headwb_mem) {uint32_t txdctl;
@@ -4778,11 +4784,6 @@ txgbe_dev_tx_init(struct rte_eth_dev *dev) } } -#ifndef RTE_LIB_SECURITY -for (i =0 ; i <4 ; i++) -wr32 (hw,TXGBE_TDM_DESC_CHK (i),0xFFFFFFFF ); -#endif -/* Device configured with multiple TX queues. */ txgbe_dev_mq_tx_configure (dev); }
Signature · 1 line
2.21.0.windows.1
PATCH v9 21/21 net/txgbe: fix temperature track for AML NIC
In reply to Zaiyu WangPreviously, temperature tracking for the amlite NIC was handled by firmware together with the hardware setup. However, the firmware-based PHY configuration has proven to be unstable.
Re-add the temperature tracking function directly in the driver and invoke it periodically to ensure the PHY remains calibrated. According to the hardware recommendation, the tracking sequence should be run at least every 100 ms to keep temperature drift within 5 °C. Considering the software and hardware overhead, a 2-second interval is used as a practical trade-off that still meets stability requirements while minimizing performance impact.
The periodic tracking is implemented using a timer in the driver, and the sequence itself is the same as the one originally performed during link setup.
--- drivers/net/txgbe/txgbe_ethdev.c | 44 +++++++++++++++++++++++++++++++- drivers/net/txgbe/txgbe_ethdev.h | 1 + 2 files changed, 44 insertions(+), 1 deletion(-)
drivers/net/txgbe/txgbe_ethdev.c +43 -1
@@ -2011,8 +2011,10 @@ txgbe_dev_start(struct rte_eth_dev *dev)txgbe_filter_restore (dev); hw->bp_event_interval =100 *1000 ; -if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) +if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) {rte_eal_alarm_set (hw->bp_event_interval, txgbe_dev_e56_check_bp_event, dev); +rte_eal_alarm_set (1000 *1000 *2 , txgbe_dev_check_aml_temp_event, dev); + }if (tm_conf->root && !tm_conf->committed) PMD_DRV_LOG(WARNING,
@@ -2060,6 +2062,7 @@ txgbe_dev_stop(struct rte_eth_dev *dev)if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) {rte_eal_alarm_cancel (txgbe_dev_e56_check_bp_event, dev); +rte_eal_alarm_cancel (txgbe_dev_check_aml_temp_event, dev);rte_eal_alarm_cancel (txgbe_dev_setup_link_alarm_handler_aml, hw); }
@@ -2932,6 +2935,45 @@ txgbe_dev_supported_ptypes_get(struct rte_eth_dev *dev, size_t *no_of_elements)return NULL ; } +void txgbe_dev_check_aml_temp_event (void *param) +{ +struct rte_eth_dev *dev = (struct rte_eth_dev *)param; +struct txgbe_hw *hw =TXGBE_DEV_HW (dev); +uint32_t link_speed =0 , val =0 ; +s32 status =0 ; +int temp; + +if (hw ==NULL ) +return ; + + status =txgbe_e56_get_temp (hw, &temp); +if (status) + temp =DEFAULT_TEMP ; + +if (!(temp - hw->temperature >4 || + hw->temperature - temp >4 )) + goto out; + + hw->temperature = temp; + val =rd32 (hw,TXGBE_PORT ); +if (val &TXGBE_AMLITE_LED_LINK_40G ) + link_speed =TXGBE_LINK_SPEED_40GB_FULL ; +else if (val &TXGBE_AMLITE_LED_LINK_25G ) + link_speed =TXGBE_LINK_SPEED_25GB_FULL ; +else + link_speed =TXGBE_LINK_SPEED_10GB_FULL ; + +rte_spinlock_lock (&hw->phy_lock); +if (hw->mac.type == txgbe_mac_aml) +txgbe_temp_track_seq (hw, link_speed); +else if (hw->mac.type == txgbe_mac_aml40) +txgbe_temp_track_seq_40g (hw, link_speed); +rte_spinlock_unlock (&hw->phy_lock); + +out: +rte_eal_alarm_set (1000 *1000 *2 , txgbe_dev_check_aml_temp_event, dev); +} +void txgbe_dev_e56_check_bp_event (void *param) {struct rte_eth_dev *dev = (struct rte_eth_dev *)param;
drivers/net/txgbe/txgbe_ethdev.h +1 -0
@@ -747,5 +747,6 @@ void txgbe_vlan_hw_strip_bitmap_set(struct rte_eth_dev *dev, uint16_t queue, bool on);void txgbe_config_vlan_strip_on_all_queues (struct rte_eth_dev *dev,int mask); +void txgbe_dev_check_aml_temp_event (void *param);void txgbe_dev_e56_check_bp_event (void *param);#endif /* _TXGBE_ETHDEV_H_ */
Signature · 1 line
2.21.0.windows.1
Stephen Hemminger
AppliedQuoted 74 lines · On Mon, 22 Jun 2026 19:10:48 +0800 Zaiyu Wang <[email protected]> wrote:
This series fixes several issues found on Wangxun Emerald, Sapphire and Amber-lite NICs, with a focus on link-related problems.
---
v9:
- Fixed several checkpatch errors
---
v8:
- Fixed compilation error by replacingRTE_ETH_DEV_TO_PCIwithRTE_CLASS_TO_BUS_DEVICE
---
v7:
- Fixed inverted semantics ofis_flat_memto match SFF8636
---
v6:
- Fixed more issues identified by AI review
---
v5:
- Fixed issues identified by AI review
---
v4:
- Fixed issues identified by devtools scripts
---
v3:
- Addressed Stephen's comments
---
v2:
- Fixed compilation error and code style issues
---Zaiyu Wang (21):
net/txgbe: remove duplicate xstats counters net/ngbe: remove duplicate xstats counters net/ngbe: add missing CDR config for YT PHY net/ngbe: fix VF promiscuous and allmulticast net/txgbe: fix inaccuracy in Tx rate limiting net/txgbe: fix link status check condition net/txgbe: fix Tx desc free logic
net/txgbe: fix link flow control registers for Amber-Lite net/txgbe: fix link flow control config for Sapphire net/txgbe: fix a mass of unknown interrupts net/txgbe: fix traffic class priority configuration net/txgbe: fix link stability for 25G NIC net/txgbe: fix link stability for 40G NIC net/txgbe: fix link stability for Amber-Lite backplane mode net/txgbe: fix FEC mode configuration on 25G NIC net/txgbe: fix SFP module identification net/txgbe: fix get module info operation net/txgbe: fix get EEPROM operation
net/txgbe: fix to reset Tx write-back pointer net/txgbe: fix to enable Tx desc check
net/txgbe: fix temperature track for AML NICdrivers/net/ngbe/base/ngbe_phy_yt.c | 3 + drivers/net/ngbe/ngbe_ethdev.c | 5 - drivers/net/ngbe/ngbe_ethdev_vf.c | 11 +- drivers/net/txgbe/base/meson.build | 2 + drivers/net/txgbe/base/txgbe.h | 2 + drivers/net/txgbe/base/txgbe_aml.c | 185 +- drivers/net/txgbe/base/txgbe_aml.h | 6 +- drivers/net/txgbe/base/txgbe_aml40.c | 114 +- drivers/net/txgbe/base/txgbe_aml40.h | 6 +- drivers/net/txgbe/base/txgbe_dcb_hw.c | 2 +- drivers/net/txgbe/base/txgbe_e56.c | 3773 +++++++++++++++++++++ drivers/net/txgbe/base/txgbe_e56.h | 1753 ++++++++++ drivers/net/txgbe/base/txgbe_e56_bp.c | 2597 ++++++++++++++ drivers/net/txgbe/base/txgbe_e56_bp.h | 282 ++ drivers/net/txgbe/base/txgbe_hw.c | 54 +- drivers/net/txgbe/base/txgbe_hw.h | 4 +- drivers/net/txgbe/base/txgbe_osdep.h | 4 + drivers/net/txgbe/base/txgbe_phy.c | 362 +- drivers/net/txgbe/base/txgbe_phy.h | 46 +- drivers/net/txgbe/base/txgbe_regs.h | 13 +- drivers/net/txgbe/base/txgbe_type.h | 43 +- drivers/net/txgbe/txgbe_ethdev.c | 472 ++- drivers/net/txgbe/txgbe_ethdev.h | 7 +-
Quoted 9 lines
drivers/net/txgbe/txgbe_rxtx.c | 109 +- drivers/net/txgbe/txgbe_rxtx.h | 36 + drivers/net/txgbe/txgbe_rxtx_vec_common.h | 17 +- 26 files changed, 9464 insertions(+), 444 deletions(-) create mode 100644 drivers/net/txgbe/base/txgbe_e56.c create mode 100644 drivers/net/txgbe/base/txgbe_e56.h create mode 100644 drivers/net/txgbe/base/txgbe_e56_bp.c create mode 100644 drivers/net/txgbe/base/txgbe_e56_bp.h
Applied to next-net, but this driver still has some unprefixed symbols:
$ nm ./drivers/librte_net_txgbe.a | grep ' [TD] ' | grep -v ' txgbe' 0000000000000510 T set_fields_e56 0000000000007ca0 T handle_e56_bkp_an73_flow
Quoted 97 lines
-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Monday, June 22, 2026 11:30 PM
To: Zaiyu Wang <[email protected]>; Zaiyu Wang <[email protected]>
Cc: [email protected]; [email protected]
Subject: Re: [PATCH v9 00/21] Wangxun FixesQuoted 75 lines · On Mon, 22 Jun 2026 19:10:48 +0800 Zaiyu Wang <[email protected]> wrote:
This series fixes several issues found on Wangxun Emerald, Sapphire and Amber-lite NICs, with a focus on link-related problems.
---
v9:
- Fixed several checkpatch errors
---
v8:
- Fixed compilation error by replacingRTE_ETH_DEV_TO_PCIwithRTE_CLASS_TO_BUS_DEVICE
---
v7:
- Fixed inverted semantics ofis_flat_memto match SFF8636
---
v6:
- Fixed more issues identified by AI review
---
v5:
- Fixed issues identified by AI review
---
v4:
- Fixed issues identified by devtools scripts
---
v3:
- Addressed Stephen's comments
---
v2:
- Fixed compilation error and code style issues
---Zaiyu Wang (21):
net/txgbe: remove duplicate xstats counters net/ngbe: remove duplicate xstats counters net/ngbe: add missing CDR config for YT PHY net/ngbe: fix VF promiscuous and allmulticast net/txgbe: fix inaccuracy in Tx rate limiting net/txgbe: fix link status check condition net/txgbe: fix Tx desc free logic
net/txgbe: fix link flow control registers for Amber-Lite net/txgbe: fix link flow control config for Sapphire net/txgbe: fix a mass of unknown interrupts net/txgbe: fix traffic class priority configuration net/txgbe: fix link stability for 25G NIC net/txgbe: fix link stability for 40G NIC net/txgbe: fix link stability for Amber-Lite backplane mode net/txgbe: fix FEC mode configuration on 25G NIC net/txgbe: fix SFP module identification net/txgbe: fix get module info operation net/txgbe: fix get EEPROM operation
net/txgbe: fix to reset Tx write-back pointer net/txgbe: fix to enable Tx desc check
net/txgbe: fix temperature track for AML NICdrivers/net/ngbe/base/ngbe_phy_yt.c | 3 + drivers/net/ngbe/ngbe_ethdev.c | 5 - drivers/net/ngbe/ngbe_ethdev_vf.c | 11 +- drivers/net/txgbe/base/meson.build | 2 + drivers/net/txgbe/base/txgbe.h | 2 + drivers/net/txgbe/base/txgbe_aml.c | 185 +- drivers/net/txgbe/base/txgbe_aml.h | 6 +- drivers/net/txgbe/base/txgbe_aml40.c | 114 +- drivers/net/txgbe/base/txgbe_aml40.h | 6 +- drivers/net/txgbe/base/txgbe_dcb_hw.c | 2 +- drivers/net/txgbe/base/txgbe_e56.c | 3773 +++++++++++++++++++++ drivers/net/txgbe/base/txgbe_e56.h | 1753 ++++++++++ drivers/net/txgbe/base/txgbe_e56_bp.c | 2597 ++++++++++++++ drivers/net/txgbe/base/txgbe_e56_bp.h | 282 ++ drivers/net/txgbe/base/txgbe_hw.c | 54 +- drivers/net/txgbe/base/txgbe_hw.h | 4 +- drivers/net/txgbe/base/txgbe_osdep.h | 4 + drivers/net/txgbe/base/txgbe_phy.c | 362 +- drivers/net/txgbe/base/txgbe_phy.h | 46 +- drivers/net/txgbe/base/txgbe_regs.h | 13 +- drivers/net/txgbe/base/txgbe_type.h | 43 +- drivers/net/txgbe/txgbe_ethdev.c | 472 ++- drivers/net/txgbe/txgbe_ethdev.h | 7 +-Quoted 9 lines
drivers/net/txgbe/txgbe_rxtx.c | 109 +- drivers/net/txgbe/txgbe_rxtx.h | 36 + drivers/net/txgbe/txgbe_rxtx_vec_common.h | 17 +- 26 files changed, 9464 insertions(+), 444 deletions(-) create mode 100644 drivers/net/txgbe/base/txgbe_e56.c create mode 100644 drivers/net/txgbe/base/txgbe_e56.h create mode 100644 drivers/net/txgbe/base/txgbe_e56_bp.c create mode 100644 drivers/net/txgbe/base/txgbe_e56_bp.h
Quoted 6 lines
Applied to next-net, but this driver still has some unprefixed symbols:
$ nm ./drivers/librte_net_txgbe.a | grep ' [TD] ' | grep -v ' txgbe' 0000000000000510 T set_fields_e56 0000000000007ca0 T handle_e56_bkp_an73_flow
Thanks.
v10 cover Wangxun Fixes
In reply to Zaiyu WangThis series fixes several issues found on Wangxun Emerald, Sapphire and Amber-lite NICs, with a focus on link-related problems.
---
v10:
- Fixed compilation error on clang
- Renamed unprefixed symbols
---
v9:
- Fixed several checkpatch errors
---
v8:
- Fixed compilation error by replacing RTE_ETH_DEV_TO_PCI with RTE_CLASS_TO_BUS_DEVICE
---
v7:
- Fixed inverted semantics of is_flat_mem to match SFF8636
---
v6:
- Fixed more issues identified by AI review
---
v5:
- Fixed issues identified by AI review
---
v4:
- Fixed issues identified by devtools scripts
---
v3:
- Addressed Stephen's comments
---
v2:
- Fixed compilation error and code style issues
---
Zaiyu Wang (21):
net/txgbe: remove duplicate xstats counters net/ngbe: remove duplicate xstats counters net/ngbe: add missing CDR config for YT PHY net/ngbe: fix VF promiscuous and allmulticast net/txgbe: fix inaccuracy in Tx rate limiting net/txgbe: fix link status check condition net/txgbe: fix Tx desc free logic
net/txgbe: fix link flow control registers for Amber-Lite net/txgbe: fix link flow control config for Sapphire net/txgbe: fix a mass of unknown interrupts net/txgbe: fix traffic class priority configuration net/txgbe: fix link stability for 25G NIC net/txgbe: fix link stability for 40G NIC net/txgbe: fix link stability for Amber-Lite backplane mode net/txgbe: fix FEC mode configuration on 25G NIC net/txgbe: fix SFP module identification net/txgbe: fix get module info operation net/txgbe: fix get EEPROM operation
net/txgbe: fix to reset Tx write-back pointer net/txgbe: fix to enable Tx desc check
net/txgbe: fix temperature track for AML NIC
drivers/net/ngbe/base/ngbe_phy_yt.c | 3 + drivers/net/ngbe/ngbe_ethdev.c | 5 - drivers/net/ngbe/ngbe_ethdev_vf.c | 11 +- drivers/net/txgbe/base/meson.build | 2 + drivers/net/txgbe/base/txgbe.h | 2 + drivers/net/txgbe/base/txgbe_aml.c | 185 +- drivers/net/txgbe/base/txgbe_aml.h | 6 +- drivers/net/txgbe/base/txgbe_aml40.c | 114 +- drivers/net/txgbe/base/txgbe_aml40.h | 6 +- drivers/net/txgbe/base/txgbe_dcb_hw.c | 2 +- drivers/net/txgbe/base/txgbe_e56.c | 3746 +++++++++++++++++++++ drivers/net/txgbe/base/txgbe_e56.h | 1778 ++++++++++ drivers/net/txgbe/base/txgbe_e56_bp.c | 2597 ++++++++++++++ drivers/net/txgbe/base/txgbe_e56_bp.h | 282 ++ drivers/net/txgbe/base/txgbe_hw.c | 54 +- drivers/net/txgbe/base/txgbe_hw.h | 4 +- drivers/net/txgbe/base/txgbe_osdep.h | 4 + drivers/net/txgbe/base/txgbe_phy.c | 362 +- drivers/net/txgbe/base/txgbe_phy.h | 46 +- drivers/net/txgbe/base/txgbe_regs.h | 13 +- drivers/net/txgbe/base/txgbe_type.h | 43 +- drivers/net/txgbe/txgbe_ethdev.c | 472 ++- drivers/net/txgbe/txgbe_ethdev.h | 7 +- drivers/net/txgbe/txgbe_rxtx.c | 111 +- drivers/net/txgbe/txgbe_rxtx.h | 38 +- drivers/net/txgbe/txgbe_rxtx_vec_common.h | 17 +- 26 files changed, 9464 insertions(+), 446 deletions(-) create mode 100644 drivers/net/txgbe/base/txgbe_e56.c create mode 100644 drivers/net/txgbe/base/txgbe_e56.h create mode 100644 drivers/net/txgbe/base/txgbe_e56_bp.c create mode 100644 drivers/net/txgbe/base/txgbe_e56_bp.h
Signature · 1 line
2.21.0.windows.1
PATCH v10 1/21 net/txgbe: remove duplicate xstats counters
Remove four redundant counters (tx_xon_packets, rx_xon_packets, tx_xoff_packets and rx_xoff_packets) from xstats, as they were duplicates of tx_flow_control_xon_packets and others. Both sets were reading the same registers but being output twice under different names. After removing these entries, the flow control counters in DPDK now align with those in our Linux kernel driver.
--- drivers/net/txgbe/txgbe_ethdev.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/net/txgbe/txgbe_ethdev.c +0 -5
@@ -261,11 +261,6 @@ static const struct rte_txgbe_xstats_name_off rte_txgbe_stats_strings[] = {HW_XSTAT (tx_size_1024_to_max_packets),/* Flow Control */ -HW_XSTAT (tx_xon_packets), -HW_XSTAT (rx_xon_packets), -HW_XSTAT (tx_xoff_packets), -HW_XSTAT (rx_xoff_packets), -HW_XSTAT_NAME (tx_xon_packets,"tx_flow_control_xon_packets" ),HW_XSTAT_NAME (rx_xon_packets,"rx_flow_control_xon_packets" ), HW_XSTAT_NAME(tx_xoff_packets, "tx_flow_control_xoff_packets"),
Signature · 1 line
2.21.0.windows.1
PATCH v10 2/21 net/ngbe: remove duplicate xstats counters
In reply to Zaiyu WangRemove four redundant counters (tx_xon_packets, rx_xon_packets, tx_xoff_packets and rx_xoff_packets) from xstats, as they were duplicates of tx_flow_control_xon_packets and others. Both sets were reading the same registers but being output twice under different names. After removing these entries, the flow control counters in DPDK now align with those in our Linux kernel driver.
--- drivers/net/ngbe/ngbe_ethdev.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/net/ngbe/ngbe_ethdev.c +0 -5
@@ -227,11 +227,6 @@ static const struct rte_ngbe_xstats_name_off rte_ngbe_stats_strings[] = {HW_XSTAT (tx_size_1024_to_max_packets),/* Flow Control */ -HW_XSTAT (tx_xon_packets), -HW_XSTAT (rx_xon_packets), -HW_XSTAT (tx_xoff_packets), -HW_XSTAT (rx_xoff_packets), -HW_XSTAT_NAME (tx_xon_packets,"tx_flow_control_xon_packets" ),HW_XSTAT_NAME (rx_xon_packets,"rx_flow_control_xon_packets" ), HW_XSTAT_NAME(tx_xoff_packets, "tx_flow_control_xoff_packets"),
Signature · 1 line
2.21.0.windows.1
PATCH v10 3/21 net/ngbe: add missing CDR config for YT PHY
In reply to Zaiyu WangAccording to the PHY vendor, when YT8531S operates in UTP-to-Fiber or RGMII-to-Fiber mode with auto-negotiation disabled (Force mode), additional CDR (Clock Data Recovery) configuration is required to improve link connectivity. Without this config, link may be unstable or fail to establish.
--- drivers/net/ngbe/base/ngbe_phy_yt.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ngbe/base/ngbe_phy_yt.c +3 -0
@@ -264,6 +264,9 @@ s32 ngbe_setup_phy_link_yt(struct ngbe_hw *hw, u32 speed, value =YT_BCR_RESET |YT_BCR_ANE |YT_BCR_RESTART_AN |YT_BCR_DUPLEX |YT_BCR_SPEED_SELECT1 ; }else { +/* force mode need to config cdr */ +ngbe_write_phy_reg_sds_ext_yt (hw,0x3 ,0 ,0x1434 ); +ngbe_write_phy_reg_sds_ext_yt (hw,0xe ,0 ,0x163 ); value =YT_BCR_RESET |YT_BCR_DUPLEX ;if (speed &NGBE_LINK_SPEED_1GB_FULL ) value |=YT_BCR_SPEED_SELECT1 ;
Signature · 1 line
2.21.0.windows.1
PATCH v10 4/21 net/ngbe: fix VF promiscuous and allmulticast
In reply to Zaiyu WangThe configuration of allmulti and promiscuous modes conflicts together. For instance, if we enable promiscuous mode, then enable and disable allmulti, then the promiscuous mode is wrongly disabled.
To resolve this, the following changes are made:
- do nothing when we set/unset allmulti if promiscuous mode is on
- restore the proper mode (none or allmulti) when we disable promiscuous mode
--- drivers/net/ngbe/ngbe_ethdev_vf.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/net/ngbe/ngbe_ethdev_vf.c +9 -2
@@ -1196,9 +1196,13 @@ static int ngbevf_dev_promiscuous_disable(struct rte_eth_dev *dev) {struct ngbe_hw *hw =ngbe_dev_hw (dev); +int mode =NGBEVF_XCAST_MODE_NONE ;int ret; -switch (hw->mac.update_xcast_mode (hw,NGBEVF_XCAST_MODE_NONE )) { +if (dev->data->all_multicast) + mode =NGBEVF_XCAST_MODE_ALLMULTI ; + +switch (hw->mac.update_xcast_mode (hw, mode)) {case 0 : ret =0 ;break ;
@@ -1219,7 +1223,7 @@ ngbevf_dev_allmulticast_enable(struct rte_eth_dev *dev)struct ngbe_hw *hw =ngbe_dev_hw (dev);int ret; -if (dev->data->promiscuous ==1 ) +if (dev->data->promiscuous)return 0 ;switch (hw->mac.update_xcast_mode (hw,NGBEVF_XCAST_MODE_ALLMULTI )) {
@@ -1243,6 +1247,9 @@ ngbevf_dev_allmulticast_disable(struct rte_eth_dev *dev)struct ngbe_hw *hw =ngbe_dev_hw (dev);int ret; +if (dev->data->promiscuous) +return 0 ; +switch (hw->mac.update_xcast_mode (hw,NGBEVF_XCAST_MODE_MULTI )) {case 0 : ret =0 ;
Signature · 1 line
2.21.0.windows.1
PATCH v10 5/21 net/txgbe: fix inaccuracy in Tx rate limiting
In reply to Zaiyu WangAmber-lite NIC's TX rate limiting has large deviations for small packets. To address this, the following changes are made:
1. Set TDM_RL_ADJ (0x1820c) to 21B (includes 7B Ethernet preamble, 1B SFD, 1B EFD, and 12B IPG).
2) Remove the rate offset in the driver (e.g., 105 / 100, a rough compensation value from Linux kernel driver tests).
After these changes, accuracy deviation for 64B packets is within ~5%, while large packets show lower deviation.
--- drivers/net/txgbe/base/txgbe_regs.h | 3 +++ drivers/net/txgbe/txgbe_ethdev.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)
drivers/net/txgbe/base/txgbe_regs.h +3 -0
@@ -1670,6 +1670,9 @@ enum txgbe_5tuple_protocol {#define TXGBE_TDM_FACTOR_INT_SHIFT 16#define TXGBE_TDM_FACTOR_FRA_SHIFT 2 +#define TXGBE_TDM_RL_ADJ 0x1820C +/* Ethernet framing overhead: 7B Ethernet preamble + 1B SFD + 1B EFD + 12B IPG */ +#define TXGBE_FRAME_OVERHEAD 21#define TXGBE_TDM_RL_VM_IDX 0x018218#define TXGBE_TDM_RL_VM_CFG 0x01821C#define TXGBE_TDM_RL_CFG 0x018400
drivers/net/txgbe/txgbe_ethdev.c +1 -1
@@ -4314,7 +4314,6 @@ txgbe_set_queue_rate_limit(struct rte_eth_dev *dev,u16 frac; link_speed = dev->data->dev_link.link_speed; - tx_rate = tx_rate *105 /100 ;/* Calculate the rate factor values to set */ factor_int = link_speed / tx_rate; frac = (link_speed % tx_rate) *10000 / tx_rate;
@@ -4324,6 +4323,7 @@ txgbe_set_queue_rate_limit(struct rte_eth_dev *dev, factor_fra =0 ; } +wr32 (hw,TXGBE_TDM_RL_ADJ ,TXGBE_FRAME_OVERHEAD );wr32 (hw,TXGBE_TDM_RL_QUEUE_IDX , queue_idx);wr32m (hw,TXGBE_TDM_RL_QUEUE_CFG ,TXGBE_TDM_FACTOR_INT_MASK , factor_int <<TXGBE_TDM_FACTOR_INT_SHIFT );
Signature · 1 line
2.21.0.windows.1
PATCH v10 6/21 net/txgbe: fix link status check condition
In reply to Zaiyu WangThe original code incorrectly used 'if (link_up)' instead of 'if (*link_up)', causing the condition to always evaluate to true because the pointer itself is non-NULL. This led to incorrect speed assignment.
--- drivers/net/txgbe/base/txgbe_aml.c | 2 +- drivers/net/txgbe/base/txgbe_aml40.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/txgbe/base/txgbe_aml.c +1 -1
@@ -67,7 +67,7 @@ s32 txgbe_check_mac_link_aml(struct txgbe_hw *hw, u32 *speed, *link_up = false; } -if (link_up) { +if (*link_up) {switch (links_reg &TXGBE_CFG_PORT_ST_AML_LINK_MASK ) {case TXGBE_CFG_PORT_ST_AML_LINK_25G : *speed =TXGBE_LINK_SPEED_25GB_FULL ;
drivers/net/txgbe/base/txgbe_aml40.c +1 -1
@@ -68,7 +68,7 @@ s32 txgbe_check_mac_link_aml40(struct txgbe_hw *hw, u32 *speed, *link_up = false; } -if (link_up) { +if (*link_up) {if ((links_reg &TXGBE_CFG_PORT_ST_AML_LINK_40G ) ==TXGBE_CFG_PORT_ST_AML_LINK_40G ) *speed =TXGBE_LINK_SPEED_40GB_FULL ;
Signature · 1 line
2.21.0.windows.1
PATCH v10 7/21 net/txgbe: fix Tx desc free logic
In reply to Zaiyu WangOn some server environments, this driver caused TDM non-fatal errors or PCIe request errors during Tx operation
In Amber-Lite NIC's Tx head write-back mode, the hardware periodically writes back a head index pointing to the next descriptor it is adout to process in Tx ring. All descriptors before the head are considered processed by hardware and can be safely freed by the driver.
The root cause is that the driver can safely free a batch of descriptors only when the hardware's write-back head pointer has advanced beyond all descriptors in that batch, meaning they have all been processed by the hardware. If the driver frees a descriptor before the hardware has finished processing it, invalid memory access may occur, leading to the observed bug.
To fix the issue, correct the boundary check in all three Tx cleanup functions, each of which was missing the proper condition to prevent freeing unprocessed descriptors.
--- drivers/net/txgbe/txgbe_rxtx.c | 18 +++++------ drivers/net/txgbe/txgbe_rxtx.h | 37 ++++++++++++++++++++++- drivers/net/txgbe/txgbe_rxtx_vec_common.h | 10 +++--- 3 files changed, 50 insertions(+), 15 deletions(-)
drivers/net/txgbe/txgbe_rxtx.c +9 -9
@@ -98,12 +98,11 @@ txgbe_tx_free_bufs(struct txgbe_tx_queue *txq)if (tx_last_dd >= txq->nb_tx_desc) tx_last_dd -= txq->nb_tx_desc; -volatile uint16_t head = (uint16_t )*txq->headwb_mem; +uint32_t h =rte_atomic_load_explicit (txq->headwb_mem, + rte_memory_order_acquire); +const uint16_t head = (uint16_t )h; -if (txq->tx_next_dd > head && head > tx_last_dd) -return 0 ; -else if (tx_last_dd > txq->tx_next_dd && - (head > tx_last_dd || head < txq->tx_next_dd)) +if (!txgbe_tx_headwb_desc_done (head, tx_last_dd, txq->tx_next_dd))return 0 ; }else {/* check DD bit on threshold descriptor */
@@ -645,12 +644,13 @@ txgbe_xmit_cleanup(struct txgbe_tx_queue *txq) status = txr[desc_to_clean_to].dw3;if (txq->headwb_mem) { -u32 head = *txq->headwb_mem; +uint32_t h =rte_atomic_load_explicit (txq->headwb_mem, + rte_memory_order_acquire); +const uint16_t head = (uint16_t )h;PMD_TX_FREE_LOG (DEBUG ,"queue[%02d]: headwb_mem = %03d, desc_to_clean_to = %03d" , txq->reg_idx, head, desc_to_clean_to); -/* we have caught up to head, no work left to do */ -if (desc_to_clean_to == head) +if (!txgbe_tx_headwb_desc_done (head, last_desc_cleaned, desc_to_clean_to))return -(1 ); }else {if (!(status &rte_cpu_to_le_32 (TXGBE_TXD_DD ))) {
@@ -2440,7 +2440,7 @@ txgbe_setup_headwb_resources(struct rte_eth_dev *dev, txq->headwb = headwb; txq->headwb_dma =TMZ_PADDR (headwb); - txq->headwb_mem = (uint32_t *)TMZ_VADDR (headwb); + txq->headwb_mem = (RTE_ATOMIC (uint32_t ) *)TMZ_VADDR (headwb);/* Zero out headwb_mem memory */ for (i =0 ; i < headwb_size; i++)
drivers/net/txgbe/txgbe_rxtx.h +36 -1
@@ -417,7 +417,7 @@ struct txgbe_tx_queue {bool resetting;const struct rte_memzone *headwb;uint64_t headwb_dma; -volatile uint32_t *headwb_mem; +RTE_ATOMIC (uint32_t) *headwb_mem; };struct txgbe_txq_ops {
@@ -426,6 +426,41 @@ struct txgbe_txq_ops {void (*reset)(struct txgbe_tx_queue *txq); }; +/** +* Check whether Tx descriptors in the range (last, next] are done +* in Tx head write-back mode. +* +* In head write-back mode, the hardware periodically updates *headwb_mem +* with the index of the next descriptor it will process. +* All descriptors before the head are considered processed by hardware and can +* be safely freed. The descriptor pointed to by head itself is not yet processed. +* +* @param head +* Current hardware head index read from headwb_mem. +* @param last +* The highest-index descriptor cleaned in the previous round +* (exclusive: descriptors at or before this index are already freed). +* @param next +* The highest-index descriptor to be cleaned in this round +* (inclusive: this descriptor is the target of the current cleanup). +* @return +* true if all descriptors in the range (last, next] have been completed +* by hardware and can be freed, false otherwise. +*/ +static inline bool +txgbe_tx_headwb_desc_done (uint16_t head,uint16_t last,uint16_t next) +{ +if (next == head) +return false; +else if (next > head && head > last) +return false; +/* wrap case */ +else if (last > next && (head > last || head < next)) +return false; + +return true; +} +/* Takes an ethdev and a queue and sets up the tx function to be used based on * the queue parameters. Used in tx_queue_setup by primary process and then * in dev_init by secondary process when attaching to an existing ethdev.
drivers/net/txgbe/txgbe_rxtx_vec_common.h +5 -5
@@ -94,11 +94,11 @@ txgbe_tx_free_bufs(struct txgbe_tx_queue *txq) txq->tx_next_dd - txq->tx_free_thresh;if (tx_last_dd >= txq->nb_tx_desc) tx_last_dd -= txq->nb_tx_desc; -volatile uint16_t head = (uint16_t )*txq->headwb_mem; -if (txq->tx_next_dd > head && head > tx_last_dd) -return 0 ; -else if (tx_last_dd > txq->tx_next_dd && - (head > tx_last_dd || head < txq->tx_next_dd)) +uint32_t h =rte_atomic_load_explicit (txq->headwb_mem, + rte_memory_order_acquire); +const uint16_t head = (uint16_t )h; + +if (!txgbe_tx_headwb_desc_done (head, tx_last_dd, txq->tx_next_dd))return 0 ; }else {/* check DD bit on threshold descriptor */
Signature · 1 line
2.21.0.windows.1
PATCH v10 8/21 net/txgbe: fix link flow control registers for Amber-Lite
In reply to Zaiyu WangThe flow control counter registers on AML NICs differ from those on SP NICs. Update the register offsets accordingly to ensure the counters work correctly.
--- drivers/net/txgbe/base/txgbe_hw.c | 7 ++++++ drivers/net/txgbe/base/txgbe_regs.h | 2 ++ drivers/net/txgbe/base/txgbe_type.h | 4 ++++ drivers/net/txgbe/txgbe_ethdev.c | 34 +++++++++++++++++++---------- 4 files changed, 36 insertions(+), 11 deletions(-)
drivers/net/txgbe/base/txgbe_hw.c +7 -0
@@ -394,6 +394,13 @@ s32 txgbe_clear_hw_cntrs(struct txgbe_hw *hw)rd32 (hw,TXGBE_PBTXLNKXON );rd32 (hw,TXGBE_PBTXLNKXOFF ); +if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) { +wr32 (hw,TXGBE_PBRXLNKXON_AML ,0 ); +wr32 (hw,TXGBE_PBRXLNKXOFF_AML ,0 ); + hw->last_stats.rx_xon_packets =0 ; + hw->last_stats.rx_xoff_packets =0 ; + } +/* DMA Stats */ rd32 (hw,TXGBE_DMARXPKT );rd32 (hw,TXGBE_DMATXPKT );
drivers/net/txgbe/base/txgbe_regs.h +2 -0
@@ -1085,6 +1085,8 @@ enum txgbe_5tuple_protocol {#define TXGBE_PBRXDROP 0x019068#define TXGBE_PBRXLNKXOFF 0x011988#define TXGBE_PBRXLNKXON 0x011E0C +#define TXGBE_PBRXLNKXOFF_AML 0x011F80 +#define TXGBE_PBRXLNKXON_AML 0x011F84#define TXGBE_PBRXUPXON (up) (0x011E30 + (up) * 4)#define TXGBE_PBRXUPXOFF (up) (0x011E10 + (up) * 4)
drivers/net/txgbe/base/txgbe_type.h +4 -0
@@ -876,6 +876,10 @@ struct txgbe_hw {u64 tx_qp_bytes;u64 rx_qp_mc_packets; } qp_last[TXGBE_MAX_QP ]; +struct { +u64 rx_xon_packets; +u64 rx_xoff_packets; + } last_stats;rte_spinlock_t phy_lock;/*amlite: new SW-FW mbox */
drivers/net/txgbe/txgbe_ethdev.c +23 -11
@@ -2264,16 +2264,18 @@ txgbe_dev_reset(struct rte_eth_dev *dev)return ret; } +#define TXGBE_UPDATE_COUNTER_32BIT_GENERIC (reg, last, count, reset) \ + do { \ + uint32_t current = rd32(hw, reg); \ + if ((current) < (last)) \ + current += 0x100000000ULL; \ + if (reset) \ + (last) = current; \ + (count) = (uint32_t)((current) - (last)); \ + } while (0) +#define UPDATE_QP_COUNTER_32bit (reg, last_counter, counter) \ - { \ - uint32_t current_counter = rd32(hw, reg); \ - if (current_counter < last_counter) \ - current_counter += 0x100000000LL; \ - if (!hw->offset_loaded) \ - last_counter = current_counter; \ - counter = current_counter - last_counter; \ - counter &= 0xFFFFFFFFLL; \ - } + TXGBE_UPDATE_COUNTER_32BIT_GENERIC(reg, last_counter, counter, !hw->offset_loaded)#define UPDATE_QP_COUNTER_36bit (reg_lsb, reg_msb, last_counter, counter) \ { \
@@ -2331,8 +2333,18 @@ txgbe_read_stats_registers(struct txgbe_hw *hw, hw_stats->up[i].rx_up_dropped +=rd32 (hw,TXGBE_PBRXMISS (i)); } - hw_stats->rx_xon_packets +=rd32 (hw,TXGBE_PBRXLNKXON ); - hw_stats->rx_xoff_packets +=rd32 (hw,TXGBE_PBRXLNKXOFF ); + +if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) { +TXGBE_UPDATE_COUNTER_32BIT_GENERIC (TXGBE_PBRXLNKXON_AML , + hw->last_stats.rx_xon_packets, + hw_stats->rx_xon_packets, !hw->offset_loaded); +TXGBE_UPDATE_COUNTER_32BIT_GENERIC (TXGBE_PBRXLNKXOFF_AML , + hw->last_stats.rx_xoff_packets, + hw_stats->rx_xoff_packets, !hw->offset_loaded); + }else { + hw_stats->rx_xon_packets +=rd32 (hw,TXGBE_PBRXLNKXON ); + hw_stats->rx_xoff_packets +=rd32 (hw,TXGBE_PBRXLNKXOFF ); + } hw_stats->tx_xon_packets +=rd32 (hw,TXGBE_PBTXLNKXON ); hw_stats->tx_xoff_packets +=rd32 (hw,TXGBE_PBTXLNKXOFF );
Signature · 1 line
2.21.0.windows.1
PATCH v10 9/21 net/txgbe: fix link flow control config for Sapphire
In reply to Zaiyu WangSP chips have a hardware bug preventing XON flow control support, so the driver disables it.
--- drivers/net/txgbe/base/txgbe_hw.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/txgbe/base/txgbe_hw.c +4 -2
@@ -1037,8 +1037,10 @@ s32 txgbe_fc_enable(struct txgbe_hw *hw)for (i =0 ; i <TXGBE_DCB_TC_MAX ; i++) {if ((hw->fc.current_mode & txgbe_fc_tx_pause) && hw->fc.high_water[i]) { - fcrtl =TXGBE_FCWTRLO_TH (hw->fc.low_water[i]) | -TXGBE_FCWTRLO_XON ; + fcrtl =TXGBE_FCWTRLO_TH (hw->fc.low_water[i]); +/* Only AML support XON */ +if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) + fcrtl |=TXGBE_FCWTRLO_XON ; fcrth =TXGBE_FCWTRHI_TH (hw->fc.high_water[i]) |TXGBE_FCWTRHI_XOFF ; }else {
Signature · 1 line
2.21.0.windows.1
PATCH v10 10/21 net/txgbe: fix a mass of unknown interrupts
In reply to Zaiyu WangWhen RSC is enabled, Rx ring IVAR is set to configure ITR. It causes Rx ring interrupts report on the default msix_vector. Thus a mass of unknown interrupts occupy CPU.
Fix the issue by setting ring IVAR only when the rxq interrupt is enabled.
--- drivers/net/txgbe/txgbe_rxtx.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-)
drivers/net/txgbe/txgbe_rxtx.c +17 -13
@@ -4347,6 +4347,8 @@ static int txgbe_set_rsc(struct rte_eth_dev *dev) {struct rte_eth_rxmode *rx_conf = &dev->data->dev_conf.rxmode; +struct rte_pci_device *pci_dev =RTE_CLASS_TO_BUS_DEVICE (dev, *pci_dev); +struct rte_intr_handle *intr_handle = pci_dev->intr_handle;struct txgbe_hw *hw =TXGBE_DEV_HW (dev);struct rte_eth_dev_info dev_info = {0 };bool rsc_capable = false;
@@ -4397,8 +4399,6 @@ txgbe_set_rsc(struct rte_eth_dev *dev)rd32 (hw,TXGBE_RXCFG (rxq->reg_idx));uint32_t psrtype =rd32 (hw,TXGBE_POOLRSS (rxq->reg_idx)); -uint32_t eitr = -rd32 (hw,TXGBE_ITR (rxq->reg_idx));/* * txgbe PMD doesn't support header-split at the moment.
@@ -4417,6 +4417,9 @@ txgbe_set_rsc(struct rte_eth_dev *dev) srrctl |=txgbe_get_rscctl_maxdesc (rxq->mb_pool); psrtype |=TXGBE_POOLRSS_L4HDR ; +wr32 (hw,TXGBE_RXCFG (rxq->reg_idx), srrctl); +wr32 (hw,TXGBE_POOLRSS (rxq->reg_idx), psrtype); +/* * RSC: Set ITR interval corresponding to 2K ints/s. *
@@ -4430,19 +4433,20 @@ txgbe_set_rsc(struct rte_eth_dev *dev)* For a sparse streaming case this setting will yield * at most 500us latency for a single RSC aggregation. */ - eitr &= ~TXGBE_ITR_IVAL_MASK ; - eitr |=TXGBE_ITR_IVAL_10G (TXGBE_QUEUE_ITR_INTERVAL_DEFAULT ); - eitr |=TXGBE_ITR_WRDSA ; +if (rte_intr_dp_is_en (intr_handle)) { +uint32_t eitr =rd32 (hw,TXGBE_ITR (rxq->reg_idx)); -wr32 (hw,TXGBE_RXCFG (rxq->reg_idx), srrctl); -wr32 (hw,TXGBE_POOLRSS (rxq->reg_idx), psrtype); -wr32 (hw,TXGBE_ITR (rxq->reg_idx), eitr); + eitr &= ~TXGBE_ITR_IVAL_MASK ; + eitr |=TXGBE_ITR_IVAL_10G (TXGBE_QUEUE_ITR_INTERVAL_DEFAULT ); + eitr |=TXGBE_ITR_WRDSA ; +wr32 (hw,TXGBE_ITR (rxq->reg_idx), eitr); -/* -* RSC requires the mapping of the queue to the -* interrupt vector. -*/ -txgbe_set_ivar_map (hw,0 , rxq->reg_idx, i); +/* +* RSC requires the mapping of the queue to the +* interrupt vector. +*/ +txgbe_set_ivar_map (hw,0 , rxq->reg_idx, i); + } } dev->data->lro =1 ;
Signature · 1 line
2.21.0.windows.1
PATCH v10 11/21 net/txgbe: fix traffic class priority configuration
In reply to Zaiyu WangAfter applying the following testpmd command, 802.1Q packets with specific priorities were not properly directed to the corresponding traffic classes:
port config 0 dcb vt off 4 pfc off
The old driver had two issues:
1. The hardware uses a 4-bit mapping register per traffic class for priority-to-TC mapping, but the driver incorrectly configured it as 3 bits.
2. The DCB TX configuration mistakenly wrote to the RX register.
Fix both issues, ensuring that tc-prio mapping works as expected. Additionally, remove the stale and inconsistent TXGBE_DCBUP2TC_DEC macro as it has no callers.
--- drivers/net/txgbe/base/txgbe_dcb_hw.c | 2 +- drivers/net/txgbe/base/txgbe_regs.h | 6 ++---- drivers/net/txgbe/txgbe_rxtx.c | 7 ++----- 3 files changed, 5 insertions(+), 10 deletions(-)
drivers/net/txgbe/base/txgbe_dcb_hw.c +1 -1
@@ -154,7 +154,7 @@ s32 txgbe_dcb_config_tx_data_arbiter_raptor(struct txgbe_hw *hw, u16 *refill,for (i =0 ; i <TXGBE_DCB_UP_MAX ; i++) reg |=TXGBE_DCBUP2TC_MAP (i, map[i]); -wr32 (hw,TXGBE_PBRXUP2TC , reg); +wr32 (hw,TXGBE_PBTXUP2TC , reg);/* Configure traffic class credits and priority */ for (i =0 ; i <TXGBE_DCB_TC_MAX ; i++) {
drivers/net/txgbe/base/txgbe_regs.h +2 -4
@@ -503,10 +503,8 @@#define TXGBE_PBRXCTL 0x019000#define TXGBE_PBRXCTL_ST MS(0, 0x1)#define TXGBE_PBRXCTL_ENA MS(31, 0x1) -#define TXGBE_PBRXUP2TC 0x019008#define TXGBE_PBTXUP2TC 0x01C800 -#define TXGBE_DCBUP2TC_MAP (tc, v) LS(v, 3 * (tc), 0x7) -#define TXGBE_DCBUP2TC_DEC (tc, r) RS(r, 3 * (tc), 0x7) +#define TXGBE_DCBUP2TC_MAP (tc, v) LS(v, 4 * (tc), 0x7)#define TXGBE_PBRXSIZE (tc) (0x019020 + (tc) * 4)#define TXGBE_PBRXSIZE_KB (v) LS(v, 10, 0x3FF)
@@ -1705,7 +1703,7 @@ enum txgbe_5tuple_protocol {#define TXGBE_RDM_PF_HIDE (_i) (0x12090 + ((_i) * 4))#define TXGBE_RPUP2TC 0x019008 -#define TXGBE_RPUP2TC_UP_SHIFT 3 +#define TXGBE_RPUP2TC_UP_SHIFT 4#define TXGBE_RPUP2TC_UP_MASK 0x7#define TXGBE_RDM_DCACHE_CTL 0x0120A8
drivers/net/txgbe/txgbe_rxtx.c +2 -5
@@ -3378,11 +3378,8 @@ txgbe_vmdq_dcb_configure(struct rte_eth_dev *dev) queue_mapping =0 ;for (i =0 ; i <RTE_ETH_DCB_NUM_USER_PRIORITIES ; i++) -/* -* mapping is done with 3 bits per priority, -* so shift by i*3 each time -*/ - queue_mapping |= ((cfg->dcb_tc[i] &0x07 ) << (i *3 )); + queue_mapping |= ((cfg->dcb_tc[i] &TXGBE_RPUP2TC_UP_MASK ) << + (i *TXGBE_RPUP2TC_UP_SHIFT ));wr32 (hw,TXGBE_RPUP2TC , queue_mapping);
Signature · 1 line
2.21.0.windows.1
PATCH v10 12/21 net/txgbe: fix link stability for 25G NIC
In reply to Zaiyu WangThe link was previously configured via firmware, but this approach resulted in unstable link behavior. To resolve the issue, re-add the PHY configuration flow directly into the driver.
--- drivers/net/txgbe/base/meson.build | 1 + drivers/net/txgbe/base/txgbe_aml.c | 105 +- drivers/net/txgbe/base/txgbe_aml.h | 6 +- drivers/net/txgbe/base/txgbe_e56.c | 2461 +++++++++++++++++++++++++ drivers/net/txgbe/base/txgbe_e56.h | 1771 ++++++++++++++++++ drivers/net/txgbe/base/txgbe_e56_bp.h | 279 +++ drivers/net/txgbe/base/txgbe_hw.c | 35 +- drivers/net/txgbe/base/txgbe_phy.h | 1 - drivers/net/txgbe/base/txgbe_regs.h | 2 + drivers/net/txgbe/base/txgbe_type.h | 12 + drivers/net/txgbe/txgbe_ethdev.c | 83 +- drivers/net/txgbe/txgbe_ethdev.h | 4 + 12 files changed, 4701 insertions(+), 59 deletions(-) create mode 100644 drivers/net/txgbe/base/txgbe_e56.c create mode 100644 drivers/net/txgbe/base/txgbe_e56.h create mode 100644 drivers/net/txgbe/base/txgbe_e56_bp.h
drivers/net/txgbe/base/meson.build +1 -0
@@ -12,4 +12,5 @@ base_sources = files( 'txgbe_mng.c', 'txgbe_phy.c', 'txgbe_vf.c', + 'txgbe_e56.c', )
drivers/net/txgbe/base/txgbe_aml.c +80 -25
177 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_aml.h +4 -2
@@ -16,7 +16,9 @@ s32 txgbe_get_link_capabilities_aml(struct txgbe_hw *hw, u32 *speed, bool *autoneg);u32 txgbe_get_media_type_aml (struct txgbe_hw *hw);void txgbe_wait_for_link_up_aml (struct txgbe_hw *hw,u32 speed); -s32 txgbe_setup_mac_link_aml (struct txgbe_hw *hw,u32 speed, -bool autoneg_wait_to_complete); +s32 txgbe_setup_phy_link_aml (struct txgbe_hw *hw, +u32 speed, +bool autoneg_wait_to_complete, +bool *need_reset);void txgbe_init_mac_link_ops_aml (struct txgbe_hw *hw);#endif /* _TXGBE_AML_H_ */
drivers/net/txgbe/base/txgbe_e56.c new file +2461 -0
2,461 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_e56.h new file +1771 -0
346 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_e56_bp.h new file +279 -0
279 lines not on this page · raw message
drivers/net/txgbe/txgbe_ethdev.c +82 -1
83 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.21.0.windows.1
Part of the diff is not shown here. View the raw message.
PATCH v10 13/21 net/txgbe: fix link stability for 40G NIC
In reply to Zaiyu WangThe link was previously configured via firmware, but this approach resulted in unstable link behavior. To resolve the issue, re-add the PHY configuration flow directly into the driver.
--- drivers/net/txgbe/base/txgbe_aml40.c | 73 +- drivers/net/txgbe/base/txgbe_aml40.h | 6 +- drivers/net/txgbe/base/txgbe_e56.c | 1473 ++++++++++++++++++++++++-- drivers/net/txgbe/base/txgbe_e56.h | 9 +- drivers/net/txgbe/txgbe_ethdev.c | 4 +- 5 files changed, 1447 insertions(+), 118 deletions(-)
drivers/net/txgbe/base/txgbe_aml40.c +56 -17
@@ -13,6 +13,7 @@#include "txgbe_hw.h" #include "txgbe_aml.h" #include "txgbe_aml40.h" +#include "txgbe_e56.h" void txgbe_init_ops_aml40 (struct txgbe_hw *hw) {
@@ -24,6 +25,7 @@ void txgbe_init_ops_aml40(struct txgbe_hw *hw)/* PHY */ phy->get_media_type = txgbe_get_media_type_aml40; + phy->setup_link_core = txgbe_setup_phy_link_aml40;/* LINK */ mac->init_mac_link_ops = txgbe_init_mac_link_ops_aml40;
@@ -52,6 +54,13 @@ s32 txgbe_check_mac_link_aml40(struct txgbe_hw *hw, u32 *speed,if (link_up_wait_to_complete) {for (i =0 ; i < hw->mac.max_link_up_time; i++) { +if (!hw->link_valid) { + *link_up = false; + +msleep (100 ); +continue ; + } +if (!(links_reg &TXGBE_PORTSTAT_UP )) { *link_up = false; }else {
@@ -68,6 +77,9 @@ s32 txgbe_check_mac_link_aml40(struct txgbe_hw *hw, u32 *speed, *link_up = false; } +if (!hw->link_valid) + *link_up = false; +if (*link_up) {if ((links_reg &TXGBE_CFG_PORT_ST_AML_LINK_40G ) ==TXGBE_CFG_PORT_ST_AML_LINK_40G )
@@ -107,20 +119,24 @@ u32 txgbe_get_media_type_aml40(struct txgbe_hw *hw)return txgbe_media_type_fiber_qsfp; } -s32 txgbe_setup_mac_link_aml40 (struct txgbe_hw *hw, -u32 speed, -bool autoneg_wait_to_complete) +s32 txgbe_setup_phy_link_aml40 (struct txgbe_hw *hw, +u32 speed, +bool autoneg_wait_to_complete, +bool *need_reset) {bool autoneg = false;s32 status =0 ; +s32 ret_status =0 ;u32 link_speed =TXGBE_LINK_SPEED_UNKNOWN ;bool link_up = false; +int i;u32 link_capabilities =TXGBE_LINK_SPEED_UNKNOWN ; +u32 value; -if (hw->phy.sfp_type == txgbe_sfp_type_not_present) { -DEBUGOUT ("SFP not detected, skip setup mac link" ); -return 0 ; - } + *need_reset = false; + +if (hw->phy.sfp_type == txgbe_sfp_type_not_present) + hw->phy.identify_sfp (hw);/* Check to see if speed passed in is supported. */ status = hw->mac.get_link_capabilities(hw,
@@ -132,18 +148,42 @@ s32 txgbe_setup_mac_link_aml40(struct txgbe_hw *hw,if (speed ==TXGBE_LINK_SPEED_UNKNOWN )return TXGBE_ERR_LINK_SETUP ; - status = hw->mac.check_link (hw, &link_speed, &link_up, - autoneg_wait_to_complete); +for (i =0 ; i <4 ; i++) { +txgbe_e56_check_phy_link (hw, &link_speed, &link_up); +if (link_up) +break ; +msleep (250 ); + }if (link_speed == speed && link_up) -return status; - -if (speed &TXGBE_LINK_SPEED_40GB_FULL ) - speed =0x20 ; - - status = hw->phy.set_link_hostif (hw, (u8 )speed, autoneg, true); + goto out; + +rte_spinlock_lock (&hw->phy_lock); + ret_status =txgbe_set_link_to_amlite (hw, speed); +if (ret_status ==TXGBE_ERR_TIMEOUT ) + hw->link_valid = false; +rte_spinlock_unlock (&hw->phy_lock); + +for (i =0 ; i <4 ; i++) { +txgbe_e56_check_phy_link (hw, &link_speed, &link_up); +if (link_up) + goto out; +msleep (250 ); + } -txgbe_wait_for_link_up_aml (hw, speed); +out: +if (link_up) { + value =rd32 (hw,TXGBE_PORTSTAT ); +if (!(value &TXGBE_PORTSTAT_UP )) { +DEBUGOUT ("MAC link 0x14404: 0x%x" , value); + *need_reset = true; + value =rd32 (hw,0x110b0 ); +DEBUGOUT ("MAC intr status 0x110b0: 0x%x" , value); + } + }else { + *need_reset = true; +DEBUGOUT ("Link reconfiguration required. Reset scheduled in 2000ms." ); + }return status; }
@@ -159,6 +199,5 @@ void txgbe_init_mac_link_ops_aml40(struct txgbe_hw *hw) mac->flap_tx_laser = txgbe_flap_tx_laser_multispeed_fiber; - mac->setup_link = txgbe_setup_mac_link_aml40; mac->set_rate_select_speed = txgbe_set_hard_rate_select_speed; }
drivers/net/txgbe/base/txgbe_aml40.h +4 -2
@@ -14,7 +14,9 @@ s32 txgbe_check_mac_link_aml40(struct txgbe_hw *hw,s32 txgbe_get_link_capabilities_aml40 (struct txgbe_hw *hw,u32 *speed,bool *autoneg);u32 txgbe_get_media_type_aml40 (struct txgbe_hw *hw); -s32 txgbe_setup_mac_link_aml40 (struct txgbe_hw *hw,u32 speed, -bool autoneg_wait_to_complete); +s32 txgbe_setup_phy_link_aml40 (struct txgbe_hw *hw, +u32 speed, +bool autoneg_wait_to_complete, +bool *need_reset);void txgbe_init_mac_link_ops_aml40 (struct txgbe_hw *hw);#endif /* _TXGBE_AML40_H_ */
drivers/net/txgbe/base/txgbe_e56.c +1378 -95
1,560 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_e56.h +7 -2
@@ -438,7 +438,12 @@ typedef union {#define E56PHY_FETX_FFE_TRAIN_CFG_0_KRT_FETX_INIT_FFE_CFG_2 9, 8#define E56PHY_FETX_FFE_TRAIN_CFG_0_KRT_FETX_INIT_FFE_CFG_3 13, 12 -#define PHYINIT_TIMEOUT 1000/* PHY initialization timeout value in 0.5ms unit */ +/* PHYINIT_TIMEOUT, a loop iteration counter, not a fixed time unit. +* The actual timeout duration depends on the usec_delay() or msleep() +* value used inside the polling loop. For example, when usec_delay(500) +* is used, the total timeout is approximately PHYINIT_TIMEOUT * 500 us. +*/ +#define PHYINIT_TIMEOUT 1000#define E56G__BASEADDR 0x0
@@ -1754,7 +1759,7 @@ set_fields_e56(unsigned int *src_data, unsigned int bit_high, } } -int txgbe_e56_rx_rd_second_code_40g (struct txgbe_hw *hw,int *SECOND_CODE ,int lane); +void txgbe_e56_rx_rd_second_code_40g (struct txgbe_hw *hw,int *SECOND_CODE ,int lane);void txgbe_e56_rx_rd_second_code (struct txgbe_hw *hw,int *SECOND_CODE );u32 txgbe_e56_cfg_40g (struct txgbe_hw *hw);u32 txgbe_e56_cfg_25g (struct txgbe_hw *hw);
drivers/net/txgbe/txgbe_ethdev.c +2 -2
@@ -2054,7 +2054,7 @@ txgbe_dev_stop(struct rte_eth_dev *dev)PMD_INIT_FUNC_TRACE (); -if (hw->mac.type == txgbe_mac_aml) +if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40)rte_eal_alarm_cancel (txgbe_dev_setup_link_alarm_handler_aml, hw);rte_eal_alarm_cancel (txgbe_dev_detect_sfp, dev);
@@ -3206,7 +3206,7 @@ txgbe_dev_setup_link_thread_handler(void *param)struct txgbe_hw *hw =TXGBE_DEV_HW (dev);rte_thread_detach (rte_thread_self ()); -if (hw->mac.type == txgbe_mac_aml) +if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40)txgbe_dev_setup_link_alarm_handler_aml (hw);else txgbe_dev_setup_link_alarm_handler (dev);
Signature · 1 line
2.21.0.windows.1
Re: [PATCH v10 13/21] net/txgbe: fix link stability for 40G NIC
Quoted 24 lines · On Wed, 24 Jun 2026 19:52:45 +0800 Zaiyu Wang <[email protected]> wrote:
drivers/net/txgbe/base/txgbe_e56.c +24
-0+ +void txgbe_e56_rx_rd_second_code_40g (struct txgbe_hw *hw,int *SECOND_CODE ,int lane) +{ +int i, median; +unsigned int rdata; +u32 addr; +int RXS_BBCDR_SECOND_ORDER_ST [RXS_READ_COUNT ]; + +/* Set ovrd_en=0 to read ASIC value */ + addr =E56G__RXS0_ANA_OVRDEN_1_ADDR + (lane *E56PHY_RXS_OFFSET ); + rdata =rd32_ephy (hw, addr); +EPHY_XFLD (E56G__RXS0_ANA_OVRDEN_1 , ovrd_en_ana_bbcdr_int_cstm_i) =0 ; +wr32_ephy (hw, addr, rdata); + +/* +* As status update from RXS hardware is asynchronous to read status of SECOND_ORDER, +* follow sequence mentioned below. +*/ +for (i =0 ; i <RXS_READ_COUNT ; i = i +1 ) { + addr =E56G__RXS0_ANA_OVRDVAL_5_ADDR + (lane *E56PHY_RXS_OFFSET ); + rdata =rd32_ephy (hw, addr); +RXS_BBCDR_SECOND_ORDER_ST [i] =EPHY_XFLD (E56G__RXS0_ANA_OVRDVAL_5 , + ana_bbcdr_int_cstm_i); +usec_delay (100 );
drivers/net/txgbe/base/txgbe_e56.c int txgbe_e56_set_rxs_ufine_le_max(struct txgbe_hw *hw, u32 speed) · line 1806
Quoted 10 lines
drivers/net/txgbe/base/txgbe_e56.c +10
-0+ } + +/* sort array RXS_BBCDR_SECOND_ORDER_ST[i] */ +qsort (RXS_BBCDR_SECOND_ORDER_ST ,RXS_READ_COUNT ,sizeof (int ), txgbe_e56_int_cmp); + + median = ((RXS_READ_COUNT +1 ) /2 ) -1 ; + *SECOND_CODE =RXS_BBCDR_SECOND_ORDER_ST [median]; + +return ; +}
These extra returns are causing extra checkpatch warnings. I know this is base code but if possible could you remove them.
WARNING:RETURN_VOID: void function return statements are not generally useful #707: FILE: drivers/net/txgbe/base/txgbe_e56.c:1806:
+ return;
+}
WARNING:RETURN_VOID: void function return statements are not generally useful #736: FILE: drivers/net/txgbe/base/txgbe_e56.c:1835:
+ return;
+}
RE: [PATCH v10 13/21] net/txgbe: fix link stability for 40G NIC
Quoted 45 lines
Quoted 23 lines
drivers/net/txgbe/base/txgbe_e56.c +23
-0+void txgbe_e56_rx_rd_second_code_40g (struct txgbe_hw *hw,int *SECOND_CODE ,int lane) +{ +int i, median; +unsigned int rdata; +u32 addr; +int RXS_BBCDR_SECOND_ORDER_ST [RXS_READ_COUNT ]; + +/* Set ovrd_en=0 to read ASIC value */ + addr =E56G__RXS0_ANA_OVRDEN_1_ADDR + (lane *E56PHY_RXS_OFFSET ); + rdata =rd32_ephy (hw, addr); +EPHY_XFLD (E56G__RXS0_ANA_OVRDEN_1 , ovrd_en_ana_bbcdr_int_cstm_i) =0 ; +wr32_ephy (hw, addr, rdata); + +/* +* As status update from RXS hardware is asynchronous to read status of SECOND_ORDER, +* follow sequence mentioned below. +*/ +for (i =0 ; i <RXS_READ_COUNT ; i = i +1 ) { + addr =E56G__RXS0_ANA_OVRDVAL_5_ADDR + (lane *E56PHY_RXS_OFFSET ); + rdata =rd32_ephy (hw, addr); +RXS_BBCDR_SECOND_ORDER_ST [i] =EPHY_XFLD (E56G__RXS0_ANA_OVRDVAL_5 , + ana_bbcdr_int_cstm_i); +usec_delay (100 );drivers/net/txgbe/base/txgbe_e56.c int txgbe_e56_set_rxs_ufine_le_max(struct txgbe_hw *hw, u32 speed) · line 1806
Quoted 10 lines
drivers/net/txgbe/base/txgbe_e56.c +10
-0+ } + +/* sort array RXS_BBCDR_SECOND_ORDER_ST[i] */ +qsort (RXS_BBCDR_SECOND_ORDER_ST ,RXS_READ_COUNT ,sizeof (int ), txgbe_e56_int_cmp); + + median = ((RXS_READ_COUNT +1 ) /2 ) -1 ; + *SECOND_CODE =RXS_BBCDR_SECOND_ORDER_ST [median]; + +return ; +}These extra returns are causing extra checkpatch warnings. I know this is base code but if possible could you remove them.
WARNING:RETURN_VOID: void function return statements are not generally useful #707: FILE:
drivers/net/txgbe/base/txgbe_e56.c:1806:(quoted diff) +2
-0+ return; +}WARNING:RETURN_VOID: void function return statements are not generally useful #736: FILE:
drivers/net/txgbe/base/txgbe_e56.c:1835:
Review
Quoted 2 lines
(quoted diff) +2
-0+ return; +}
Alternatively, it can be declared as a static function. It is only invoked in this .c file.
Re: [PATCH v10 13/21] net/txgbe: fix link stability for 40G NIC
Quoted 43 lines · On Thu, 25 Jun 2026 09:44:07 +0800 Jiawen Wu <[email protected]> wrote:
Quoted 43 lines
Quoted 23 lines
drivers/net/txgbe/base/txgbe_e56.c +23
-0+void txgbe_e56_rx_rd_second_code_40g (struct txgbe_hw *hw,int *SECOND_CODE ,int lane) +{ +int i, median; +unsigned int rdata; +u32 addr; +int RXS_BBCDR_SECOND_ORDER_ST [RXS_READ_COUNT ]; + +/* Set ovrd_en=0 to read ASIC value */ + addr =E56G__RXS0_ANA_OVRDEN_1_ADDR + (lane *E56PHY_RXS_OFFSET ); + rdata =rd32_ephy (hw, addr); +EPHY_XFLD (E56G__RXS0_ANA_OVRDEN_1 , ovrd_en_ana_bbcdr_int_cstm_i) =0 ; +wr32_ephy (hw, addr, rdata); + +/* +* As status update from RXS hardware is asynchronous to read status of SECOND_ORDER, +* follow sequence mentioned below. +*/ +for (i =0 ; i <RXS_READ_COUNT ; i = i +1 ) { + addr =E56G__RXS0_ANA_OVRDVAL_5_ADDR + (lane *E56PHY_RXS_OFFSET ); + rdata =rd32_ephy (hw, addr); +RXS_BBCDR_SECOND_ORDER_ST [i] =EPHY_XFLD (E56G__RXS0_ANA_OVRDVAL_5 , + ana_bbcdr_int_cstm_i); +usec_delay (100 );drivers/net/txgbe/base/txgbe_e56.c int txgbe_e56_set_rxs_ufine_le_max(struct txgbe_hw *hw, u32 speed) · line 1806
Quoted 10 lines
drivers/net/txgbe/base/txgbe_e56.c +10
-0+ } + +/* sort array RXS_BBCDR_SECOND_ORDER_ST[i] */ +qsort (RXS_BBCDR_SECOND_ORDER_ST ,RXS_READ_COUNT ,sizeof (int ), txgbe_e56_int_cmp); + + median = ((RXS_READ_COUNT +1 ) /2 ) -1 ; + *SECOND_CODE =RXS_BBCDR_SECOND_ORDER_ST [median]; + +return ; +}These extra returns are causing extra checkpatch warnings. I know this is base code but if possible could you remove them.
WARNING:RETURN_VOID: void function return statements are not generally useful #707: FILE:
drivers/net/txgbe/base/txgbe_e56.c:1806:(quoted diff) +2
-0+ return; +}
Quoted 8 lines
Review
Quoted 4 lines
WARNING:RETURN_VOID: void function return statements are not generally useful #736: FILE:
drivers/net/txgbe/base/txgbe_e56.c:1835:(quoted diff) +2
-0+ return; +}Alternatively, it can be declared as a static function. It is only invoked in this .c file.
Checkpatch complains about the extra return (it is old BSD stylism). Like I said, not a big deal; just showing it.
RE: [PATCH v10 13/21] net/txgbe: fix link stability for 40G NIC
Quoted 69 lines
-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Thursday, June 25, 2026 10:26 AM
To: Jiawen Wu <[email protected]>; Jiawen Wu <[email protected]>
Cc: 'Zaiyu Wang' <[email protected]>; [email protected]; [email protected]; 'Zaiyu Wang' <[email protected]>; [email protected]; [email protected]
Subject: Re: [PATCH v10 13/21] net/txgbe: fix link stability for 40G NICQuoted 7 lines · On Thu, 25 Jun 2026 09:44:07 +0800 Jiawen Wu <[email protected]> wrote:
Quoted 7 lines
Quoted 7 lines
drivers/net/txgbe/base/txgbe_e56.c +7
-0+void txgbe_e56_rx_rd_second_code_40g (struct txgbe_hw *hw,int +*SECOND_CODE ,int lane) { +int i, median; +unsigned int rdata; +u32 addr; +int RXS_BBCDR_SECOND_ORDER_ST [RXS_READ_COUNT ]; +Quoted 8 lines
Quoted 8 lines
drivers/net/txgbe/base/txgbe_e56.c int txgbe_e56_set_rxs_ufine_le_max(struct txgbe_hw *hw, u32 speed)
Quoted 8 lines
drivers/net/txgbe/base/txgbe_e56.c +8
-0+/* Set ovrd_en=0 to read ASIC value */ + addr =E56G__RXS0_ANA_OVRDEN_1_ADDR + (lane *E56PHY_RXS_OFFSET ); + rdata =rd32_ephy (hw, addr); +EPHY_XFLD (E56G__RXS0_ANA_OVRDEN_1 , ovrd_en_ana_bbcdr_int_cstm_i) =0 ; +wr32_ephy (hw, addr, rdata); + +/* +* As status update from RXS hardware is asynchronous to read status of
SECOND_ORDER,Quoted 30 lines
Quoted 30 lines
Quoted 9 lines
drivers/net/txgbe/base/txgbe_e56.c +9
-0+* follow sequence mentioned below. +*/ +for (i =0 ; i <RXS_READ_COUNT ; i = i +1 ) { + addr =E56G__RXS0_ANA_OVRDVAL_5_ADDR + (lane *E56PHY_RXS_OFFSET ); + rdata =rd32_ephy (hw, addr); +RXS_BBCDR_SECOND_ORDER_ST [i] =EPHY_XFLD (E56G__RXS0_ANA_OVRDVAL_5 , + ana_bbcdr_int_cstm_i); +usec_delay (100 ); + }drivers/net/txgbe/base/txgbe_e56.c int txgbe_e56_set_rxs_ufine_le_max(struct txgbe_hw *hw, u32 speed) · line 1806
Quoted 10 lines
drivers/net/txgbe/base/txgbe_e56.c +10
-0+ +/* sort array RXS_BBCDR_SECOND_ORDER_ST[i] */ +qsort (RXS_BBCDR_SECOND_ORDER_ST ,RXS_READ_COUNT ,sizeof (int ), +txgbe_e56_int_cmp); + + median = ((RXS_READ_COUNT +1 ) /2 ) -1 ; + *SECOND_CODE =RXS_BBCDR_SECOND_ORDER_ST [median]; + +return ; +}These extra returns are causing extra checkpatch warnings. I know this is base code but if possible could you remove them.
WARNING:RETURN_VOID: void function return statements are not generally useful
#707: FILE:drivers/net/txgbe/base/txgbe_e56.c:1806:(quoted diff) +2
-0+ return; +}Quoted 9 lines
Review
Quoted 5 lines
WARNING:RETURN_VOID: void function return statements are not generally useful
#736: FILE:drivers/net/txgbe/base/txgbe_e56.c:1835:(quoted diff) +2
-0+ return; +}Alternatively, it can be declared as a static function. It is only invoked in this .c file.
Quoted 3 lines
Checkpatch complains about the extra return (it is old BSD stylism). Like I said, not a big deal; just showing it.
Thanks.
Since this is not a critical issue and the current patch series has already been applied, I would prefer to leave these returns as-is for now. I will address them together with the upcoming PHY configuration updates in a future patch series.
PATCH v10 14/21 net/txgbe: fix link stability for Amber-Lite backplane mode
In reply to Zaiyu WangThe link was previously configured via firmware, but this approach resulted in unstable link behavior. To resolve the issue, re-add the PHY configuration flow directly into the driver.
--- drivers/net/txgbe/base/meson.build | 1 + drivers/net/txgbe/base/txgbe.h | 2 + drivers/net/txgbe/base/txgbe_aml.c | 65 +- drivers/net/txgbe/base/txgbe_aml40.c | 43 +- drivers/net/txgbe/base/txgbe_e56.c | 22 +- drivers/net/txgbe/base/txgbe_e56.h | 2 + drivers/net/txgbe/base/txgbe_e56_bp.c | 2597 +++++++++++++++++++++++++ drivers/net/txgbe/base/txgbe_e56_bp.h | 3 + drivers/net/txgbe/base/txgbe_hw.c | 6 + drivers/net/txgbe/base/txgbe_hw.h | 4 +- drivers/net/txgbe/base/txgbe_osdep.h | 4 + drivers/net/txgbe/base/txgbe_phy.c | 21 + drivers/net/txgbe/base/txgbe_phy.h | 22 + drivers/net/txgbe/base/txgbe_type.h | 25 +- drivers/net/txgbe/txgbe_ethdev.c | 109 +- drivers/net/txgbe/txgbe_ethdev.h | 2 +- 16 files changed, 2898 insertions(+), 30 deletions(-) create mode 100644 drivers/net/txgbe/base/txgbe_e56_bp.c
drivers/net/txgbe/base/meson.build +1 -0
@@ -13,4 +13,5 @@ base_sources = files( 'txgbe_phy.c', 'txgbe_vf.c', 'txgbe_e56.c', + 'txgbe_e56_bp.c', )
drivers/net/txgbe/base/txgbe.h +2 -0
@@ -13,5 +13,7 @@#include "txgbe_hw.h" #include "txgbe_vf.h" #include "txgbe_dcb.h" +#include "txgbe_e56.h" +#include "txgbe_e56_bp.h" #endif /* _TXGBE_H_ */
drivers/net/txgbe/base/txgbe_aml.c +54 -11
102 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_aml40.c +39 -4
73 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_e56.c +12 -10
@@ -26,7 +26,7 @@ int txgbe_e56_int_cmp(const void *a, const void *b) }s32 txgbe_e56_check_phy_link (struct txgbe_hw *hw,u32 *speed, -bool *link_up) +bool *link_up) {u32 rdata =0 ;u32 links_reg =0 ;
@@ -74,7 +74,8 @@ u32 txgbe_e56_tx_ffe_cfg(struct txgbe_hw *hw, u32 speed) post =S10G_TX_FFE_CFG_POST ; }else if (speed ==TXGBE_LINK_SPEED_25GB_FULL ) {if (hw->phy.sfp_type == txgbe_sfp_type_da_cu_core0 || - hw->phy.sfp_type == txgbe_sfp_type_da_cu_core1) { + hw->phy.sfp_type == txgbe_sfp_type_da_cu_core1 || +txgbe_is_backplane (hw)) { ffe_main =S25G_TX_FFE_CFG_DAC_MAIN ; pre1 =S25G_TX_FFE_CFG_DAC_PRE1 ; pre2 =S25G_TX_FFE_CFG_DAC_PRE2 ;
@@ -92,7 +93,8 @@ u32 txgbe_e56_tx_ffe_cfg(struct txgbe_hw *hw, u32 speed) post =S10G_TX_FFE_CFG_POST ;if (hw->phy.sfp_type == txgbe_qsfp_type_40g_cu_core0 || - hw->phy.sfp_type == txgbe_qsfp_type_40g_cu_core1) { + hw->phy.sfp_type == txgbe_qsfp_type_40g_cu_core1 || +txgbe_is_backplane (hw)) { ffe_main =S40G_TX_FFE_CFG_MAIN ; pre1 =S40G_TX_FFE_CFG_PRE1 ; pre2 =S40G_TX_FFE_CFG_PRE2 ;
@@ -1481,7 +1483,7 @@ txgbe_e56_rxs_osc_init_for_temp_track_range(struct txgbe_hw *hw, u32 speed) rdata =rd32_ephy (hw, addr);if (timer++ >PHYINIT_TIMEOUT ) { -DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!\n" ); +DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!" );return -1 ; } }
@@ -1515,7 +1517,7 @@ txgbe_e56_rxs_osc_init_for_temp_track_range(struct txgbe_hw *hw, u32 speed)if (((rdata >> (i *8 )) &0x3f ) ==0x21 )break ;if (timer++ >PHYINIT_TIMEOUT ) { -DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!\n" ); +DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!" );return -1 ; } }
@@ -1591,7 +1593,7 @@ txgbe_e56_rxs_osc_init_for_temp_track_range(struct txgbe_hw *hw, u32 speed) addr =E56PHY_CTRL_FSM_RX_STAT_0_ADDR ; rdata =rd32_ephy (hw, addr);if (timer++ >PHYINIT_TIMEOUT ) { -DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!\n" ); +DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!" );return -1 ; } }
@@ -1637,7 +1639,7 @@ txgbe_e56_rxs_osc_init_for_temp_track_range(struct txgbe_hw *hw, u32 speed)if (((rdata >> (i *8 )) &0x3f ) ==0x21 )break ;if (timer++ >PHYINIT_TIMEOUT ) { -DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!\n" ); +DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!" );return -1 ; } }
@@ -1902,7 +1904,7 @@ int txgbe_temp_track_seq_40g(struct txgbe_hw *hw, u32 speed)CMVAR_UFINE_FMIN_WRAP =S25G_CMVAR_UFINE_FMIN_WRAP ;CMVAR_FINE_FMIN_WRAP =S25G_CMVAR_FINE_FMIN_WRAP ; }else { -DEBUGOUT ("Error Speed\n" ); +DEBUGOUT ("Error Speed" );return 0 ; }
@@ -3163,7 +3165,7 @@ static int txgbe_e56_disable_rx40G(struct txgbe_hw *hw) rdata =rd32_ephy (hw, addr);usec_delay (100 );if (timer++ >PHYINIT_TIMEOUT ) { -DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!\n" ); +DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!" );break ; } }
@@ -3269,7 +3271,7 @@ static int txgbe_e56_disable_rx(struct txgbe_hw *hw)break ;usec_delay (100 );if (timer++ >PHYINIT_TIMEOUT ) { -DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!\n" ); +DEBUGOUT ("ERROR: Wait E56PHY_CTRL_FSM_RX_STAT_0_ADDR Timeout!" );break ; } }
drivers/net/txgbe/base/txgbe_e56.h +2 -0
@@ -1769,6 +1769,8 @@ int txgbe_temp_track_seq(struct txgbe_hw *hw, u32 speed);int txgbe_e56_get_temp (struct txgbe_hw *hw,int *temp);int txgbe_set_link_to_amlite (struct txgbe_hw *hw,u32 speed);int txgbe_e56_reconfig_rx (struct txgbe_hw *hw,u32 speed); +s32 txgbe_e56_check_phy_link (struct txgbe_hw *hw,u32 *speed, +bool *link_up);s32 txgbe_e56_fec_set (struct txgbe_hw *hw);s32 txgbe_e56_fec_polling (struct txgbe_hw *hw,bool *link_up);u32 txgbe_e56_tx_ffe_cfg (struct txgbe_hw *hw,u32 speed);
drivers/net/txgbe/base/txgbe_e56_bp.c new file +2597 -0
2,597 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_e56_bp.h +3 -0
@@ -276,4 +276,7 @@ typedef union {#define E56PHY_CMS_ANA_OVRDVAL_10_ADDR (E56PHY_CMS_BASE_ADDR + 0xD8)#define E56PHY_CMS_ANA_OVRDVAL_7_ANA_LCPLL_LF_LPF_SETCODE_CALIB_I 8, 4 +int txgbe_e56_set_phy_link_mode (struct txgbe_hw *hw, +u8 bp_link_mode,u32 need_restart); +int txgbe_handle_e56_bkp_an73_flow (struct txgbe_hw *hw);#endif
drivers/net/txgbe/base/txgbe_hw.c +6 -0
@@ -4071,6 +4071,12 @@ s32 txgbe_reset_pipeline_raptor(struct txgbe_hw *hw)return err; } +bool txgbe_is_backplane (struct txgbe_hw *hw) +{ +return hw->phy.get_media_type (hw) == txgbe_media_type_backplane ? + true : false; +} +bool txgbe_gpio_ext_check (struct txgbe_hw *hw,u8 gpio_ext_mask) {u32 gpio_ext =rd32 (hw,TXGBE_GPIOEXT );
drivers/net/txgbe/base/txgbe_hw.h +2 -2
@@ -118,6 +118,6 @@ s32 txgbe_reinit_fdir_tables(struct txgbe_hw *hw);bool txgbe_verify_lesm_fw_enabled_raptor (struct txgbe_hw *hw);s32 txgbe_fmgr_cmd_op (struct txgbe_hw *hw,u32 cmd,u32 cmd_addr);s32 txgbe_flash_read_dword (struct txgbe_hw *hw,u32 addr,u32 *data); -s32 txgbe_e56_check_phy_link (struct txgbe_hw *hw,u32 *speed, -bool *link_up); +bool txgbe_is_backplane (struct txgbe_hw *hw); +bool txgbe_gpio_ext_check (struct txgbe_hw *hw,u8 gpio_ext_mask);#endif /* _TXGBE_HW_H_ */
drivers/net/txgbe/base/txgbe_osdep.h +4 -0
@@ -162,6 +162,10 @@ static inline u64 REVERT_BIT_MASK64(u64 mask) ((mask &0xFFFFFFFF00000000 ) >>32 ); } +#define BITS_PER_LONG (__SIZEOF_LONG__ * 8) +#define GENMASK (h, l) \ + (((~0UL) << (l)) & (~0UL >> (BITS_PER_LONG - 1 - (h)))) +#define IOMEM #define BIT (nr) (1UL << (nr))
drivers/net/txgbe/base/txgbe_phy.c +21 -0
@@ -2503,6 +2503,27 @@ void txgbe_set_phy_temp(struct txgbe_hw *hw) } } +int txgbe_is_dac_cable (struct txgbe_hw *hw) +{ +if (hw->phy.sfp_type == txgbe_sfp_type_da_cu_core0 || + hw->phy.sfp_type == txgbe_sfp_type_da_cu_core1 || + hw->phy.sfp_type == txgbe_sfp_type_da_act_lmt_core0 || + hw->phy.sfp_type == txgbe_sfp_type_da_act_lmt_core1 || + hw->phy.sfp_type == txgbe_qsfp_type_40g_cu_core0 || + hw->phy.sfp_type == txgbe_qsfp_type_40g_cu_core1) +return true; + +return false; +} + +int txgbe_xpcs_an_enabled (struct txgbe_hw *hw) +{ +if (!(txgbe_is_dac_cable (hw) ||txgbe_is_backplane (hw))) +return false; + +return hw->devarg.auto_neg ? true : false; +} +/** * txgbe_kr_handle - Handle the interrupt of auto-negotiation * @hw: pointer to hardware structure
drivers/net/txgbe/base/txgbe_phy.h +22 -0
@@ -105,6 +105,8 @@#define VR_AN_INTR_CMPLT MS16(0, 0x1)#define VR_AN_INTR_LINK MS16(1, 0x1)#define VR_AN_INTR_PG_RCV MS16(2, 0x1) +#define TXGBE_E56_AN_TXDIS MS16(3, 0x1) +#define TXGBE_E56_AN_PG_RCV MS16(4, 0x1)#define VR_AN_KR_MODE_CL 0x078003#define VR_AN_KR_MODE_CL_PDET MS16(0, 0x1)#define VR_XS_OR_PCS_MMD_DIGI_CTL1 0x038000
@@ -428,6 +430,24 @@#define TXGBE_BP_M_NAUTO 0#define TXGBE_BP_M_AUTO 1 +#define kr_read_poll (op, val, cond, sleep_us, \ + times, args...) \ +({ \ + unsigned long __sleep_us = (sleep_us); \ + u32 __times = (times); \ + u32 i; \ + int __cond = 0; \ + for (i = 0; i < __times; i++) { \ + (val) = op(args); \ + if (cond) { \ + __cond = 1; \ + break; \ + } \ + usec_delay(__sleep_us);\ + } \ + (__cond) ? 0 : -1; \ +}) +#ifndef CL72_KRTR_PRBS_MODE_EN #define CL72_KRTR_PRBS_MODE_EN 0xFFFF/* open kr prbs check */ #endif
@@ -490,6 +510,8 @@ void txgbe_autoc_write(struct txgbe_hw *hw, u64 value);void txgbe_bp_mode_set (struct txgbe_hw *hw);void txgbe_set_phy_temp (struct txgbe_hw *hw);void txgbe_bp_down_event (struct txgbe_hw *hw); +int txgbe_is_dac_cable (struct txgbe_hw *hw); +int txgbe_xpcs_an_enabled (struct txgbe_hw *hw);s32 txgbe_kr_handle (struct txgbe_hw *hw);#endif /* _TXGBE_PHY_H_ */
drivers/net/txgbe/base/txgbe_type.h +24 -1
@@ -719,6 +719,7 @@ struct txgbe_phy_info {u32 addr;u32 id;enum txgbe_sfp_type sfp_type; +u32 fiber_suppport_speed;bool sfp_setup_needed;u32 revision;u32 media_type;
@@ -740,6 +741,7 @@ struct txgbe_phy_info {u16 ffe_pre2;u16 ffe_post;u16 fec_mode; +u16 bp_capa; };#define TXGBE_DEVARG_BP_AUTO "auto_neg"
@@ -899,7 +901,28 @@ struct txgbe_hw {u32 cur_fec_link;int temperature;u32 bp_link_mode; -}; +bool dac_sfp; +bool bypass_ctle; +u32 curbp_link_mode; +bool an_done;
Lines of this file are not shown. View the raw message.
drivers/net/txgbe/txgbe_ethdev.c +108 -1
109 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.21.0.windows.1
Part of the diff is not shown here. View the raw message.
PATCH v10 15/21 net/txgbe: fix FEC mode configuration on 25G NIC
In reply to Zaiyu WangThe 25G NIC offers off, RS, Base-R, and auto FEC modes. When reconfiguring the PHY, the FEC mode must match on both sides; otherwise, the link cannot come up. The current driver fails to maintain this requirement, causing link instability.
Add proper FEC mode handling during PHY reconfiguration to guarantee link establishment.
--- drivers/net/txgbe/base/txgbe_aml.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/net/txgbe/base/txgbe_aml.c +12 -1
@@ -282,6 +282,14 @@ s32 txgbe_setup_phy_link_aml(struct txgbe_hw *hw, !(hw->fec_mode & hw->cur_fec_link))) goto out; +if (speed ==TXGBE_LINK_SPEED_25GB_FULL && + link_speed ==TXGBE_LINK_SPEED_25GB_FULL ) { +txgbe_e56_fec_polling (hw, &link_up); + +if (link_up) + goto out; + } +rte_spinlock_lock (&hw->phy_lock); ret_status =txgbe_set_link_to_amlite (hw, speed);rte_spinlock_unlock (&hw->phy_lock);
@@ -360,7 +368,10 @@ static s32 txgbe_setup_mac_link_multispeed_fiber_aml(struct txgbe_hw *hw,/* If we already have link at this speed, just jump out */ txgbe_e56_check_phy_link (hw, &link_speed, &link_up); -if (link_speed ==TXGBE_LINK_SPEED_25GB_FULL && link_up) + hw->cur_fec_link =txgbe_phy_fec_get (hw); + +if (link_speed ==TXGBE_LINK_SPEED_25GB_FULL && link_up && + hw->fec_mode & hw->cur_fec_link) goto out;/* Allow module to change analog characteristics (10G -> 25G) */
Signature · 1 line
2.21.0.windows.1
PATCH v10 16/21 net/txgbe: fix SFP module identification
In reply to Zaiyu WangSome optical modules were not correctly recognized due to ambiguous classification in the original detection flow. Rework the module identification logic to cover all module types. Also narrow the I2C lock scope to avoid potential race conditions during module access.
--- drivers/net/txgbe/base/txgbe_hw.c | 2 - drivers/net/txgbe/base/txgbe_phy.c | 341 ++++++++++------------------ drivers/net/txgbe/base/txgbe_phy.h | 18 +- drivers/net/txgbe/base/txgbe_type.h | 2 + 4 files changed, 134 insertions(+), 229 deletions(-)
drivers/net/txgbe/base/txgbe_hw.c +0 -2
@@ -2909,8 +2909,6 @@ s32 txgbe_init_ops_generic(struct txgbe_hw *hw) phy->read_i2c_eeprom = txgbe_read_i2c_eeprom; phy->write_i2c_eeprom = txgbe_write_i2c_eeprom; phy->identify_sfp = txgbe_identify_module; - phy->read_i2c_byte_unlocked = txgbe_read_i2c_byte_unlocked; - phy->write_i2c_byte_unlocked = txgbe_write_i2c_byte_unlocked; phy->check_overtemp = txgbe_check_overtemp; phy->reset = txgbe_reset_phy; phy->set_link_hostif = txgbe_hic_ephy_set_link;
drivers/net/txgbe/base/txgbe_phy.c +119 -222
471 lines not on this page · raw message
drivers/net/txgbe/base/txgbe_phy.h +13 -5
@@ -261,7 +261,9 @@#define TXGBE_SFF_SFF_8472_COMP 0x5E#define TXGBE_SFF_SFF_8472_OSCB 0x6E#define TXGBE_SFF_SFF_8472_ESCB 0x76 +#define TXGBE_SFF_QSFP_PAGE_SELECT 0x7F +#define TXGBE_SFF_IDENTIFIER_QSFP 0x0C#define TXGBE_SFF_IDENTIFIER_QSFP_PLUS 0x0D#define TXGBE_SFF_QSFP_VENDOR_OUI_BYTE0 0xA5#define TXGBE_SFF_QSFP_VENDOR_OUI_BYTE1 0xA6
@@ -289,6 +291,9 @@#define TXGBE_SFF_4x10GBASESR_CAP 0x11#define TXGBE_SFF_40GBASEPSM4_PARALLEL 0x12#define TXGBE_SFF_40GBASE_SWMD4_CAP 0x1f +#define TXGBE_SFF_COPPER_5M 0x5 +#define TXGBE_SFF_COPPER_3M 0x3 +#define TXGBE_SFF_COPPER_1M 0x1#define TXGBE_SFF_DA_SPEC_ACTIVE_LIMITING 0x4#define TXGBE_SFF_25GAUI_C2M_AOC_BER_5 0x1
@@ -296,6 +301,11 @@#define TXGBE_SFF_25GAUI_C2M_AOC_BER_12 0x18#define TXGBE_SFF_25GAUI_C2M_ACC_BER_12 0x19 +#define TXGBE_ETHERNET_COMP_OFFSET 0x83 +#define TXGBE_SFF_ETHERNET_40G_CR4 MS(3, 0x1) +#define TXGBE_SFF_ETHERNET_40G_SR4 MS(2, 0x1) +#define TXGBE_SFF_ETHERNET_40G_LR4 MS(1, 0x1) +#define TXGBE_SFF_SOFT_RS_SELECT_MASK 0x8#define TXGBE_SFF_SOFT_RS_SELECT_10G 0x8#define TXGBE_SFF_SOFT_RS_SELECT_1G 0x0
@@ -493,14 +503,12 @@ s32 txgbe_identify_qsfp_module(struct txgbe_hw *hw);s32 txgbe_check_overtemp (struct txgbe_hw *hw);s32 txgbe_read_i2c_byte (struct txgbe_hw *hw,u8 byte_offset,u8 dev_addr,u8 *data); -s32 txgbe_read_i2c_byte_unlocked (struct txgbe_hw *hw,u8 byte_offset, -u8 dev_addr,u8 *data);s32 txgbe_write_i2c_byte (struct txgbe_hw *hw,u8 byte_offset,u8 dev_addr,u8 data); -s32 txgbe_write_i2c_byte_unlocked (struct txgbe_hw *hw,u8 byte_offset, -u8 dev_addr,u8 data);s32 txgbe_read_i2c_sff8472 (struct txgbe_hw *hw,u8 byte_offset, -u8 *sff8472_data); +u8 *sff8472_data); +s32 txgbe_read_i2c_sff8636 (struct txgbe_hw *hw,u8 page,u8 byte_offset, +u8 *sff8636_data);s32 txgbe_read_i2c_eeprom (struct txgbe_hw *hw,u8 byte_offset,u8 *eeprom_data); s32 txgbe_write_i2c_eeprom(struct txgbe_hw *hw, u8 byte_offset,
drivers/net/txgbe/base/txgbe_type.h +2 -0
@@ -702,6 +702,8 @@ struct txgbe_phy_info { u8 dev_addr, u8 data);s32 (*read_i2c_sff8472)(struct txgbe_hw *hw,u8 byte_offset,u8 *sff8472_data); +s32 (*read_i2c_sff8636)(struct txgbe_hw *hw,u8 page,u8 byte_offset, +u8 *sff8636_data);s32 (*read_i2c_eeprom)(struct txgbe_hw *hw,u8 byte_offset,u8 *eeprom_data); s32 (*write_i2c_eeprom)(struct txgbe_hw *hw, u8 byte_offset,
Signature · 1 line
2.21.0.windows.1
PATCH v10 17/21 net/txgbe: fix get module info operation
In reply to Zaiyu WangThe original I2C access flow in the module information retrieval process was flawed. Correct the implementation to properly fetch module info.
--- drivers/net/txgbe/base/txgbe_phy.h | 6 +- drivers/net/txgbe/txgbe_ethdev.c | 118 +++++++++++++++++++++++------ 2 files changed, 98 insertions(+), 26 deletions(-)
drivers/net/txgbe/base/txgbe_phy.h +5 -1
@@ -258,10 +258,14 @@#define TXGBE_SFF_CABLE_DA_ACTIVE 0x8#define TXGBE_SFF_CABLE_SPEC_COMP 0x3C#define TXGBE_SFF_SFF_8472_SWAP 0x5C +#define TXGBE_SFF_DDM_IMPLEMENTED 0x40#define TXGBE_SFF_SFF_8472_COMP 0x5E#define TXGBE_SFF_SFF_8472_OSCB 0x6E#define TXGBE_SFF_SFF_8472_ESCB 0x76 -#define TXGBE_SFF_QSFP_PAGE_SELECT 0x7F +#define TXGBE_SFF_SFF_REVISION_ADDR 0x01 +#define TXGBE_SFF_QSFP_PAGE_SELECT 0x7F + +#define TXGBE_MODULE_QSFP_MAX_LEN 640#define TXGBE_SFF_IDENTIFIER_QSFP 0x0C#define TXGBE_SFF_IDENTIFIER_QSFP_PLUS 0x0D
drivers/net/txgbe/txgbe_ethdev.c +93 -25
134 lines not on this page · raw message
Signature · 1 line
2.21.0.windows.1
PATCH v10 18/21 net/txgbe: fix get EEPROM operation
In reply to Zaiyu WangThe original I2C access flow in the module information retrieval process was flawed. Correct the implementation to properly fetch module info.
--- drivers/net/txgbe/base/txgbe_phy.h | 1 + drivers/net/txgbe/txgbe_ethdev.c | 81 +++++++++++++++++++++++++++--- 2 files changed, 76 insertions(+), 6 deletions(-)
drivers/net/txgbe/base/txgbe_phy.h +1 -0
@@ -245,6 +245,7 @@/* EEPROM (dev_addr = 0xA0) */ #define TXGBE_I2C_EEPROM_DEV_ADDR 0xA0#define TXGBE_SFF_IDENTIFIER 0x00 +#define TXGBE_SFF_8636_STATUS_OFFSET 0x02#define TXGBE_SFF_IDENTIFIER_SFP 0x03#define TXGBE_SFF_VENDOR_OUI_BYTE0 0x25#define TXGBE_SFF_VENDOR_OUI_BYTE1 0x26
drivers/net/txgbe/txgbe_ethdev.c +75 -6
98 lines not on this page · raw message
Signature · 1 line
2.21.0.windows.1
PATCH v10 19/21 net/txgbe: fix to reset Tx write-back pointer
In reply to Zaiyu WangThe write-back pointer was not reset when the Tx queue was reset. This leads to the wrong Tx desc free logic. Move the resetting of pointer into txq->ops->reset(txq).
--- drivers/net/txgbe/txgbe_rxtx.c | 45 +++++++++++++---------- drivers/net/txgbe/txgbe_rxtx.h | 1 + drivers/net/txgbe/txgbe_rxtx_vec_common.h | 7 ++++ 3 files changed, 33 insertions(+), 20 deletions(-)
drivers/net/txgbe/txgbe_rxtx.c +25 -20
@@ -2313,6 +2313,12 @@ txgbe_reset_tx_queue(struct txgbe_tx_queue *txq) txq->tx_next_dd = (uint16_t )(txq->tx_free_thresh -1 ); txq->tx_tail =0 ; +/* Zero out headwb_mem memory */ +if (txq->headwb_mem) { +for (i =0 ; i < txq->headwb_size; i++) + txq->headwb_mem[i] =0 ; + } +/* * Always allow 1 descriptor to be un-allocated to avoid * a H/W race condition
@@ -2412,7 +2418,7 @@ txgbe_get_tx_port_offloads(struct rte_eth_dev *dev)return tx_offload_capa; } -static int +static void txgbe_setup_headwb_resources (struct rte_eth_dev *dev,void *tx_queue,unsigned int socket_id)
@@ -2420,33 +2426,33 @@ txgbe_setup_headwb_resources(struct rte_eth_dev *dev,struct txgbe_hw *hw =TXGBE_DEV_HW (dev);const struct rte_memzone *headwb;struct txgbe_tx_queue *txq = tx_queue; -u8 i, headwb_size =0 ; +u8 headwb_size =0 ; -if (hw->mac.type != txgbe_mac_aml && hw->mac.type != txgbe_mac_aml40) { - txq->headwb_mem =NULL ; -return 0 ; - } +if (hw->mac.type != txgbe_mac_aml && hw->mac.type != txgbe_mac_aml40) + goto out; + +if (!hw->devarg.tx_headwb) + goto out; - headwb_size = hw->devarg.tx_headwb_size; + headwb_size = txq->headwb_size; headwb =rte_eth_dma_zone_reserve (dev,"tx_headwb_mem" , txq->queue_id,sizeof (u32) * headwb_size,TXGBE_ALIGN , socket_id);if (headwb ==NULL ) { -DEBUGOUT ("Fail to setup headwb resources: no mem" ); -txgbe_tx_queue_release (txq); -return -ENOMEM ; +PMD_DRV_LOG (INFO , +"Failed to allocate headwb memory for Tx queue %u, change to SP mode" , + txq->queue_id); + goto out; } txq->headwb = headwb; txq->headwb_dma =TMZ_PADDR (headwb); txq->headwb_mem = (RTE_ATOMIC (uint32_t ) *)TMZ_VADDR (headwb); +return ; -/* Zero out headwb_mem memory */ -for (i =0 ; i < headwb_size; i++) - txq->headwb_mem[i] =0 ; - -return 0 ; +out: + txq->headwb_mem =NULL ; }int __rte_cold
@@ -2542,6 +2548,7 @@ txgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, txq->offloads = offloads; txq->ops = &def_txq_ops; txq->tx_deferred_start = tx_conf->tx_deferred_start; + txq->headwb_size = hw->devarg.tx_headwb_size;#ifdef RTE_LIB_SECURITY txq->using_ipsec = !!(dev->data->dev_conf.txmode.offloads &RTE_ETH_TX_OFFLOAD_SECURITY );
@@ -2577,8 +2584,7 @@ txgbe_dev_tx_queue_setup(struct rte_eth_dev *dev,/* set up scalar TX function as appropriate */ txgbe_set_tx_function (dev, txq); -if (hw->devarg.tx_headwb) - err =txgbe_setup_headwb_resources (dev, txq, socket_id); +txgbe_setup_headwb_resources (dev, txq, socket_id); txq->ops->reset (txq); txq->desc_error =0 ;
@@ -4755,15 +4761,14 @@ txgbe_dev_tx_init(struct rte_eth_dev *dev)wr32 (hw,TXGBE_TXRP (txq->reg_idx),0 );wr32 (hw,TXGBE_TXWP (txq->reg_idx),0 ); -if ((hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) && - hw->devarg.tx_headwb) { +if (txq->headwb_mem) {uint32_t txdctl;wr32 (hw,TXGBE_PX_TR_HEAD_ADDRL (txq->reg_idx), (uint32_t )(txq->headwb_dma &BIT_MASK32 ));wr32 (hw,TXGBE_PX_TR_HEAD_ADDRH (txq->reg_idx), (uint32_t )(txq->headwb_dma >>32 )); -if (hw->devarg.tx_headwb_size ==16 ) +if (txq->headwb_size ==16 ) txdctl =TXGBE_PX_TR_CFG_HEAD_WB |TXGBE_PX_TR_CFG_HEAD_WB_64BYTE ;else
drivers/net/txgbe/txgbe_rxtx.h +1 -0
@@ -416,6 +416,7 @@ struct txgbe_tx_queue {uint64_t desc_error;bool resetting;const struct rte_memzone *headwb; +uint16_t headwb_size;uint64_t headwb_dma;RTE_ATOMIC (uint32_t) *headwb_mem; };
drivers/net/txgbe/txgbe_rxtx_vec_common.h +7 -0
@@ -252,6 +252,13 @@ _txgbe_reset_tx_queue_vec(struct txgbe_tx_queue *txq) txq->tx_next_dd = (uint16_t )(txq->tx_free_thresh -1 ); txq->tx_tail =0 ; + +/* Zero out headwb_mem memory */ +if (txq->headwb_mem) { +for (i =0 ; i < txq->headwb_size; i++) + txq->headwb_mem[i] =0 ; + } +/* * Always allow 1 descriptor to be un-allocated to avoid * a H/W race condition
Signature · 1 line
2.21.0.windows.1
PATCH v10 20/21 net/txgbe: fix to enable Tx desc check
In reply to Zaiyu WangNow lib security is enabled by default, and cannot be disabled if the driver is intended to be used. So Tdm_desc_chk is always unable to enable. Remove this restriction, and just enable the corresponding queue check.
--- drivers/net/txgbe/txgbe_rxtx.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/net/txgbe/txgbe_rxtx.c +6 -5
@@ -4761,6 +4761,12 @@ txgbe_dev_tx_init(struct rte_eth_dev *dev)wr32 (hw,TXGBE_TXRP (txq->reg_idx),0 );wr32 (hw,TXGBE_TXWP (txq->reg_idx),0 ); +#ifdef RTE_LIB_SECURITY + if (!txq->using_ipsec) +#endif +wr32m (hw,TXGBE_TDM_DESC_CHK (txq->reg_idx /32 ), +RTE_BIT32 (txq->reg_idx %32 ),RTE_BIT32 (txq->reg_idx %32 )); +if (txq->headwb_mem) {uint32_t txdctl;
@@ -4778,11 +4784,6 @@ txgbe_dev_tx_init(struct rte_eth_dev *dev) } } -#ifndef RTE_LIB_SECURITY -for (i =0 ; i <4 ; i++) -wr32 (hw,TXGBE_TDM_DESC_CHK (i),0xFFFFFFFF ); -#endif -/* Device configured with multiple TX queues. */ txgbe_dev_mq_tx_configure (dev); }
Signature · 1 line
2.21.0.windows.1
PATCH v10 21/21 net/txgbe: fix temperature track for AML NIC
In reply to Zaiyu WangPreviously, temperature tracking for the amlite NIC was handled by firmware together with the hardware setup. However, the firmware-based PHY configuration has proven to be unstable.
Re-add the temperature tracking function directly in the driver and invoke it periodically to ensure the PHY remains calibrated. According to the hardware recommendation, the tracking sequence should be run at least every 100 ms to keep temperature drift within 5 °C. Considering the software and hardware overhead, a 2-second interval is used as a practical trade-off that still meets stability requirements while minimizing performance impact.
The periodic tracking is implemented using a timer in the driver, and the sequence itself is the same as the one originally performed during link setup.
--- drivers/net/txgbe/txgbe_ethdev.c | 44 +++++++++++++++++++++++++++++++- drivers/net/txgbe/txgbe_ethdev.h | 1 + 2 files changed, 44 insertions(+), 1 deletion(-)
drivers/net/txgbe/txgbe_ethdev.c +43 -1
@@ -2011,8 +2011,10 @@ txgbe_dev_start(struct rte_eth_dev *dev)txgbe_filter_restore (dev); hw->bp_event_interval =100 *1000 ; -if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) +if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) {rte_eal_alarm_set (hw->bp_event_interval, txgbe_dev_e56_check_bp_event, dev); +rte_eal_alarm_set (1000 *1000 *2 , txgbe_dev_check_aml_temp_event, dev); + }if (tm_conf->root && !tm_conf->committed) PMD_DRV_LOG(WARNING,
@@ -2060,6 +2062,7 @@ txgbe_dev_stop(struct rte_eth_dev *dev)if (hw->mac.type == txgbe_mac_aml || hw->mac.type == txgbe_mac_aml40) {rte_eal_alarm_cancel (txgbe_dev_e56_check_bp_event, dev); +rte_eal_alarm_cancel (txgbe_dev_check_aml_temp_event, dev);rte_eal_alarm_cancel (txgbe_dev_setup_link_alarm_handler_aml, hw); }
@@ -2932,6 +2935,45 @@ txgbe_dev_supported_ptypes_get(struct rte_eth_dev *dev, size_t *no_of_elements)return NULL ; } +void txgbe_dev_check_aml_temp_event (void *param) +{ +struct rte_eth_dev *dev = (struct rte_eth_dev *)param; +struct txgbe_hw *hw =TXGBE_DEV_HW (dev); +uint32_t link_speed =0 , val =0 ; +s32 status =0 ; +int temp; + +if (hw ==NULL ) +return ; + + status =txgbe_e56_get_temp (hw, &temp); +if (status) + temp =DEFAULT_TEMP ; + +if (!(temp - hw->temperature >4 || + hw->temperature - temp >4 )) + goto out; + + hw->temperature = temp; + val =rd32 (hw,TXGBE_PORT ); +if (val &TXGBE_AMLITE_LED_LINK_40G ) + link_speed =TXGBE_LINK_SPEED_40GB_FULL ; +else if (val &TXGBE_AMLITE_LED_LINK_25G ) + link_speed =TXGBE_LINK_SPEED_25GB_FULL ; +else + link_speed =TXGBE_LINK_SPEED_10GB_FULL ; + +rte_spinlock_lock (&hw->phy_lock); +if (hw->mac.type == txgbe_mac_aml) +txgbe_temp_track_seq (hw, link_speed); +else if (hw->mac.type == txgbe_mac_aml40) +txgbe_temp_track_seq_40g (hw, link_speed); +rte_spinlock_unlock (&hw->phy_lock); + +out: +rte_eal_alarm_set (1000 *1000 *2 , txgbe_dev_check_aml_temp_event, dev); +} +void txgbe_dev_e56_check_bp_event (void *param) {struct rte_eth_dev *dev = (struct rte_eth_dev *)param;
drivers/net/txgbe/txgbe_ethdev.h +1 -0
@@ -747,5 +747,6 @@ void txgbe_vlan_hw_strip_bitmap_set(struct rte_eth_dev *dev, uint16_t queue, bool on);void txgbe_config_vlan_strip_on_all_queues (struct rte_eth_dev *dev,int mask); +void txgbe_dev_check_aml_temp_event (void *param);void txgbe_dev_e56_check_bp_event (void *param);#endif /* _TXGBE_ETHDEV_H_ */
Signature · 1 line
2.21.0.windows.1
Stephen Hemminger
AppliedQuoted 78 lines · On Wed, 24 Jun 2026 19:52:32 +0800 Zaiyu Wang <[email protected]> wrote:
This series fixes several issues found on Wangxun Emerald, Sapphire and Amber-lite NICs, with a focus on link-related problems.
---
v10:
- Fixed compilation error on clang
- Renamed unprefixed symbols
---
v9:
- Fixed several checkpatch errors
---
v8:
- Fixed compilation error by replacingRTE_ETH_DEV_TO_PCIwithRTE_CLASS_TO_BUS_DEVICE
---
v7:
- Fixed inverted semantics ofis_flat_memto match SFF8636
---
v6:
- Fixed more issues identified by AI review
---
v5:
- Fixed issues identified by AI review
---
v4:
- Fixed issues identified by devtools scripts
---
v3:
- Addressed Stephen's comments
---
v2:
- Fixed compilation error and code style issues
---Zaiyu Wang (21):
net/txgbe: remove duplicate xstats counters net/ngbe: remove duplicate xstats counters net/ngbe: add missing CDR config for YT PHY net/ngbe: fix VF promiscuous and allmulticast net/txgbe: fix inaccuracy in Tx rate limiting net/txgbe: fix link status check condition net/txgbe: fix Tx desc free logic
net/txgbe: fix link flow control registers for Amber-Lite net/txgbe: fix link flow control config for Sapphire net/txgbe: fix a mass of unknown interrupts net/txgbe: fix traffic class priority configuration net/txgbe: fix link stability for 25G NIC net/txgbe: fix link stability for 40G NIC net/txgbe: fix link stability for Amber-Lite backplane mode net/txgbe: fix FEC mode configuration on 25G NIC net/txgbe: fix SFP module identification net/txgbe: fix get module info operation net/txgbe: fix get EEPROM operation
net/txgbe: fix to reset Tx write-back pointer net/txgbe: fix to enable Tx desc check
net/txgbe: fix temperature track for AML NICdrivers/net/ngbe/base/ngbe_phy_yt.c | 3 + drivers/net/ngbe/ngbe_ethdev.c | 5 - drivers/net/ngbe/ngbe_ethdev_vf.c | 11 +- drivers/net/txgbe/base/meson.build | 2 + drivers/net/txgbe/base/txgbe.h | 2 + drivers/net/txgbe/base/txgbe_aml.c | 185 +- drivers/net/txgbe/base/txgbe_aml.h | 6 +- drivers/net/txgbe/base/txgbe_aml40.c | 114 +- drivers/net/txgbe/base/txgbe_aml40.h | 6 +- drivers/net/txgbe/base/txgbe_dcb_hw.c | 2 +- drivers/net/txgbe/base/txgbe_e56.c | 3746 +++++++++++++++++++++ drivers/net/txgbe/base/txgbe_e56.h | 1778 ++++++++++ drivers/net/txgbe/base/txgbe_e56_bp.c | 2597 ++++++++++++++ drivers/net/txgbe/base/txgbe_e56_bp.h | 282 ++ drivers/net/txgbe/base/txgbe_hw.c | 54 +- drivers/net/txgbe/base/txgbe_hw.h | 4 +- drivers/net/txgbe/base/txgbe_osdep.h | 4 + drivers/net/txgbe/base/txgbe_phy.c | 362 +- drivers/net/txgbe/base/txgbe_phy.h | 46 +- drivers/net/txgbe/base/txgbe_regs.h | 13 +- drivers/net/txgbe/base/txgbe_type.h | 43 +- drivers/net/txgbe/txgbe_ethdev.c | 472 ++- drivers/net/txgbe/txgbe_ethdev.h | 7 +-
Quoted 9 lines
drivers/net/txgbe/txgbe_rxtx.c | 111 +- drivers/net/txgbe/txgbe_rxtx.h | 38 +- drivers/net/txgbe/txgbe_rxtx_vec_common.h | 17 +- 26 files changed, 9464 insertions(+), 446 deletions(-) create mode 100644 drivers/net/txgbe/base/txgbe_e56.c create mode 100644 drivers/net/txgbe/base/txgbe_e56.h create mode 100644 drivers/net/txgbe/base/txgbe_e56_bp.c create mode 100644 drivers/net/txgbe/base/txgbe_e56_bp.h
Applied to net-next.
If you want to cleanup some of the checkpatch warnings, I can swap in a new version.