net/cxgbe: rework link config and add FEC support
cover net/cxgbe: rework link config and add FEC support
This series of patches rework link handling and add support to configure Forward Error Correction (FEC) capability.
Patch 1 removes legacy 16-bit link capabilities infrastructure and always enables 32-bit link capabilities in firmware.
Patch 2 simplifies link handling in preparation for FEC support.
Patch 3 adds support to configure link FEC when supported.
Thanks,
Rahul
Karra Satwik (3):
net/cxgbe: remove legacy 16-bit link capabilities net/cxgbe: rework and simplify link handling code net/cxgbe: implement ethdev ops to configure link FEC
doc/guides/nics/cxgbe.rst | 14 +- drivers/net/cxgbe/base/adapter.h | 10 - drivers/net/cxgbe/base/common.h | 71 +-- drivers/net/cxgbe/base/t4_hw.c | 648 +++++++++++------------- drivers/net/cxgbe/base/t4fw_interface.h | 87 +--- drivers/net/cxgbe/base/t4vf_hw.c | 86 +--- drivers/net/cxgbe/cxgbe_ethdev.c | 201 +++++++- drivers/net/cxgbe/cxgbe_main.c | 21 +- 8 files changed, 565 insertions(+), 573 deletions(-)
Signature · 1 line
2.24.0
PATCH 1/3 net/cxgbe: remove legacy 16-bit link capabilities
From: Karra Satwik <[email protected]>
Remove legacy 16-bit link capabilities and always request for the 32-bit link capabilities from firmware.
--- doc/guides/nics/cxgbe.rst | 14 +- drivers/net/cxgbe/base/common.h | 9 - drivers/net/cxgbe/base/t4_hw.c | 233 +++++------------------- drivers/net/cxgbe/base/t4fw_interface.h | 70 +------ drivers/net/cxgbe/base/t4vf_hw.c | 79 +++----- 5 files changed, 78 insertions(+), 327 deletions(-)
doc/guides/nics/cxgbe.rst +7 -7
@@ -70,7 +70,7 @@ in :ref:`t5-nics` and :ref:`t6-nics`. Prerequisites ------------- -- Requires firmware version **1.24.11.0** and higher. Visit +- Requires firmware version **1.24.17.0** and higher. Visit `Chelsio Download Center <http://service.chelsio.com>`_ to get latest firmware bundled with the latest Chelsio Unified Wire package.
@@ -404,7 +404,7 @@ Unified Wire package for Linux operating system are as follows: .. code-block:: console - firmware-version: 1.24.11.0, TP 0.1.23.2 + firmware-version: 1.24.17.0, TP 0.1.23.2 Running testpmd ~~~~~~~~~~~~~~~
@@ -462,7 +462,7 @@ devices managed by librte_net_cxgbe in Linux operating system. EAL: PCI memory mapped at 0x7fd7c0200000 EAL: PCI memory mapped at 0x7fd77cdfd000 EAL: PCI memory mapped at 0x7fd7c10b7000 - PMD: rte_cxgbe_pmd: fw: 1.24.11.0, TP: 0.1.23.2 + PMD: rte_cxgbe_pmd: fw: 1.24.17.0, TP: 0.1.23.2 PMD: rte_cxgbe_pmd: Coming up as MASTER: Initializing adapter Interactive-mode selected Configuring Port 0 (socket 0)
@@ -568,7 +568,7 @@ virtual functions. [...] EAL: PCI device 0000:02:01.0 on NUMA socket 0 EAL: probe driver: 1425:5803 net_cxgbevf - PMD: rte_cxgbe_pmd: Firmware version: 1.24.11.0 + PMD: rte_cxgbe_pmd: Firmware version: 1.24.17.0 PMD: rte_cxgbe_pmd: TP Microcode version: 0.1.23.2 PMD: rte_cxgbe_pmd: Chelsio rev 0 PMD: rte_cxgbe_pmd: No bootstrap loaded
@@ -576,7 +576,7 @@ virtual functions. PMD: rte_cxgbe_pmd: 0000:02:01.0 Chelsio rev 0 1G/10GBASE-SFP EAL: PCI device 0000:02:01.1 on NUMA socket 0 EAL: probe driver: 1425:5803 net_cxgbevf - PMD: rte_cxgbe_pmd: Firmware version: 1.24.11.0 + PMD: rte_cxgbe_pmd: Firmware version: 1.24.17.0 PMD: rte_cxgbe_pmd: TP Microcode version: 0.1.23.2 PMD: rte_cxgbe_pmd: Chelsio rev 0 PMD: rte_cxgbe_pmd: No bootstrap loaded
@@ -654,7 +654,7 @@ Unified Wire package for FreeBSD operating system are as follows: .. code-block:: console - dev.t5nex.0.firmware_version: 1.24.11.0 + dev.t5nex.0.firmware_version: 1.24.17.0 Running testpmd ~~~~~~~~~~~~~~~
@@ -772,7 +772,7 @@ devices managed by librte_net_cxgbe in FreeBSD operating system. EAL: PCI memory mapped at 0x8007ec000 EAL: PCI memory mapped at 0x842800000 EAL: PCI memory mapped at 0x80086c000 - PMD: rte_cxgbe_pmd: fw: 1.24.11.0, TP: 0.1.23.2 + PMD: rte_cxgbe_pmd: fw: 1.24.17.0, TP: 0.1.23.2 PMD: rte_cxgbe_pmd: Coming up as MASTER: Initializing adapter Interactive-mode selected Configuring Port 0 (socket 0)
drivers/net/cxgbe/base/common.h +0 -9
@@ -274,7 +274,6 @@ struct adapter_params {struct arch_specific_params arch;/* chip specific params */ bool ulptx_memwrite_dsgl;/* use of T5 DSGL allowed */ -u8 fw_caps_support;/* 32-bit Port Capabilities */ u8 filter2_wr_support;/* FW support for FILTER2_WR */ u32 viid_smt_extn_support:1; /* FW returns vin and smt index */u32 max_tx_coalesce_num;/* Max # of Tx packets that can be coalesced */
@@ -282,15 +281,8 @@ struct adapter_params {/* Firmware Port Capabilities types. */ -typedef u16 fw_port_cap16_t ;/* 16-bit Port Capabilities integral value */ typedef u32 fw_port_cap32_t ;/* 32-bit Port Capabilities integral value */ -enum fw_caps { -FW_CAPS_UNKNOWN =0 ,/* 0'ed out initial state */ -FW_CAPS16 =1 ,/* old Firmware: 16-bit Port Capabilities */ -FW_CAPS32 =2 ,/* new Firmware: 32-bit Port Capabilities */ -}; -struct link_config {fw_port_cap32_t pcaps;/* link capabilities */ fw_port_cap32_t acaps;/* advertised capabilities */
@@ -552,5 +544,4 @@ static inline int t4_memory_rw(struct adapter *adap, int win, {return t4_memory_rw_mtype (adap, win, mtype, maddr, len, hbuf, dir); } -fw_port_cap32_t fwcaps16_to_caps32 (fw_port_cap16_t caps16);#endif /* __CHELSIO_COMMON_H */
drivers/net/cxgbe/base/t4_hw.c +41 -192
316 lines not on this page · raw message
drivers/net/cxgbe/base/t4fw_interface.h +4 -66
100 lines not on this page · raw message
drivers/net/cxgbe/base/t4vf_hw.c +26 -53
105 lines not on this page · raw message
Signature · 1 line
2.24.0
PATCH 2/3 net/cxgbe: rework and simplify link handling code
In reply to Rahul LakkireddyFrom: Karra Satwik <[email protected]>
Rework and simplify link handling code. Remove redundant variables in link configuration structure and directly extract information from the 32-bit link capabilities.
--- drivers/net/cxgbe/base/adapter.h | 10 - drivers/net/cxgbe/base/common.h | 60 ++-- drivers/net/cxgbe/base/t4_hw.c | 350 +++++++++++++----------- drivers/net/cxgbe/base/t4fw_interface.h | 11 +- drivers/net/cxgbe/base/t4vf_hw.c | 9 +- drivers/net/cxgbe/cxgbe_ethdev.c | 68 +++-- drivers/net/cxgbe/cxgbe_main.c | 21 +- 7 files changed, 275 insertions(+), 254 deletions(-)
drivers/net/cxgbe/base/adapter.h +0 -10
@@ -39,9 +39,6 @@ struct port_info {short int xact_addr_filt;/* index of exact MAC address filter */ u16 viid;/* associated virtual interface id */ -s8 mdio_addr;/* address of the PHY */ -u8 port_type;/* firmware port type */ -u8 mod_type;/* firmware module type */ u8 port_id;/* physical port ID */ u8 pidx;/* port index for this PF */ u8 tx_chan;/* associated channel */
@@ -63,12 +60,6 @@ struct port_info {u8 vivld; }; -/* Enable or disable autonegotiation. If this is set to enable, -* the forced link modes above are completely ignored. -*/ -#define AUTONEG_DISABLE 0x00 -#define AUTONEG_ENABLE 0x01 -enum {/* adapter flags */ FULL_INIT_DONE = (1 <<0 ),USING_MSI = (1 <<1 ),
@@ -801,7 +792,6 @@ void t4_free_mem(void *addr);#define t4_os_free (_ptr) t4_free_mem((_ptr))void t4_os_portmod_changed (const struct adapter *adap,int port_id); -void t4_os_link_changed (struct adapter *adap,int port_id,int link_stat);void reclaim_completed_tx (struct sge_txq *q);void t4_free_sge_resources (struct adapter *adap);
drivers/net/cxgbe/base/common.h +26 -34
88 lines not on this page · raw message
drivers/net/cxgbe/base/t4_hw.c +184 -166
444 lines not on this page · raw message
drivers/net/cxgbe/base/t4fw_interface.h +10 -1
@@ -1615,6 +1615,7 @@ struct fw_vi_stats_cmd {#define FW_PORT_CAP32_MDIAUTO 0x00400000UL#define FW_PORT_CAP32_FEC_RS 0x00800000UL#define FW_PORT_CAP32_FEC_BASER_RS 0x01000000UL +#define FW_PORT_CAP32_FORCE_PAUSE 0x10000000UL#define S_FW_PORT_CAP32_SPEED 0#define M_FW_PORT_CAP32_SPEED 0xfff
@@ -1622,8 +1623,16 @@ struct fw_vi_stats_cmd {#define G_FW_PORT_CAP32_SPEED (x) \ (((x) >> S_FW_PORT_CAP32_SPEED) & M_FW_PORT_CAP32_SPEED) +#define S_FW_PORT_CAP32_FC 16 +#define M_FW_PORT_CAP32_FC 0x3 +#define V_FW_PORT_CAP32_FC (x) ((x) << S_FW_PORT_CAP32_FC) + +#define S_FW_PORT_CAP32_802_3 18 +#define M_FW_PORT_CAP32_802_3 0x3 +#define V_FW_PORT_CAP32_802_3 (x) ((x) << S_FW_PORT_CAP32_802_3) +enum fw_port_mdi32 { -FW_PORT_CAP32_MDI_AUTO , +FW_PORT_CAP32_MDI_AUTO =1 , };#define S_FW_PORT_CAP32_MDI 21
drivers/net/cxgbe/base/t4vf_hw.c +3 -6
@@ -768,9 +768,8 @@ int t4vf_port_init(struct adapter *adapter) {struct fw_port_cmd port_cmd, port_rpl, rpl;struct fw_vi_cmd vi_cmd, vi_rpl; -fw_port_cap32_t pcaps, acaps; +u32 param, val, pcaps, acaps;enum fw_port_type port_type; -u32 param, val;int mdio_addr;int ret, i;
@@ -844,10 +843,8 @@ int t4vf_port_init(struct adapter *adapter) pcaps =be32_to_cpu (port_rpl.u.info32.pcaps32); acaps =be32_to_cpu (port_rpl.u.info32.acaps32); - p->port_type = port_type; - p->mdio_addr = mdio_addr; - p->mod_type =FW_PORT_MOD_TYPE_NA ; -init_link_config (&p->link_cfg, pcaps, acaps); +t4_init_link_config (p, pcaps, acaps, mdio_addr, port_type, +FW_PORT_MOD_TYPE_NA ); }return 0 ; }
drivers/net/cxgbe/cxgbe_ethdev.c +42 -26
103 lines not on this page · raw message
drivers/net/cxgbe/cxgbe_main.c +10 -11
@@ -732,7 +732,7 @@ void cxgbe_print_port_info(struct adapter *adap) --bufp;sprintf (bufp,"BASE-%s" ,t4_get_port_type_description ( - (enum fw_port_type )pi->port_type)); + (enum fw_port_type )pi->link_cfg.port_type)); dev_info(adap, " " PCI_PRI_FMT " Chelsio rev %d %s %s\n",
@@ -1575,23 +1575,23 @@ void t4_os_portmod_changed(const struct adapter *adap, int port_id)const struct port_info *pi =adap2pinfo (adap, port_id); -if (pi->mod_type ==FW_PORT_MOD_TYPE_NONE ) +if (pi->link_cfg.mod_type ==FW_PORT_MOD_TYPE_NONE )dev_info (adap,"Port%d: port module unplugged\n" , pi->port_id); -else if (pi->mod_type <ARRAY_SIZE (mod_str)) +else if (pi->link_cfg.mod_type <ARRAY_SIZE (mod_str))dev_info (adap,"Port%d: %s port module inserted\n" , pi->port_id, - mod_str[pi->mod_type]); -else if (pi->mod_type ==FW_PORT_MOD_TYPE_NOTSUPPORTED ) + mod_str[pi->link_cfg.mod_type]); +else if (pi->link_cfg.mod_type ==FW_PORT_MOD_TYPE_NOTSUPPORTED )dev_info (adap,"Port%d: unsupported port module inserted\n" , pi->port_id); -else if (pi->mod_type ==FW_PORT_MOD_TYPE_UNKNOWN ) +else if (pi->link_cfg.mod_type ==FW_PORT_MOD_TYPE_UNKNOWN )dev_info (adap,"Port%d: unknown port module inserted\n" , pi->port_id); -else if (pi->mod_type ==FW_PORT_MOD_TYPE_ERROR ) +else if (pi->link_cfg.mod_type ==FW_PORT_MOD_TYPE_ERROR )dev_info (adap,"Port%d: transceiver module error\n" , pi->port_id);else dev_info (adap,"Port%d: unknown module type %d inserted\n" , - pi->port_id, pi->mod_type); + pi->port_id, pi->link_cfg.mod_type); }bool cxgbe_force_linkup (struct adapter *adap)
@@ -1636,8 +1636,7 @@ int cxgbe_link_start(struct port_info *pi) } }if (ret ==0 &&is_pf4 (adapter)) - ret =t4_link_l1cfg (adapter, adapter->mbox, pi->tx_chan, - &pi->link_cfg); + ret =t4_link_l1cfg (pi, pi->link_cfg.admin_caps);if (ret ==0 ) {/* * Enabling a Virtual Interface can result in an interrupt
@@ -1905,7 +1904,7 @@ void cxgbe_get_speed_caps(struct port_info *pi, u32 *speed_caps) { *speed_caps =0 ; -fw_caps_to_speed_caps (pi->port_type, pi->link_cfg.pcaps, +fw_caps_to_speed_caps (pi->link_cfg.port_type, pi->link_cfg.pcaps, speed_caps);if (!(pi->link_cfg.pcaps &FW_PORT_CAP32_ANEG ))
Signature · 1 line
2.24.0
PATCH 3/3 net/cxgbe: implement ethdev ops to configure link FEC
In reply to Rahul LakkireddyFrom: Karra Satwik <[email protected]>
Add ethdev ops to query and configure link FEC.
--- drivers/net/cxgbe/base/common.h | 2 + drivers/net/cxgbe/base/t4_hw.c | 79 ++++++++++++++ drivers/net/cxgbe/base/t4fw_interface.h | 6 ++ drivers/net/cxgbe/cxgbe_ethdev.c | 133 ++++++++++++++++++++++++ 4 files changed, 220 insertions(+)
drivers/net/cxgbe/base/common.h +2 -0
@@ -331,6 +331,8 @@ static inline int t4_link_l1cfg_ns(struct port_info *pi, u32 caps)int t4_set_link_speed (struct port_info *pi,u32 speed,u32 *new_caps);int t4_set_link_pause (struct port_info *pi,u8 autoneg,u8 pause_tx,u8 pause_rx,u32 *new_caps); +int t4_set_link_fec (struct port_info *pi,u8 fec_rs,u8 fec_baser, +u8 fec_none,u32 *new_caps);unsigned int t4_fwcap_to_speed (u32 caps);void t4_load_mtus (struct adapter *adap,const unsigned short *mtus,const unsigned short *alpha,const unsigned short *beta);
drivers/net/cxgbe/base/t4_hw.c +79 -0
91 lines not on this page · raw message
drivers/net/cxgbe/base/t4fw_interface.h +6 -0
@@ -1615,7 +1615,9 @@ struct fw_vi_stats_cmd {#define FW_PORT_CAP32_MDIAUTO 0x00400000UL#define FW_PORT_CAP32_FEC_RS 0x00800000UL#define FW_PORT_CAP32_FEC_BASER_RS 0x01000000UL +#define FW_PORT_CAP32_FEC_NO_FEC 0x02000000UL#define FW_PORT_CAP32_FORCE_PAUSE 0x10000000UL +#define FW_PORT_CAP32_FORCE_FEC 0x20000000UL#define S_FW_PORT_CAP32_SPEED 0#define M_FW_PORT_CAP32_SPEED 0xfff
@@ -1641,6 +1643,10 @@ enum fw_port_mdi32 {#define G_FW_PORT_CAP32_MDI (x) \ (((x) >> S_FW_PORT_CAP32_MDI) & M_FW_PORT_CAP32_MDI) +#define S_FW_PORT_CAP32_FEC 23 +#define M_FW_PORT_CAP32_FEC 0x1f +#define V_FW_PORT_CAP32_FEC (x) ((x) << S_FW_PORT_CAP32_FEC) +enum fw_port_action {FW_PORT_ACTION_L1_CFG32 =0x0009 ,FW_PORT_ACTION_GET_PORT_INFO32 =0x000a ,
drivers/net/cxgbe/cxgbe_ethdev.c +133 -0
145 lines not on this page · raw message
Signature · 1 line
2.24.0
Quoted 10 lines · Rahul Lakkireddy
This series of patches rework link handling and add support to configure Forward Error Correction (FEC) capability.
Patch 1 removes legacy 16-bit link capabilities infrastructure and always enables 32-bit link capabilities in firmware.
Patch 2 simplifies link handling in preparation for FEC support.
Patch 3 adds support to configure link FEC when supported.
Quoted 8 lines
Thanks,
RahulKarra Satwik (3):
net/cxgbe: remove legacy 16-bit link capabilities net/cxgbe: rework and simplify link handling code net/cxgbe: implement ethdev ops to configure link FEC
Series applied to dpdk-next-net/main, thanks.