Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe458e50 authored by Mitch Williams's avatar Mitch Williams Committed by Jeff Kirsher
Browse files

i40evf: report link speed 



The PF driver tells us the link speed, so do something with that
information. Add link speed to log messages, and report speed through
ethtool.

Change-Id: I279dc9540cc5203376406050a3e8d67e128d5882
Signed-off-by: default avatarMitch Williams <mitch.a.williams@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 6992a6c9

drivers/net/ethernet/intel/i40evf/i40evf.h

+1 −0
Original line number Diff line number Diff line
@@ -258,6 +258,7 @@ struct i40evf_adapter { 
	struct work_struct watchdog_task;

	bool netdev_registered;

	bool link_up;

	enum i40e_aq_link_speed link_speed;

	enum i40e_virtchnl_ops current_op;

#define CLIENT_ENABLED(_a) ((_a)->vf_res ? \

			    (_a)->vf_res->vf_offload_flags & \

drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c

+23 −3
Original line number Diff line number Diff line
@@ -74,13 +74,33 @@ static const struct i40evf_stats i40evf_gstrings_stats[] = { 
static int i40evf_get_settings(struct net_device *netdev,

			       struct ethtool_cmd *ecmd)

{

	/* In the future the VF will be able to query the PF for

	 * some information - for now use a dummy value

	 */

	struct i40evf_adapter *adapter = netdev_priv(netdev);



	ecmd->supported = 0;

	ecmd->autoneg = AUTONEG_DISABLE;

	ecmd->transceiver = XCVR_DUMMY1;

	ecmd->port = PORT_NONE;

	/* Set speed and duplex */

	switch (adapter->link_speed) {

	case I40E_LINK_SPEED_40GB:

		ethtool_cmd_speed_set(ecmd, SPEED_40000);

		break;

	case I40E_LINK_SPEED_20GB:

		ethtool_cmd_speed_set(ecmd, SPEED_20000);

		break;

	case I40E_LINK_SPEED_10GB:

		ethtool_cmd_speed_set(ecmd, SPEED_10000);

		break;

	case I40E_LINK_SPEED_1GB:

		ethtool_cmd_speed_set(ecmd, SPEED_1000);

		break;

	case I40E_LINK_SPEED_100MB:

		ethtool_cmd_speed_set(ecmd, SPEED_100);

		break;

	default:

		break;

	}

	ecmd->duplex = DUPLEX_FULL;



	return 0;

}

drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c

+46 −9
Original line number Diff line number Diff line
@@ -816,6 +816,45 @@ void i40evf_set_rss_lut(struct i40evf_adapter *adapter) 
	kfree(vrl);

}



/**

 * i40evf_print_link_message - print link up or down

 * @adapter: adapter structure

 *

 * Log a message telling the world of our wonderous link status

 */

static void i40evf_print_link_message(struct i40evf_adapter *adapter)

{

	struct net_device *netdev = adapter->netdev;

	char *speed = "Unknown ";



	if (!adapter->link_up) {

		netdev_info(netdev, "NIC Link is Down\n");

		return;

	}



	switch (adapter->link_speed) {

	case I40E_LINK_SPEED_40GB:

		speed = "40 G";

		break;

	case I40E_LINK_SPEED_20GB:

		speed = "20 G";

		break;

	case I40E_LINK_SPEED_10GB:

		speed = "10 G";

		break;

	case I40E_LINK_SPEED_1GB:

		speed = "1000 M";

		break;

	case I40E_LINK_SPEED_100MB:

		speed = "100 M";

		break;

	default:

		break;

	}



	netdev_info(netdev, "NIC Link is Up %sbps Full Duplex\n", speed);

}



/**

 * i40evf_request_reset

 * @adapter: adapter structure
@@ -853,15 +892,13 @@ void i40evf_virtchnl_completion(struct i40evf_adapter *adapter, 
			(struct i40e_virtchnl_pf_event *)msg;

		switch (vpe->event) {

		case I40E_VIRTCHNL_EVENT_LINK_CHANGE:

			adapter->link_speed =

				vpe->event_data.link_event.link_speed;

			if (adapter->link_up !=

			    vpe->event_data.link_event.link_status) {

				adapter->link_up =

					vpe->event_data.link_event.link_status;

			if (adapter->link_up && !netif_carrier_ok(netdev)) {

				dev_info(&adapter->pdev->dev, "NIC Link is Up\n");

				netif_carrier_on(netdev);

				netif_tx_wake_all_queues(netdev);

			} else if (!adapter->link_up) {

				dev_info(&adapter->pdev->dev, "NIC Link is Down\n");

				netif_carrier_off(netdev);

				i40evf_print_link_message(adapter);

				netif_tx_stop_all_queues(netdev);

			}

			break;