renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-24 05:04:00 +08:00
Code

iavf: Fix reporting 2.5 Gb and 5Gb speeds

Browse Source 
Commit 4ae4916b56 ("i40e: fix 'Unknown bps' in dmesg for 2.5Gb/5Gb
speeds") added the ability for the PF to report 2.5 and 5Gb speeds,
however, the iavf driver does not recognize those speeds as the values were
not added there. Add the proper enums and values so that iavf can properly
deal with those speeds.

Fixes: 4ae4916b56 ("i40e: fix 'Unknown bps' in dmesg for 2.5Gb/5Gb speeds")
Signed-off-by: Brett Creeley <brett.creeley@intel.com>
Signed-off-by: Witold Fijalkowski <witoldx.fijalkowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Brett Creeley 2020-06-05 10:09:45 -07:00 committed by Jeff Kirsher
parent 5071bda294
commit 18c012d922
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ethernet/intel/iavf/iavf_ethtool.c
View File

@ -303,6 +303,12 @@ static int iavf_get_link_ksettings(struct net_device *netdev,
case VIRTCHNL_LINK_SPEED_10GB:
cmd->base.speed = SPEED_10000;
break;
case VIRTCHNL_LINK_SPEED_5GB:
cmd->base.speed = SPEED_5000;
break;
case VIRTCHNL_LINK_SPEED_2_5GB:
cmd->base.speed = SPEED_2500;
break;
case VIRTCHNL_LINK_SPEED_1GB:
cmd->base.speed = SPEED_1000;
break;

18
drivers/net/ethernet/intel/iavf/iavf_main.c
View File

@ -2499,22 +2499,28 @@ static int iavf_validate_tx_bandwidth(struct iavf_adapter *adapter,
switch (adapter->link_speed) {
case VIRTCHNL_LINK_SPEED_40GB:
speed = 40000;
speed = SPEED_40000;
break;
case VIRTCHNL_LINK_SPEED_25GB:
speed = 25000;
speed = SPEED_25000;
break;
case VIRTCHNL_LINK_SPEED_20GB:
speed = 20000;
speed = SPEED_20000;
break;
case VIRTCHNL_LINK_SPEED_10GB:
speed = 10000;
speed = SPEED_10000;
break;
case VIRTCHNL_LINK_SPEED_5GB:
speed = SPEED_5000;
break;
case VIRTCHNL_LINK_SPEED_2_5GB:
speed = SPEED_2500;
break;
case VIRTCHNL_LINK_SPEED_1GB:
speed = 1000;
speed = SPEED_1000;
break;
case VIRTCHNL_LINK_SPEED_100MB:
speed = 100;
speed = SPEED_100;
break;
default:
break;

6
drivers/net/ethernet/intel/iavf/iavf_virtchnl.c
View File

@ -933,6 +933,12 @@ static void iavf_print_link_message(struct iavf_adapter *adapter)
case VIRTCHNL_LINK_SPEED_10GB:
link_speed_mbps = SPEED_10000;
break;
case VIRTCHNL_LINK_SPEED_5GB:
link_speed_mbps = SPEED_5000;
break;
case VIRTCHNL_LINK_SPEED_2_5GB:
link_speed_mbps = SPEED_2500;
break;
case VIRTCHNL_LINK_SPEED_1GB:
link_speed_mbps = SPEED_1000;
break;