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

Commit 31a1b375 authored by Greg Rose's avatar Greg Rose Committed by Jeff Kirsher
Browse files

ixgbevf: Add support to recognize 100mb link speed 



The X540 10Gig controller is capable of linking at 100Mbits - add
support for reporting that link speed.

Signed-off-by: default avatarGreg Rose <gregory.v.rose@intel.com>
Tested-by: default avatarSibai Li <sibai.li@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 59aed952

drivers/net/ethernet/intel/ixgbevf/defines.h

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
typedef u32 ixgbe_link_speed;

#define IXGBE_LINK_SPEED_1GB_FULL       0x0020

#define IXGBE_LINK_SPEED_10GB_FULL      0x0080

#define IXGBE_LINK_SPEED_100_FULL	0x0008



#define IXGBE_CTRL_RST              0x04000000 /* Reset (SW) */

#define IXGBE_RXDCTL_ENABLE         0x02000000 /* Enable specific Rx Queue */
@@ -48,6 +49,7 @@ typedef u32 ixgbe_link_speed; 
#define IXGBE_LINKS_SPEED_82599     0x30000000

#define IXGBE_LINKS_SPEED_10G_82599 0x30000000

#define IXGBE_LINKS_SPEED_1G_82599  0x20000000

#define IXGBE_LINKS_SPEED_100_82599 0x10000000



/* Number of Transmit and Receive Descriptors must be a multiple of 8 */

#define IXGBE_REQ_TX_DESCRIPTOR_MULTIPLE  8

drivers/net/ethernet/intel/ixgbevf/ethtool.c

+14 −4
Original line number Diff line number Diff line
@@ -107,10 +107,20 @@ static int ixgbevf_get_settings(struct net_device *netdev, 
	hw->mac.ops.check_link(hw, &link_speed, &link_up, false);



	if (link_up) {

		ethtool_cmd_speed_set(

			ecmd,

			(link_speed == IXGBE_LINK_SPEED_10GB_FULL) ?

			SPEED_10000 : SPEED_1000);

		__u32 speed = SPEED_10000;

		switch (link_speed) {

		case IXGBE_LINK_SPEED_10GB_FULL:

			speed = SPEED_10000;

			break;

		case IXGBE_LINK_SPEED_1GB_FULL:

			speed = SPEED_1000;

			break;

		case IXGBE_LINK_SPEED_100_FULL:

			speed = SPEED_100;

			break;

		}



		ethtool_cmd_speed_set(ecmd, speed);

		ecmd->duplex = DUPLEX_FULL;

	} else {

		ethtool_cmd_speed_set(ecmd, -1);

drivers/net/ethernet/intel/ixgbevf/vf.c

+9 −3
Original line number Diff line number Diff line
@@ -404,11 +404,17 @@ static s32 ixgbevf_check_mac_link_vf(struct ixgbe_hw *hw, 
	else

		*link_up = false;



	if ((links_reg & IXGBE_LINKS_SPEED_82599) ==

	    IXGBE_LINKS_SPEED_10G_82599)

	switch (links_reg & IXGBE_LINKS_SPEED_82599) {

	case IXGBE_LINKS_SPEED_10G_82599:

		*speed = IXGBE_LINK_SPEED_10GB_FULL;

	else

		break;

	case IXGBE_LINKS_SPEED_1G_82599:

		*speed = IXGBE_LINK_SPEED_1GB_FULL;

		break;

	case IXGBE_LINKS_SPEED_100_82599:

		*speed = IXGBE_LINK_SPEED_100_FULL;

		break;

	}



	return 0;

}