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

Commit 63c36c40 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 2016-12-07

This series contains updates to i40e and i40evf only.

Filip modifies the i40e to log link speed change and when the link is
brought up and down.

Mitch replaces i40e_txd_use_count() with a new function which is slightly
faster and better documented so the dim witted can better follow the
code.  Fixes the locking of the service task so that it is actually
done in the service task and not in the scheduling function which calls
the service task.

Jacob, being the busy little beaver he is, provides most of the changes
starting restores a workaround that is still needed in some configurations,
specifically the Ethernet Controller XL710 for 40GbE QSFP+.  Removes
duplicate code and simplifies the i40e_vsi_add_vlan() and
i40e_vsi_kill_vlan() functions.  Removes detection of PTP frames over L4
(UDP) on the XL710 MAC, since there was a product decision to defeature
it.  Fixed a previous refactor of active filters which caused issues in
the accounting of active_filters.  Remaining work was done in the VLAN
filters to improve readability and simplify code as much as possible
to reduce inconsistencies.

Alex fixes foul budget accounting in core code by returning actual
work done, capped to budget-1.

Henry fixes the "ethtool -p" function for 1G BaseT PHYs.

Carolyn adds support for 25G devices for i40e and i40evf.

Michal adds functions to apply the correct access method for external PHYs
which could use Clause22 or Clause45 depending on the PHY.

v2: dropped last patch from previous series, since changes are needed based
    on feedback from Sergei Shtylyov
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 25e3e84b 489a3265

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

+5 −1
Original line number Diff line number Diff line
@@ -356,10 +356,11 @@ struct i40e_pf { 
#define I40E_FLAG_NO_DCB_SUPPORT		BIT_ULL(45)

#define I40E_FLAG_USE_SET_LLDP_MIB		BIT_ULL(46)

#define I40E_FLAG_STOP_FW_LLDP			BIT_ULL(47)

#define I40E_FLAG_HAVE_10GBASET_PHY		BIT_ULL(48)

#define I40E_FLAG_PHY_CONTROLS_LEDS		BIT_ULL(48)

#define I40E_FLAG_PF_MAC			BIT_ULL(50)

#define I40E_FLAG_TRUE_PROMISC_SUPPORT		BIT_ULL(51)

#define I40E_FLAG_HAVE_CRT_RETIMER		BIT_ULL(52)

#define I40E_FLAG_PTP_L4_CAPABLE		BIT_ULL(53)



	/* tracks features that get auto disabled by errors */

	u64 auto_disable_flags;
@@ -596,6 +597,7 @@ struct i40e_vsi { 
	u16 veb_idx;		/* index of VEB parent */

	struct kobject *kobj;	/* sysfs object */

	bool current_isup;	/* Sync 'link up' logging */

	enum i40e_aq_link_speed current_speed;	/* Sync link speed logging */



	void *priv;	/* client driver data reference. */
@@ -850,7 +852,9 @@ int i40e_open(struct net_device *netdev); 
int i40e_close(struct net_device *netdev);

int i40e_vsi_open(struct i40e_vsi *vsi);

void i40e_vlan_stripping_disable(struct i40e_vsi *vsi);

int i40e_add_vlan_all_mac(struct i40e_vsi *vsi, s16 vid);

int i40e_vsi_add_vlan(struct i40e_vsi *vsi, s16 vid);

void i40e_rm_vlan_all_mac(struct i40e_vsi *vsi, s16 vid);

void i40e_vsi_kill_vlan(struct i40e_vsi *vsi, s16 vid);

struct i40e_mac_filter *i40e_put_mac_in_vlan(struct i40e_vsi *vsi,

					     const u8 *macaddr);

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

+48 −3
Original line number Diff line number Diff line
@@ -1642,6 +1642,10 @@ enum i40e_aq_phy_type { 
	I40E_PHY_TYPE_1000BASE_LX		= 0x1C,

	I40E_PHY_TYPE_1000BASE_T_OPTICAL	= 0x1D,

	I40E_PHY_TYPE_20GBASE_KR2		= 0x1E,

	I40E_PHY_TYPE_25GBASE_KR		= 0x1F,

	I40E_PHY_TYPE_25GBASE_CR		= 0x20,

	I40E_PHY_TYPE_25GBASE_SR		= 0x21,

	I40E_PHY_TYPE_25GBASE_LR		= 0x22,

	I40E_PHY_TYPE_MAX

};
@@ -1650,6 +1654,7 @@ enum i40e_aq_phy_type { 
#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



enum i40e_aq_link_speed {

	I40E_LINK_SPEED_UNKNOWN	= 0,
@@ -1657,7 +1662,8 @@ enum i40e_aq_link_speed { 
	I40E_LINK_SPEED_1GB	= BIT(I40E_LINK_SPEED_1000MB_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)

	I40E_LINK_SPEED_20GB	= BIT(I40E_LINK_SPEED_20GB_SHIFT),

	I40E_LINK_SPEED_25GB	= BIT(I40E_LINK_SPEED_25GB_SHIFT),

};



struct i40e_aqc_module_desc {
@@ -1680,6 +1686,8 @@ struct i40e_aq_get_phy_abilities_resp { 
#define I40E_AQ_PHY_LINK_ENABLED	0x08

#define I40E_AQ_PHY_AN_ENABLED		0x10

#define I40E_AQ_PHY_FLAG_MODULE_QUAL	0x20

#define I40E_AQ_PHY_FEC_ABILITY_KR	0x40

#define I40E_AQ_PHY_FEC_ABILITY_RS	0x80

	__le16	eee_capability;

#define I40E_AQ_EEE_100BASE_TX		0x0002

#define I40E_AQ_EEE_1000BASE_T		0x0004
@@ -1690,7 +1698,22 @@ struct i40e_aq_get_phy_abilities_resp { 
	__le32	eeer_val;

	u8	d3_lpan;

#define I40E_AQ_SET_PHY_D3_LPAN_ENA	0x01

	u8	reserved[3];

	u8	phy_type_ext;

#define I40E_AQ_PHY_TYPE_EXT_25G_KR	0X01

#define I40E_AQ_PHY_TYPE_EXT_25G_CR	0X02

#define I40E_AQ_PHY_TYPE_EXT_25G_SR	0x04

#define I40E_AQ_PHY_TYPE_EXT_25G_LR	0x08

	u8	fec_cfg_curr_mod_ext_info;

#define I40E_AQ_ENABLE_FEC_KR		0x01

#define I40E_AQ_ENABLE_FEC_RS		0x02

#define I40E_AQ_REQUEST_FEC_KR		0x04

#define I40E_AQ_REQUEST_FEC_RS		0x08

#define I40E_AQ_ENABLE_FEC_AUTO		0x10

#define I40E_AQ_FEC

#define I40E_AQ_MODULE_TYPE_EXT_MASK	0xE0

#define I40E_AQ_MODULE_TYPE_EXT_SHIFT	5



	u8	ext_comp_code;

	u8	phy_id[4];

	u8	module_type[3];

	u8	qualified_module_count;
@@ -1712,7 +1735,20 @@ struct i40e_aq_set_phy_config { /* same bits as above in all */ 
	__le16	eee_capability;

	__le32	eeer;

	u8	low_power_ctrl;

	u8	reserved[3];

	u8	phy_type_ext;

#define I40E_AQ_PHY_TYPE_EXT_25G_KR	0X01

#define I40E_AQ_PHY_TYPE_EXT_25G_CR	0X02

#define I40E_AQ_PHY_TYPE_EXT_25G_SR	0x04

#define I40E_AQ_PHY_TYPE_EXT_25G_LR	0x08

	u8	fec_config;

#define I40E_AQ_SET_FEC_ABILITY_KR	BIT(0)

#define I40E_AQ_SET_FEC_ABILITY_RS	BIT(1)

#define I40E_AQ_SET_FEC_REQUEST_KR	BIT(2)

#define I40E_AQ_SET_FEC_REQUEST_RS	BIT(3)

#define I40E_AQ_SET_FEC_AUTO		BIT(4)

#define I40E_AQ_PHY_FEC_CONFIG_SHIFT	0x0

#define I40E_AQ_PHY_FEC_CONFIG_MASK	(0x1F << I40E_AQ_PHY_FEC_CONFIG_SHIFT)

	u8	reserved;

};



I40E_CHECK_CMD_LENGTH(i40e_aq_set_phy_config);
@@ -1792,9 +1828,18 @@ struct i40e_aqc_get_link_status { 
#define I40E_AQ_LINK_TX_DRAINED		0x01

#define I40E_AQ_LINK_TX_FLUSHED		0x03

#define I40E_AQ_LINK_FORCED_40G		0x10

/* 25G Error Codes */

#define I40E_AQ_25G_NO_ERR		0X00

#define I40E_AQ_25G_NOT_PRESENT		0X01

#define I40E_AQ_25G_NVM_CRC_ERR		0X02

#define I40E_AQ_25G_SBUS_UCODE_ERR	0X03

#define I40E_AQ_25G_SERDES_UCODE_ERR	0X04

#define I40E_AQ_25G_NIMB_UCODE_ERR	0X05

	u8	loopback; /* use defines from i40e_aqc_set_lb_mode */

	__le16	max_frame_size;

	u8	config;

#define I40E_AQ_CONFIG_FEC_KR_ENA	0x01

#define I40E_AQ_CONFIG_FEC_RS_ENA	0x02

#define I40E_AQ_CONFIG_CRC_ENA		0x04

#define I40E_AQ_CONFIG_PACING_MASK	0x78

	u8	external_power_ability;

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

+84 −1
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ static i40e_status i40e_set_mac_type(struct i40e_hw *hw) 
		case I40E_DEV_ID_10G_BASE_T4:

		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:

			hw->mac.type = I40E_MAC_XL710;

			break;

		case I40E_DEV_ID_KX_X722:
@@ -1183,6 +1185,8 @@ static enum i40e_media_type i40e_get_media_type(struct i40e_hw *hw) 
	case I40E_PHY_TYPE_1000BASE_LX:

	case I40E_PHY_TYPE_40GBASE_SR4:

	case I40E_PHY_TYPE_40GBASE_LR4:

	case I40E_PHY_TYPE_25GBASE_LR:

	case I40E_PHY_TYPE_25GBASE_SR:

		media = I40E_MEDIA_TYPE_FIBER;

		break;

	case I40E_PHY_TYPE_100BASE_TX:
@@ -1197,6 +1201,7 @@ static enum i40e_media_type i40e_get_media_type(struct i40e_hw *hw) 
	case I40E_PHY_TYPE_10GBASE_SFPP_CU:

	case I40E_PHY_TYPE_40GBASE_AOC:

	case I40E_PHY_TYPE_10GBASE_AOC:

	case I40E_PHY_TYPE_25GBASE_CR:

		media = I40E_MEDIA_TYPE_DA;

		break;

	case I40E_PHY_TYPE_1000BASE_KX:
@@ -1204,6 +1209,7 @@ static enum i40e_media_type i40e_get_media_type(struct i40e_hw *hw) 
	case I40E_PHY_TYPE_10GBASE_KR:

	case I40E_PHY_TYPE_40GBASE_KR4:

	case I40E_PHY_TYPE_20GBASE_KR2:

	case I40E_PHY_TYPE_25GBASE_KR:

		media = I40E_MEDIA_TYPE_BACKPLANE;

		break;

	case I40E_PHY_TYPE_SGMII:
@@ -1608,8 +1614,10 @@ i40e_status i40e_aq_get_phy_capabilities(struct i40e_hw *hw, 
	if (hw->aq.asq_last_status == I40E_AQ_RC_EIO)

		status = I40E_ERR_UNKNOWN_PHY;



	if (report_init)

	if (report_init) {

		hw->phy.phy_types = le32_to_cpu(abilities->phy_type);

		hw->phy.phy_types |= ((u64)abilities->phy_type_ext << 32);

	}



	return status;

}
@@ -1701,10 +1709,13 @@ enum i40e_status_code i40e_set_fc(struct i40e_hw *hw, u8 *aq_failures, 
			config.abilities |= I40E_AQ_PHY_ENABLE_ATOMIC_LINK;

		/* Copy over all the old settings */

		config.phy_type = abilities.phy_type;

		config.phy_type_ext = abilities.phy_type_ext;

		config.link_speed = abilities.link_speed;

		config.eee_capability = abilities.eee_capability;

		config.eeer = abilities.eeer_val;

		config.low_power_ctrl = abilities.d3_lpan;

		config.fec_config = abilities.fec_cfg_curr_mod_ext_info &

				    I40E_AQ_PHY_FEC_CONFIG_MASK;

		status = i40e_aq_set_phy_config(hw, &config, NULL);



		if (status)
@@ -4664,6 +4675,78 @@ i40e_status i40e_write_phy_register_clause45(struct i40e_hw *hw, 
	return status;

}



/**

 * i40e_write_phy_register

 * @hw: pointer to the HW structure

 * @page: registers page number

 * @reg: register address in the page

 * @phy_adr: PHY address on MDIO interface

 * @value: PHY register value

 *

 * Writes value to specified PHY register

 **/

i40e_status i40e_write_phy_register(struct i40e_hw *hw,

				    u8 page, u16 reg, u8 phy_addr, u16 value)

{

	i40e_status status;



	switch (hw->device_id) {

	case I40E_DEV_ID_1G_BASE_T_X722:

		status = i40e_write_phy_register_clause22(hw, reg, phy_addr,

							  value);

		break;

	case I40E_DEV_ID_10G_BASE_T:

	case I40E_DEV_ID_10G_BASE_T4:

	case I40E_DEV_ID_10G_BASE_T_X722:

	case I40E_DEV_ID_25G_B:

	case I40E_DEV_ID_25G_SFP28:

		status = i40e_write_phy_register_clause45(hw, page, reg,

							  phy_addr, value);

		break;

	default:

		status = I40E_ERR_UNKNOWN_PHY;

		break;

	}



	return status;

}



/**

 * i40e_read_phy_register

 * @hw: pointer to the HW structure

 * @page: registers page number

 * @reg: register address in the page

 * @phy_adr: PHY address on MDIO interface

 * @value: PHY register value

 *

 * Reads specified PHY register value

 **/

i40e_status i40e_read_phy_register(struct i40e_hw *hw,

				   u8 page, u16 reg, u8 phy_addr, u16 *value)

{

	i40e_status status;



	switch (hw->device_id) {

	case I40E_DEV_ID_1G_BASE_T_X722:

		status = i40e_read_phy_register_clause22(hw, reg, phy_addr,

							 value);

		break;

	case I40E_DEV_ID_10G_BASE_T:

	case I40E_DEV_ID_10G_BASE_T4:

	case I40E_DEV_ID_10G_BASE_T_X722:

	case I40E_DEV_ID_25G_B:

	case I40E_DEV_ID_25G_SFP28:

		status = i40e_read_phy_register_clause45(hw, page, reg,

							 phy_addr, value);

		break;

	default:

		status = I40E_ERR_UNKNOWN_PHY;

		break;

	}



	return status;

}



/**

 * i40e_get_phy_address

 * @hw: pointer to the HW structure

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

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static void i40e_dbg_dump_vsi_seid(struct i40e_pf *pf, int seid) 
			 f->macaddr, f->vlan,

			 i40e_filter_state_string[f->state]);

	}

	dev_info(&pf->pdev->dev, "    active_filters %d, promisc_threshold %d, overflow promisc %s\n",

	dev_info(&pf->pdev->dev, "    active_filters %u, promisc_threshold %u, overflow promisc %s\n",

		 vsi->active_filters, vsi->promisc_threshold,

		 (test_bit(__I40E_FILTER_OVERFLOW_PROMISC, &vsi->state) ?

		  "ON" : "OFF"));

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

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ 
#define I40E_DEV_ID_20G_KR2		0x1587

#define I40E_DEV_ID_20G_KR2_A		0x1588

#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_KX_X722		0x37CE

#define I40E_DEV_ID_QSFP_X722		0x37CF

#define I40E_DEV_ID_SFP_X722		0x37D0