d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/i40e: fix link speed for X722

Browse Source 
If disable LSC when launching testpmd with X722, shown
link speed is 20G but not 10G. It's caused by wrongly
parsed link speed.
Correct it according to X722 datasheet.

Fixes: eef2daf2e1 ("net/i40e: fix link update no wait")
Cc: stable@dpdk.org

Signed-off-by: Beilei Xing <beilei.xing@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
This commit is contained in:
Beilei Xing 2019-04-30 14:56:37 +08:00 committed by Ferruh Yigit
parent 6e48cf0369
commit f2310dddf4
1 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
drivers/net/i40e/i40e_ethdev.c
View File

@ -2670,11 +2670,11 @@ update_link_reg(struct i40e_hw *hw, struct rte_eth_link *link)
#define I40E_PRTMAC_MACC 0x001E24E0
#define I40E_REG_MACC_25GB 0x00020000
#define I40E_REG_SPEED_MASK 0x38000000
#define I40E_REG_SPEED_100MB 0x00000000
#define I40E_REG_SPEED_1GB 0x08000000
#define I40E_REG_SPEED_10GB 0x10000000
#define I40E_REG_SPEED_20GB 0x20000000
#define I40E_REG_SPEED_25_40GB 0x18000000
#define I40E_REG_SPEED_0 0x00000000
#define I40E_REG_SPEED_1 0x08000000
#define I40E_REG_SPEED_2 0x10000000
#define I40E_REG_SPEED_3 0x18000000
#define I40E_REG_SPEED_4 0x20000000
uint32_t link_speed;
uint32_t reg_val;
@ -2688,26 +2688,35 @@ update_link_reg(struct i40e_hw *hw, struct rte_eth_link *link)
/* Parse the link status */
switch (link_speed) {
case I40E_REG_SPEED_100MB:
case I40E_REG_SPEED_0:
link->link_speed = ETH_SPEED_NUM_100M;
break;
case I40E_REG_SPEED_1GB:
case I40E_REG_SPEED_1:
link->link_speed = ETH_SPEED_NUM_1G;
break;
case I40E_REG_SPEED_10GB:
link->link_speed = ETH_SPEED_NUM_10G;
break;
case I40E_REG_SPEED_20GB:
link->link_speed = ETH_SPEED_NUM_20G;
break;
case I40E_REG_SPEED_25_40GB:
reg_val = I40E_READ_REG(hw, I40E_PRTMAC_MACC);
if (reg_val & I40E_REG_MACC_25GB)
link->link_speed = ETH_SPEED_NUM_25G;
case I40E_REG_SPEED_2:
if (hw->mac.type == I40E_MAC_X722)
link->link_speed = ETH_SPEED_NUM_2_5G;
else
link->link_speed = ETH_SPEED_NUM_40G;
link->link_speed = ETH_SPEED_NUM_10G;
break;
case I40E_REG_SPEED_3:
if (hw->mac.type == I40E_MAC_X722) {
link->link_speed = ETH_SPEED_NUM_5G;
} else {
reg_val = I40E_READ_REG(hw, I40E_PRTMAC_MACC);
if (reg_val & I40E_REG_MACC_25GB)
link->link_speed = ETH_SPEED_NUM_25G;
else
link->link_speed = ETH_SPEED_NUM_40G;
}
break;
case I40E_REG_SPEED_4:
if (hw->mac.type == I40E_MAC_X722)
link->link_speed = ETH_SPEED_NUM_10G;
else
link->link_speed = ETH_SPEED_NUM_20G;
break;
default:
PMD_DRV_LOG(ERR, "Unknown link speed info %u", link_speed);