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

Commit 4d92a3e9 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue 



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2015-03-27

This series contains updates to i40e and i40evf.

Jesse adds new device IDs to handle the new 20G speed for KR2.

Mitch provides a fix for an issue that shows up as a panic or memory
corruption when the device is brought down while under heavy stress.
This is resolved by delaying the releasing of resources until we
receive acknowledgment from the PF driver that the rings have indeed
been stopped.  Also adds firmware version information to ethtool
reporting to align with ixgbevf behavior.

Akeem increases the polling loop limiter, sine we found that in
certain circumstances the firmware can take longer to be ready after
a reset.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents afb0bc97 3182b25e

drivers/net/ethernet/intel/i40e/i40e_common.c

+3 −1
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ static i40e_status i40e_set_mac_type(struct i40e_hw *hw) 
		case I40E_DEV_ID_QSFP_B:

		case I40E_DEV_ID_QSFP_C:

		case I40E_DEV_ID_10G_BASE_T:

		case I40E_DEV_ID_20G_KR2:

			hw->mac.type = I40E_MAC_XL710;

			break;

		case I40E_DEV_ID_VF:
@@ -841,6 +842,7 @@ static enum i40e_media_type i40e_get_media_type(struct i40e_hw *hw) 
	case I40E_PHY_TYPE_10GBASE_KX4:

	case I40E_PHY_TYPE_10GBASE_KR:

	case I40E_PHY_TYPE_40GBASE_KR4:

	case I40E_PHY_TYPE_20GBASE_KR2:

		media = I40E_MEDIA_TYPE_BACKPLANE;

		break;

	case I40E_PHY_TYPE_SGMII:
@@ -857,7 +859,7 @@ static enum i40e_media_type i40e_get_media_type(struct i40e_hw *hw) 
}



#define I40E_PF_RESET_WAIT_COUNT_A0	200

#define I40E_PF_RESET_WAIT_COUNT	110

#define I40E_PF_RESET_WAIT_COUNT	200

/**

 * i40e_pf_reset - Reset the PF

 * @hw: pointer to the hardware structure

drivers/net/ethernet/intel/i40e/i40e_ethtool.c

+16 −0
Original line number Diff line number Diff line
@@ -274,6 +274,12 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw, 
	case I40E_PHY_TYPE_40GBASE_LR4:

		ecmd->supported = SUPPORTED_40000baseLR4_Full;

		break;

	case I40E_PHY_TYPE_20GBASE_KR2:

		ecmd->supported = SUPPORTED_Autoneg |

				  SUPPORTED_20000baseKR2_Full;

		ecmd->advertising = ADVERTISED_Autoneg |

				    ADVERTISED_20000baseKR2_Full;

		break;

	case I40E_PHY_TYPE_10GBASE_KX4:

		ecmd->supported = SUPPORTED_Autoneg |

				  SUPPORTED_10000baseKX4_Full;
@@ -353,6 +359,9 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw, 
		/* need a SPEED_40000 in ethtool.h */

		ethtool_cmd_speed_set(ecmd, 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;
@@ -418,6 +427,11 @@ static void i40e_get_settings_link_down(struct i40e_hw *hw, 
		if (hw_link_info->requested_speeds & I40E_LINK_SPEED_100MB)

			ecmd->advertising |= ADVERTISED_100baseT_Full;

		break;

	case I40E_DEV_ID_20G_KR2:

		/* backplane 20G */

		ecmd->supported = SUPPORTED_20000baseKR2_Full;

		ecmd->advertising = ADVERTISED_20000baseKR2_Full;

		break;

	default:

		/* all the rest are 10G/1G */

		ecmd->supported = SUPPORTED_10000baseT_Full |
@@ -633,6 +647,8 @@ static int i40e_set_settings(struct net_device *netdev, 
	    advertise & ADVERTISED_10000baseKX4_Full ||

	    advertise & ADVERTISED_10000baseKR_Full)

		config.link_speed |= I40E_LINK_SPEED_10GB;

	if (advertise & ADVERTISED_20000baseKR2_Full)

		config.link_speed |= I40E_LINK_SPEED_20GB;

	if (advertise & ADVERTISED_40000baseKR4_Full ||

	    advertise & ADVERTISED_40000baseCR4_Full ||

	    advertise & ADVERTISED_40000baseSR4_Full ||

drivers/net/ethernet/intel/i40e/i40e_main.c

+5 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static const char i40e_driver_string[] = 


#define DRV_VERSION_MAJOR 1

#define DRV_VERSION_MINOR 2

#define DRV_VERSION_BUILD 37

#define DRV_VERSION_BUILD 43

#define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \

	     __stringify(DRV_VERSION_MINOR) "." \

	     __stringify(DRV_VERSION_BUILD)    DRV_KERN
@@ -75,6 +75,7 @@ static const struct pci_device_id i40e_pci_tbl[] = { 
	{PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_B), 0},

	{PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_C), 0},

	{PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_BASE_T), 0},

	{PCI_VDEVICE(INTEL, I40E_DEV_ID_20G_KR2), 0},

	/* required last entry */

	{0, }

};
@@ -4639,6 +4640,9 @@ static void i40e_print_link_message(struct i40e_vsi *vsi, bool isup) 
	case I40E_LINK_SPEED_40GB:

		strlcpy(speed, "40 Gbps", SPEED_SIZE);

		break;

	case I40E_LINK_SPEED_20GB:

		strncpy(speed, "20 Gbps", SPEED_SIZE);

		break;

	case I40E_LINK_SPEED_10GB:

		strlcpy(speed, "10 Gbps", SPEED_SIZE);

		break;

drivers/net/ethernet/intel/i40e/i40e_type.h

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#define I40E_DEV_ID_QSFP_B		0x1584

#define I40E_DEV_ID_QSFP_C		0x1585

#define I40E_DEV_ID_10G_BASE_T		0x1586

#define I40E_DEV_ID_20G_KR2		0x1587

#define I40E_DEV_ID_VF			0x154C

#define I40E_DEV_ID_VF_HV		0x1571

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

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ i40e_status i40e_set_mac_type(struct i40e_hw *hw) 
		case I40E_DEV_ID_QSFP_B:

		case I40E_DEV_ID_QSFP_C:

		case I40E_DEV_ID_10G_BASE_T:

		case I40E_DEV_ID_20G_KR2:

			hw->mac.type = I40E_MAC_XL710;

			break;

		case I40E_DEV_ID_VF: