net/e1000: add support for NIC loopback
PATCH 1/2 net/e1000: add support for NIC loopback
Check the lpbk_mode field of struct rte_eth_conf to determine if loopback should be enabled. Works with 82540EM and 82574L in QEMU 4.0.0.
Signed-off-by Dominic Chen <[email protected]>
--- drivers/net/e1000/base/e1000_api.c | 42 +++++++ drivers/net/e1000/base/e1000_api.h | 1 + drivers/net/e1000/base/e1000_hw.h | 1 + drivers/net/e1000/base/e1000_ich8lan.h | 4 + drivers/net/e1000/base/e1000_phy.c | 158 +++++++++++++++++++++++++ drivers/net/e1000/base/e1000_phy.h | 3 + drivers/net/e1000/em_ethdev.c | 5 + drivers/net/e1000/em_rxtx.c | 9 +- drivers/net/e1000/igb_ethdev.c | 5 + drivers/net/e1000/igb_rxtx.c | 9 +- 10 files changed, 233 insertions(+), 4 deletions(-)
drivers/net/e1000/base/e1000_api.c +42 -0
@@ -671,6 +671,48 @@ s32 e1000_get_speed_and_duplex(struct e1000_hw *hw, u16 *speed, u16 *duplex)return -E1000_ERR_CONFIG ; } +/** +* e1000_set_loopback - Set adapter in loopback mode +* @hw: pointer to the HW structure +* +* This sets the MAC and/or PHY into loopback mode. +**/ +s32 e1000_set_loopback (struct e1000_hw *hw) +{ +s32 ret_val =0 ; + +if (hw->phy.media_type == e1000_media_type_fiber || + hw->phy.media_type == e1000_media_type_internal_serdes) { +switch (hw->mac.type) { +case e1000_80003es2lan: +case e1000_82571: +case e1000_82572: +/* not implemented */ +return -E1000_ERR_PHY_TYPE ; + +case e1000_82545: +case e1000_82546: +case e1000_82545_rev_3: +case e1000_82546_rev_3: + ret_val =e1000_set_phy_loopback (hw); +if (ret_val) +return ret_val; +break ; + +default : +/* use transceiver loopback */ +break ; + } + }else if (hw->phy.media_type == e1000_media_type_copper) { + ret_val =e1000_set_phy_loopback (hw); +if (ret_val) +return ret_val; + } + + hw->mac.loopback = true; +return E1000_SUCCESS ; +} +/** * e1000_setup_led - Configures SW controllable LED * @hw: pointer to the HW structure
drivers/net/e1000/base/e1000_api.h +1 -0
@@ -37,6 +37,7 @@ s32 e1000_reset_hw(struct e1000_hw *hw);s32 e1000_init_hw (struct e1000_hw *hw);s32 e1000_setup_link (struct e1000_hw *hw);s32 e1000_get_speed_and_duplex (struct e1000_hw *hw,u16 *speed,u16 *duplex); +s32 e1000_set_loopback (struct e1000_hw *hw);s32 e1000_disable_pcie_master (struct e1000_hw *hw);void e1000_config_collision_dist (struct e1000_hw *hw);int e1000_rar_set (struct e1000_hw *hw,u8 *addr,u32 index);
drivers/net/e1000/base/e1000_hw.h +1 -0
@@ -789,6 +789,7 @@ struct e1000_mac_info {enum e1000_serdes_link_state serdes_link_state;bool serdes_has_link;bool tx_pkt_filtering; +bool loopback; };struct e1000_phy_info {
drivers/net/e1000/base/e1000_ich8lan.h +4 -0
@@ -144,6 +144,7 @@#define HV_LED_CONFIG PHY_REG(768, 30)/* LED Configuration */ #define HV_MUX_DATA_CTRL PHY_REG(776, 16)#define HV_MUX_DATA_CTRL_GEN_TO_MAC 0x0400 +#define HV_MUX_DATA_CTRL_SET_LINK_UP 0x0040/* Set Link Up */ #define HV_MUX_DATA_CTRL_FORCE_SPEED 0x0004#define HV_STATS_PAGE 778/* Half-duplex collision counts */
@@ -213,6 +214,8 @@/* KMRN Mode Control */ #define HV_KMRN_MODE_CTRL PHY_REG(769, 16) +#define HV_KMRN_FORCE_FD 0x000C/* Force Full-Duplex */ +#define HV_KMRN_FORCE_LINK 0x0040/* Force Link */ #define HV_KMRN_MDIO_SLOW 0x0400/* KMRN FIFO Control and Status */
@@ -248,6 +251,7 @@/* 82579 DFT Control */ #define I82579_DFT_CTRL PHY_REG(769, 20)#define I82579_DFT_CTRL_GATE_PHY_RESET 0x0040/* Gate PHY Reset on MAC Reset */ +#define I82579_DFT_CTRL_EARLY_LINK_ENABLE 0x0400/* Early Link Enable */ /* Extended Management Interface (EMI) Registers */ #define I82579_EMI_ADDR 0x10
drivers/net/e1000/base/e1000_phy.c +158 -0
170 lines not on this page · raw message
drivers/net/e1000/base/e1000_phy.h +3 -0
@@ -36,6 +36,9 @@ s32 e1000_get_phy_id(struct e1000_hw *hw);s32 e1000_get_phy_info_igp (struct e1000_hw *hw);s32 e1000_get_phy_info_m88 (struct e1000_hw *hw);s32 e1000_get_phy_info_ife (struct e1000_hw *hw); +s32 e1000_set_phy_loopback_m88 (struct e1000_hw *hw); +s32 e1000_set_phy_loopback_bm (struct e1000_hw *hw); +s32 e1000_set_phy_loopback (struct e1000_hw *hw);s32 e1000_phy_sw_reset_generic (struct e1000_hw *hw);void e1000_phy_force_speed_duplex_setup (struct e1000_hw *hw,u16 *phy_ctrl);s32 e1000_phy_hw_reset_generic (struct e1000_hw *hw);
drivers/net/e1000/em_ethdev.c +5 -0
@@ -666,6 +666,11 @@ eth_em_start(struct rte_eth_dev *dev) } } +/* Set up loopback */ +if (dev->data->dev_conf.lpbk_mode) +if (e1000_set_loopback (hw)) + goto error_invalid_config; +e1000_setup_link (hw);if (rte_intr_allow_others (intr_handle)) {
drivers/net/e1000/em_rxtx.c +7 -2
@@ -1892,10 +1892,15 @@ eth_em_rx_init(struct rte_eth_dev *dev) rctl |=E1000_RCTL_SECRC ;/* Strip Ethernet CRC. */ rctl &= ~(3 <<E1000_RCTL_MO_SHIFT ); - rctl |=E1000_RCTL_EN |E1000_RCTL_BAM |E1000_RCTL_LBM_NO | -E1000_RCTL_RDMTS_HALF | + rctl |=E1000_RCTL_EN |E1000_RCTL_BAM |E1000_RCTL_RDMTS_HALF | (hw->mac.mc_filter_type <<E1000_RCTL_MO_SHIFT ); +/* Set up transceiver loopback */ +if (hw->mac.loopback) + rctl |=E1000_RCTL_LBM_TCVR ; +else + rctl |=E1000_RCTL_LBM_NO ; +/* Make sure VLAN Filters are off. */ rctl &= ~E1000_RCTL_VFE ;/* Don't store bad packets. */
drivers/net/e1000/igb_ethdev.c +5 -0
@@ -1400,6 +1400,11 @@ eth_igb_start(struct rte_eth_dev *dev) } } +/* Set up loopback */ +if (dev->data->dev_conf.lpbk_mode) +if (e1000_set_loopback (hw)) + goto error_invalid_config; +e1000_setup_link (hw);if (rte_intr_allow_others (intr_handle)) {
drivers/net/e1000/igb_rxtx.c +7 -2
@@ -2548,10 +2548,15 @@ eth_igb_rx_init(struct rte_eth_dev *dev) } rctl &= ~(3 <<E1000_RCTL_MO_SHIFT ); - rctl |=E1000_RCTL_EN |E1000_RCTL_BAM |E1000_RCTL_LBM_NO | -E1000_RCTL_RDMTS_HALF | + rctl |=E1000_RCTL_EN |E1000_RCTL_BAM |E1000_RCTL_RDMTS_HALF | (hw->mac.mc_filter_type <<E1000_RCTL_MO_SHIFT ); +/* Set up transceiver loopback */ +if (hw->mac.loopback) + rctl |=E1000_RCTL_LBM_TCVR ; +else + rctl |=E1000_RCTL_LBM_NO ; +/* Make sure VLAN Filters are off. */ if (dev->data->dev_conf.rxmode.mq_mode !=ETH_MQ_RX_VMDQ_ONLY ) rctl &= ~E1000_RCTL_VFE ;
Signature · 1 line
2.17.1
PATCH 2/2 net/e1000: assume device ID as workaround for Intel 82574L bug in VMware
VMware Workstation 15.5.1 doesn't correctly emulate the PHY_ID_R2 register, so assume that it has the correct value.
Signed-off-by Dominic Chen <[email protected]>
--- drivers/net/e1000/base/e1000_82571.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/e1000/base/e1000_82571.c +7 -0
@@ -153,6 +153,13 @@ STATIC s32 e1000_init_phy_params_82571(struct e1000_hw *hw) ret_val = -E1000_ERR_PHY ;break ;case e1000_82574: +if (phy->id ==0 ) { +RTE_LOG (WARNING ,PMD , +"Warning: Assuming device ID for Intel 82574 NIC, workaround for VMware Workstation bug\n" ); +/* VMWare Workstation 15.5.1 returns zero */ + phy->id =BME1000_E_PHY_ID_R2 ; + } +/* fall through */ case e1000_82583:if (phy->id !=BME1000_E_PHY_ID_R2 ) ret_val = -E1000_ERR_PHY ;
Signature · 1 line
2.17.1