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

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

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



Jeff Kirsher says:

====================
40GbE Intel Wired LAN Driver Updates 2019-05-04

This series contains updates to i40e only.

Grzegorz fixes a bug with promiscuous mode not being kept when the VF
switched to a new VLAN.  Fixed a typo in the link mode code, by using
the correct define.  Fixed truncation issue, which changed an function
argument to a smaller value that should have been a larger value.

Aleksandr adds support for new x710 devices and the speeds they support.

Sergey adds a check for the number of vectors against the number of MSIx
vectors to ensure one does not exceed the other.

Martyna adds additional input validation on VF messages handled by the
PF.  Fixed potential memory leaks in the driver where the error paths
were not freeing allocated memory.

Maciej reverts the double ShadowRAM checksum calculation change because
issues were found in the NVM downgrade situation.

Gustavo Silva changes the i40e driver to use struct_size() in kzalloc()
calls, to avoid type mistakes.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1ffad6d1 0b636446

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

+11 −1
Original line number Diff line number Diff line
@@ -1888,6 +1888,8 @@ enum i40e_aq_phy_type { 
	I40E_PHY_TYPE_25GBASE_LR		= 0x22,

	I40E_PHY_TYPE_25GBASE_AOC		= 0x23,

	I40E_PHY_TYPE_25GBASE_ACC		= 0x24,

	I40E_PHY_TYPE_2_5GBASE_T		= 0x30,

	I40E_PHY_TYPE_5GBASE_T			= 0x31,

	I40E_PHY_TYPE_MAX,

	I40E_PHY_TYPE_NOT_SUPPORTED_HIGH_TEMP	= 0xFD,

	I40E_PHY_TYPE_EMPTY			= 0xFE,
@@ -1929,19 +1931,25 @@ enum i40e_aq_phy_type { 
				BIT_ULL(I40E_PHY_TYPE_25GBASE_SR) | \

				BIT_ULL(I40E_PHY_TYPE_25GBASE_LR) | \

				BIT_ULL(I40E_PHY_TYPE_25GBASE_AOC) | \

				BIT_ULL(I40E_PHY_TYPE_25GBASE_ACC))

				BIT_ULL(I40E_PHY_TYPE_25GBASE_ACC) | \

				BIT_ULL(I40E_PHY_TYPE_2_5GBASE_T) | \

				BIT_ULL(I40E_PHY_TYPE_5GBASE_T))



#define I40E_LINK_SPEED_2_5GB_SHIFT	0x0

#define I40E_LINK_SPEED_100MB_SHIFT	0x1

#define I40E_LINK_SPEED_1000MB_SHIFT	0x2

#define I40E_LINK_SPEED_10GB_SHIFT	0x3

#define I40E_LINK_SPEED_40GB_SHIFT	0x4

#define I40E_LINK_SPEED_20GB_SHIFT	0x5

#define I40E_LINK_SPEED_25GB_SHIFT	0x6

#define I40E_LINK_SPEED_5GB_SHIFT	0x7



enum i40e_aq_link_speed {

	I40E_LINK_SPEED_UNKNOWN	= 0,

	I40E_LINK_SPEED_100MB	= BIT(I40E_LINK_SPEED_100MB_SHIFT),

	I40E_LINK_SPEED_1GB	= BIT(I40E_LINK_SPEED_1000MB_SHIFT),

	I40E_LINK_SPEED_2_5GB	= (1 << I40E_LINK_SPEED_2_5GB_SHIFT),

	I40E_LINK_SPEED_5GB	= (1 << I40E_LINK_SPEED_5GB_SHIFT),

	I40E_LINK_SPEED_10GB	= BIT(I40E_LINK_SPEED_10GB_SHIFT),

	I40E_LINK_SPEED_40GB	= BIT(I40E_LINK_SPEED_40GB_SHIFT),

	I40E_LINK_SPEED_20GB	= BIT(I40E_LINK_SPEED_20GB_SHIFT),
@@ -1987,6 +1995,8 @@ struct i40e_aq_get_phy_abilities_resp { 
#define I40E_AQ_PHY_TYPE_EXT_25G_LR	0x08

#define I40E_AQ_PHY_TYPE_EXT_25G_AOC	0x10

#define I40E_AQ_PHY_TYPE_EXT_25G_ACC	0x20

#define I40E_AQ_PHY_TYPE_EXT_2_5GBASE_T	0x40

#define I40E_AQ_PHY_TYPE_EXT_5GBASE_T	0x80

	u8	fec_cfg_curr_mod_ext_info;

#define I40E_AQ_ENABLE_FEC_KR		0x01

#define I40E_AQ_ENABLE_FEC_RS		0x02

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

+2 −4
Original line number Diff line number Diff line
@@ -578,11 +578,9 @@ static int i40e_client_setup_qvlist(struct i40e_info *ldev, 
	struct i40e_hw *hw = &pf->hw;

	struct i40e_qv_info *qv_info;

	u32 v_idx, i, reg_idx, reg;

	u32 size;



	size = sizeof(struct i40e_qvlist_info) +

	       (sizeof(struct i40e_qv_info) * (qvlist_info->num_vectors - 1));

	ldev->qvlist_info = kzalloc(size, GFP_KERNEL);

	ldev->qvlist_info = kzalloc(struct_size(ldev->qvlist_info, qv_info,

				    qvlist_info->num_vectors - 1), GFP_KERNEL);

	if (!ldev->qvlist_info)

		return -ENOMEM;

	ldev->qvlist_info->num_vectors = qvlist_info->num_vectors;

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

+7 −0
Original line number Diff line number Diff line
@@ -28,10 +28,14 @@ static i40e_status i40e_set_mac_type(struct i40e_hw *hw) 
		case I40E_DEV_ID_QSFP_C:

		case I40E_DEV_ID_10G_BASE_T:

		case I40E_DEV_ID_10G_BASE_T4:

		case I40E_DEV_ID_10G_B:

		case I40E_DEV_ID_10G_SFP:

		case I40E_DEV_ID_20G_KR2:

		case I40E_DEV_ID_20G_KR2_A:

		case I40E_DEV_ID_25G_B:

		case I40E_DEV_ID_25G_SFP28:

		case I40E_DEV_ID_X710_N3000:

		case I40E_DEV_ID_XXV710_N3000:

			hw->mac.type = I40E_MAC_XL710;

			break;

		case I40E_DEV_ID_KX_X722:
@@ -1149,6 +1153,8 @@ static enum i40e_media_type i40e_get_media_type(struct i40e_hw *hw) 
		break;

	case I40E_PHY_TYPE_100BASE_TX:

	case I40E_PHY_TYPE_1000BASE_T:

	case I40E_PHY_TYPE_2_5GBASE_T:

	case I40E_PHY_TYPE_5GBASE_T:

	case I40E_PHY_TYPE_10GBASE_T:

		media = I40E_MEDIA_TYPE_BASET;

		break;
@@ -4898,6 +4904,7 @@ i40e_status i40e_read_phy_register(struct i40e_hw *hw, 
		break;

	case I40E_DEV_ID_10G_BASE_T:

	case I40E_DEV_ID_10G_BASE_T4:

	case I40E_DEV_ID_10G_BASE_T_BC:

	case I40E_DEV_ID_10G_BASE_T_X722:

	case I40E_DEV_ID_25G_B:

	case I40E_DEV_ID_25G_SFP28:

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

+5 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
#define _I40E_DEVIDS_H_



/* Device IDs */

#define I40E_DEV_ID_X710_N3000		0x0CF8

#define I40E_DEV_ID_XXV710_N3000	0x0D58

#define I40E_DEV_ID_SFP_XL710		0x1572

#define I40E_DEV_ID_QEMU		0x1574

#define I40E_DEV_ID_KX_B		0x1580
@@ -18,6 +20,9 @@ 
#define I40E_DEV_ID_10G_BASE_T4		0x1589

#define I40E_DEV_ID_25G_B		0x158A

#define I40E_DEV_ID_25G_SFP28		0x158B

#define I40E_DEV_ID_10G_BASE_T_BC	0x15FF

#define I40E_DEV_ID_10G_B		0x104F

#define I40E_DEV_ID_10G_SFP		0x104E

#define I40E_DEV_ID_KX_X722		0x37CE

#define I40E_DEV_ID_QSFP_X722		0x37CF

#define I40E_DEV_ID_SFP_X722		0x37D0

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

+43 −3
Original line number Diff line number Diff line
@@ -508,6 +508,20 @@ static void i40e_phy_type_to_ethtool(struct i40e_pf *pf, 
			ethtool_link_ksettings_add_link_mode(ks, advertising,

							     10000baseT_Full);

	}

	if (phy_types & I40E_CAP_PHY_TYPE_2_5GBASE_T) {

		ethtool_link_ksettings_add_link_mode(ks, supported,

						     2500baseT_Full);

		if (hw_link_info->requested_speeds & I40E_LINK_SPEED_2_5GB)

			ethtool_link_ksettings_add_link_mode(ks, advertising,

							     2500baseT_Full);

	}

	if (phy_types & I40E_CAP_PHY_TYPE_5GBASE_T) {

		ethtool_link_ksettings_add_link_mode(ks, supported,

						     5000baseT_Full);

		if (hw_link_info->requested_speeds & I40E_LINK_SPEED_5GB)

			ethtool_link_ksettings_add_link_mode(ks, advertising,

							     5000baseT_Full);

	}

	if (phy_types & I40E_CAP_PHY_TYPE_XLAUI ||

	    phy_types & I40E_CAP_PHY_TYPE_XLPPI ||

	    phy_types & I40E_CAP_PHY_TYPE_40GBASE_AOC)
@@ -549,9 +563,9 @@ static void i40e_phy_type_to_ethtool(struct i40e_pf *pf, 
	}

	if (phy_types & I40E_CAP_PHY_TYPE_40GBASE_KR4) {

		ethtool_link_ksettings_add_link_mode(ks, supported,

						     40000baseLR4_Full);

						     40000baseKR4_Full);

		ethtool_link_ksettings_add_link_mode(ks, advertising,

						     40000baseLR4_Full);

						     40000baseKR4_Full);

	}

	if (phy_types & I40E_CAP_PHY_TYPE_20GBASE_KR2) {

		ethtool_link_ksettings_add_link_mode(ks, supported,
@@ -674,13 +688,15 @@ static void i40e_phy_type_to_ethtool(struct i40e_pf *pf, 
	    phy_types & I40E_CAP_PHY_TYPE_25GBASE_KR ||

	    phy_types & I40E_CAP_PHY_TYPE_25GBASE_CR ||

	    phy_types & I40E_CAP_PHY_TYPE_20GBASE_KR2 ||

	    phy_types & I40E_CAP_PHY_TYPE_10GBASE_T ||

	    phy_types & I40E_CAP_PHY_TYPE_10GBASE_SR ||

	    phy_types & I40E_CAP_PHY_TYPE_10GBASE_LR ||

	    phy_types & I40E_CAP_PHY_TYPE_10GBASE_KX4 ||

	    phy_types & I40E_CAP_PHY_TYPE_10GBASE_KR ||

	    phy_types & I40E_CAP_PHY_TYPE_10GBASE_CR1_CU ||

	    phy_types & I40E_CAP_PHY_TYPE_10GBASE_CR1 ||

	    phy_types & I40E_CAP_PHY_TYPE_10GBASE_T ||

	    phy_types & I40E_CAP_PHY_TYPE_5GBASE_T ||

	    phy_types & I40E_CAP_PHY_TYPE_2_5GBASE_T ||

	    phy_types & I40E_CAP_PHY_TYPE_1000BASE_T_OPTICAL ||

	    phy_types & I40E_CAP_PHY_TYPE_1000BASE_T ||

	    phy_types & I40E_CAP_PHY_TYPE_1000BASE_SX ||
@@ -790,11 +806,17 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw, 
							     10000baseT_Full);

		break;

	case I40E_PHY_TYPE_10GBASE_T:

	case I40E_PHY_TYPE_5GBASE_T:

	case I40E_PHY_TYPE_2_5GBASE_T:

	case I40E_PHY_TYPE_1000BASE_T:

	case I40E_PHY_TYPE_100BASE_TX:

		ethtool_link_ksettings_add_link_mode(ks, supported, Autoneg);

		ethtool_link_ksettings_add_link_mode(ks, supported,

						     10000baseT_Full);

		ethtool_link_ksettings_add_link_mode(ks, supported,

						     5000baseT_Full);

		ethtool_link_ksettings_add_link_mode(ks, supported,

						     2500baseT_Full);

		ethtool_link_ksettings_add_link_mode(ks, supported,

						     1000baseT_Full);

		ethtool_link_ksettings_add_link_mode(ks, supported,
@@ -803,6 +825,12 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw, 
		if (hw_link_info->requested_speeds & I40E_LINK_SPEED_10GB)

			ethtool_link_ksettings_add_link_mode(ks, advertising,

							     10000baseT_Full);

		if (hw_link_info->requested_speeds & I40E_LINK_SPEED_5GB)

			ethtool_link_ksettings_add_link_mode(ks, advertising,

							     5000baseT_Full);

		if (hw_link_info->requested_speeds & I40E_LINK_SPEED_2_5GB)

			ethtool_link_ksettings_add_link_mode(ks, advertising,

							     2500baseT_Full);

		if (hw_link_info->requested_speeds & I40E_LINK_SPEED_1GB)

			ethtool_link_ksettings_add_link_mode(ks, advertising,

							     1000baseT_Full);
@@ -958,6 +986,12 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw, 
	case I40E_LINK_SPEED_10GB:

		ks->base.speed = SPEED_10000;

		break;

	case I40E_LINK_SPEED_5GB:

		ks->base.speed = SPEED_5000;

		break;

	case I40E_LINK_SPEED_2_5GB:

		ks->base.speed = SPEED_2500;

		break;

	case I40E_LINK_SPEED_1GB:

		ks->base.speed = SPEED_1000;

		break;
@@ -1243,6 +1277,12 @@ static int i40e_set_link_ksettings(struct net_device *netdev, 
	    ethtool_link_ksettings_test_link_mode(ks, advertising,

						  10000baseLR_Full))

		config.link_speed |= I40E_LINK_SPEED_10GB;

	if (ethtool_link_ksettings_test_link_mode(ks, advertising,

						  2500baseT_Full))

		config.link_speed |= I40E_LINK_SPEED_2_5GB;

	if (ethtool_link_ksettings_test_link_mode(ks, advertising,

						  5000baseT_Full))

		config.link_speed |= I40E_LINK_SPEED_5GB;

	if (ethtool_link_ksettings_test_link_mode(ks, advertising,

						  20000baseKR2_Full))

		config.link_speed |= I40E_LINK_SPEED_20GB;