Commit 7ee7f3e8 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-08-22

This series contains updates to i40e driver only.

Arnd Bergmann reduces the stack usage which was causing warnings on
32-bit architectures due to large structure sizes for 2 functions
getting inlined, so use noinline_for_stack to prevent the compilers from
combining the 2 functions.

Mauro S. M. Rodrigues fixes an issue when reading an EEPROM from SFP
modules that comply with SFF-8472 but do not implement the Digital
Diagnostic Monitoring (DDM) interface for i40e.

Huhai found we were not checking the return value for configuring the
transmit ring and continuing with XDP configuration of the transmit
ring.

Beilei fixes an issue of shifting signed 32-bit integers.

Sylwia adds support for "packet drop mode" to the MAC configuration for
admin queue command.  This bit controls the behavior when a no-drop
packet is blocking a TC queue.  Adds support for persistent LLDP by
checking the LLDP flag and reading the LLDP from the NVM when enabled.

Adrian fixes the "recovery mode" check to take into account which device
we are on, since x710 devices have 4 register values to check for status
and x722 devices only have 2 register values to check.

Piotr Azarewicz bumps the supported firmware API version to 1.9 which
extends the PHY access admin queue command support.

Jake makes sure the traffic class stats for a VEB are reset when the VEB
stats are reset.

Slawomir fixes a NULL pointer dereference where the VSI pointer was not
updated before passing it to the i40e_set_vf_mac() when the VF is in a
reset state, so wait for the reset to complete.

Grzegorz removes the i40e_update_dcb_config() which was not using the
correct NVM reads, so call i40e_init_dcb() in its place to correctly
update the DCB configuration.

Piotr Kwapulinski expands the scope of i40e_set_mac_type() since this is
needed during probe to determine if we are in recovery mode.  Fixed the
driver reset path when in recovery mode.

Marcin fixed an issue where we were breaking out of a loop too early
when trying to get the PHY capabilities.

v2: Combined patch 7 & 9 in the original series, since both patches
    bumped firmware API version.  Also combined patches 12 & 13 in the
    original series, since one increased the scope of checking for MAC
    and the follow-on patch made use of function within the new scope.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c76c9925 1b5f5d38

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

+3 −1
Original line number Diff line number Diff line
@@ -610,8 +610,10 @@ i40e_status i40e_init_adminq(struct i40e_hw *hw) 


	if (hw->aq.api_maj_ver > 1 ||

	    (hw->aq.api_maj_ver == 1 &&

	     hw->aq.api_min_ver >= 8))

	     hw->aq.api_min_ver >= 8)) {

		hw->flags |= I40E_HW_FLAG_FW_LLDP_PERSISTENT;

		hw->flags |= I40E_HW_FLAG_DROP_MODE;

	}



	if (hw->aq.api_maj_ver > I40E_FW_API_VERSION_MAJOR) {

		ret_code = I40E_ERR_FIRMWARE_API_VERSION;

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

+17 −16
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ 
 */



#define I40E_FW_API_VERSION_MAJOR	0x0001

#define I40E_FW_API_VERSION_MINOR_X722	0x0008

#define I40E_FW_API_VERSION_MINOR_X710	0x0008

#define I40E_FW_API_VERSION_MINOR_X722	0x0009

#define I40E_FW_API_VERSION_MINOR_X710	0x0009



#define I40E_FW_MINOR_VERSION(_h) ((_h)->mac.type == I40E_MAC_XL710 ? \

					I40E_FW_API_VERSION_MINOR_X710 : \
@@ -2065,6 +2065,7 @@ struct i40e_aq_set_mac_config { 
#define I40E_AQ_SET_MAC_CONFIG_PACING_7DW_3TX		0x3

#define I40E_AQ_SET_MAC_CONFIG_PACING_4DW_1TX		0x2

#define I40E_AQ_SET_MAC_CONFIG_PACING_9DW_1TX		0x1

#define I40E_AQ_SET_MAC_CONFIG_DROP_BLOCKING_PACKET_EN	0x80

	u8	tx_timer_priority; /* bitmap */

	__le16	tx_timer_value;

	__le16	fc_refresh_threshold;

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

+62 −48
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 * This function sets the mac type of the adapter based on the

 * vendor ID and device ID stored in the hw structure.

 **/

static i40e_status i40e_set_mac_type(struct i40e_hw *hw)

i40e_status i40e_set_mac_type(struct i40e_hw *hw)

{

	i40e_status status = 0;
@@ -1577,18 +1577,21 @@ i40e_status i40e_aq_get_phy_capabilities(struct i40e_hw *hw, 
		status = i40e_asq_send_command(hw, &desc, abilities,

					       abilities_size, cmd_details);



		if (status)

			break;



		if (hw->aq.asq_last_status == I40E_AQ_RC_EIO) {

		switch (hw->aq.asq_last_status) {

		case I40E_AQ_RC_EIO:

			status = I40E_ERR_UNKNOWN_PHY;

			break;

		} else if (hw->aq.asq_last_status == I40E_AQ_RC_EAGAIN) {

		case I40E_AQ_RC_EAGAIN:

			usleep_range(1000, 2000);

			total_delay++;

			status = I40E_ERR_TIMEOUT;

			break;

		/* also covers I40E_AQ_RC_OK */

		default:

			break;

		}

	} while ((hw->aq.asq_last_status != I40E_AQ_RC_OK) &&



	} while ((hw->aq.asq_last_status == I40E_AQ_RC_EAGAIN) &&

		(total_delay < max_delay));



	if (status)
@@ -1643,25 +1646,15 @@ enum i40e_status_code i40e_aq_set_phy_config(struct i40e_hw *hw, 
	return status;

}



/**

 * i40e_set_fc

 * @hw: pointer to the hw struct

 * @aq_failures: buffer to return AdminQ failure information

 * @atomic_restart: whether to enable atomic link restart

 *

 * Set the requested flow control mode using set_phy_config.

 **/

enum i40e_status_code i40e_set_fc(struct i40e_hw *hw, u8 *aq_failures,

static noinline_for_stack enum i40e_status_code

i40e_set_fc_status(struct i40e_hw *hw,

		   struct i40e_aq_get_phy_abilities_resp *abilities,

		   bool atomic_restart)

{

	enum i40e_fc_mode fc_mode = hw->fc.requested_mode;

	struct i40e_aq_get_phy_abilities_resp abilities;

	struct i40e_aq_set_phy_config config;

	enum i40e_status_code status;

	enum i40e_fc_mode fc_mode = hw->fc.requested_mode;

	u8 pause_mask = 0x0;



	*aq_failures = 0x0;



	switch (fc_mode) {

	case I40E_FC_FULL:

		pause_mask |= I40E_AQ_PHY_FLAG_PAUSE_TX;
@@ -1677,39 +1670,60 @@ enum i40e_status_code i40e_set_fc(struct i40e_hw *hw, u8 *aq_failures, 
		break;

	}



	/* Get the current phy config */

	status = i40e_aq_get_phy_capabilities(hw, false, false, &abilities,

					      NULL);

	if (status) {

		*aq_failures |= I40E_SET_FC_AQ_FAIL_GET;

		return status;

	}



	memset(&config, 0, sizeof(struct i40e_aq_set_phy_config));

	/* clear the old pause settings */

	config.abilities = abilities.abilities & ~(I40E_AQ_PHY_FLAG_PAUSE_TX) &

	config.abilities = abilities->abilities & ~(I40E_AQ_PHY_FLAG_PAUSE_TX) &

			   ~(I40E_AQ_PHY_FLAG_PAUSE_RX);

	/* set the new abilities */

	config.abilities |= pause_mask;

	/* If the abilities have changed, then set the new config */

	if (config.abilities != abilities.abilities) {

	if (config.abilities == abilities->abilities)

		return 0;



	/* Auto restart link so settings take effect */

	if (atomic_restart)

		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 &

	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);



	return i40e_aq_set_phy_config(hw, &config, NULL);

}



/**

 * i40e_set_fc

 * @hw: pointer to the hw struct

 * @aq_failures: buffer to return AdminQ failure information

 * @atomic_restart: whether to enable atomic link restart

 *

 * Set the requested flow control mode using set_phy_config.

 **/

enum i40e_status_code i40e_set_fc(struct i40e_hw *hw, u8 *aq_failures,

				  bool atomic_restart)

{

	struct i40e_aq_get_phy_abilities_resp abilities;

	enum i40e_status_code status;



	*aq_failures = 0x0;



	/* Get the current phy config */

	status = i40e_aq_get_phy_capabilities(hw, false, false, &abilities,

					      NULL);

	if (status) {

		*aq_failures |= I40E_SET_FC_AQ_FAIL_GET;

		return status;

	}



	status = i40e_set_fc_status(hw, &abilities, atomic_restart);

	if (status)

		*aq_failures |= I40E_SET_FC_AQ_FAIL_SET;

	}



	/* Update the link info */

	status = i40e_update_link_info(hw);

	if (status) {
@@ -2537,7 +2551,7 @@ i40e_status i40e_get_link_status(struct i40e_hw *hw, bool *link_up) 
 * i40e_updatelink_status - update status of the HW network link

 * @hw: pointer to the hw struct

 **/

i40e_status i40e_update_link_info(struct i40e_hw *hw)

noinline_for_stack i40e_status i40e_update_link_info(struct i40e_hw *hw)

{

	struct i40e_aq_get_phy_abilities_resp abilities;

	i40e_status status = 0;

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

+17 −1
Original line number Diff line number Diff line
@@ -877,7 +877,23 @@ i40e_status i40e_init_dcb(struct i40e_hw *hw, bool enable_mib_change) 
		return I40E_NOT_SUPPORTED;



	/* Read LLDP NVM area */

	if (hw->flags & I40E_HW_FLAG_FW_LLDP_PERSISTENT) {

		u8 offset = 0;



		if (hw->mac.type == I40E_MAC_XL710)

			offset = I40E_LLDP_CURRENT_STATUS_XL710_OFFSET;

		else if (hw->mac.type == I40E_MAC_X722)

			offset = I40E_LLDP_CURRENT_STATUS_X722_OFFSET;

		else

			return I40E_NOT_SUPPORTED;



		ret = i40e_read_nvm_module_data(hw,

						I40E_SR_EMP_SR_SETTINGS_PTR,

						offset, 1,

						&lldp_cfg.adminstatus);

	} else {

		ret = i40e_read_lldp_cfg(hw, &lldp_cfg);

	}

	if (ret)

		return I40E_ERR_NOT_READY;

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

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 
#define I40E_CEE_SUBTYPE_APP_PRI	4



#define I40E_CEE_MAX_FEAT_TYPE		3

#define I40E_LLDP_CURRENT_STATUS_XL710_OFFSET	0x2B

#define I40E_LLDP_CURRENT_STATUS_X722_OFFSET	0x31

/* Defines for LLDP TLV header */

#define I40E_LLDP_TLV_LEN_SHIFT		0

#define I40E_LLDP_TLV_LEN_MASK		(0x01FF << I40E_LLDP_TLV_LEN_SHIFT)

CRA Git | Maintained and supported by SUSTech CRA and CCSE