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

Commit 2ce1aef9 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-03

This series contains updates to the i40e driver only.

Carolyn changes the driver behavior to now disable the VF after one MDD
event instead of allowing a couple of MDD events before doing the reset.

Aleksandr changes the driver to only report an error when a VF tries to
remove VLAN when a port VLAN is configured, unless it is VLAN 0.  Also
extends the LLDP support to be able to keep the current LLDP state
persistent across a power cycle.

Maciej fixes the checksum calculation due to firmware changes, which
requires the driver to perform a double shadow RAM dump in some cases.

Adam adds advertising support for 40GBase_LR4, 40GBase_CR4 and fibre in
the driver.

Jake cleans up a check that is not needed and was producing a warning in
GCC 8.

Harshitha fixes a misleading message by ensuring that a success message
is only printed on the host side when the promiscuous mode change has
been successful.

Stefan Assmann adds the vendor id and device id to the dmesg log entry
during probe to help with bug reports when lspci output may not be
available.

Alice and Piotr add recovery mode support in the i40e driver, which is
needed for migrating from a structured to a flat firmware image.

v2: Removed patch 1 "i40e: replace switch-statement to speed-up
    retpoline-enabled builds" from the series since it is no longer
    needed.  Also updated the last patch in the series that introduces
    recovery mode support, to include a more detailed patch description
    and removed code not intended for the upstream kernel.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8ef988b9 4ff0ee1a

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

+1 −0
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ enum i40e_state_t { 
	__I40E_CLIENT_L2_CHANGE,

	__I40E_CLIENT_RESET,

	__I40E_VIRTCHNL_OP_PENDING,

	__I40E_RECOVERY_MODE,

	/* This must be last as it determines the size of the BITMAP */

	__I40E_STATE_SIZE__,

};

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

+5 −0
Original line number Diff line number Diff line
@@ -608,6 +608,11 @@ i40e_status i40e_init_adminq(struct i40e_hw *hw) 
	     hw->aq.api_min_ver >= 7))

		hw->flags |= I40E_HW_FLAG_802_1AD_CAPABLE;



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

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

	     hw->aq.api_min_ver >= 8))

		hw->flags |= I40E_HW_FLAG_FW_LLDP_PERSISTENT;



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

		ret_code = I40E_ERR_FIRMWARE_API_VERSION;

		goto init_adminq_free_arq;

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

+16 −4
Original line number Diff line number Diff line
@@ -261,6 +261,7 @@ enum i40e_admin_queue_opc { 
	i40e_aqc_opc_get_cee_dcb_cfg	= 0x0A07,

	i40e_aqc_opc_lldp_set_local_mib	= 0x0A08,

	i40e_aqc_opc_lldp_stop_start_spec_agent	= 0x0A09,

	i40e_aqc_opc_lldp_restore		= 0x0A0A,



	/* Tunnel commands */

	i40e_aqc_opc_add_udp_tunnel	= 0x0B00,
@@ -2500,16 +2501,17 @@ struct i40e_aqc_lldp_stop { 
	u8	command;

#define I40E_AQ_LLDP_AGENT_STOP			0x0

#define I40E_AQ_LLDP_AGENT_SHUTDOWN		0x1

#define I40E_AQ_LLDP_AGENT_STOP_PERSIST		0x2

	u8	reserved[15];

};



I40E_CHECK_CMD_LENGTH(i40e_aqc_lldp_stop);



/* Start LLDP (direct 0x0A06) */



struct i40e_aqc_lldp_start {

	u8	command;

#define I40E_AQ_LLDP_AGENT_START		0x1

#define I40E_AQ_LLDP_AGENT_START_PERSIST	0x2

	u8	reserved[15];

};
@@ -2633,6 +2635,16 @@ struct i40e_aqc_lldp_stop_start_specific_agent { 


I40E_CHECK_CMD_LENGTH(i40e_aqc_lldp_stop_start_specific_agent);



/* Restore LLDP Agent factory settings (direct 0x0A0A) */

struct i40e_aqc_lldp_restore {

	u8	command;

#define I40E_AQ_LLDP_AGENT_RESTORE_NOT		0x0

#define I40E_AQ_LLDP_AGENT_RESTORE		0x1

	u8	reserved[15];

};



I40E_CHECK_CMD_LENGTH(i40e_aqc_lldp_restore);



/* Add Udp Tunnel command and completion (direct 0x0B00) */

struct i40e_aqc_add_udp_tunnel {

	__le16	udp_port;

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

+60 −2
Original line number Diff line number Diff line
@@ -3623,15 +3623,55 @@ i40e_status i40e_aq_cfg_lldp_mib_change_event(struct i40e_hw *hw, 
	return status;

}



/**

 * i40e_aq_restore_lldp

 * @hw: pointer to the hw struct

 * @setting: pointer to factory setting variable or NULL

 * @restore: True if factory settings should be restored

 * @cmd_details: pointer to command details structure or NULL

 *

 * Restore LLDP Agent factory settings if @restore set to True. In other case

 * only returns factory setting in AQ response.

 **/

enum i40e_status_code

i40e_aq_restore_lldp(struct i40e_hw *hw, u8 *setting, bool restore,

		     struct i40e_asq_cmd_details *cmd_details)

{

	struct i40e_aq_desc desc;

	struct i40e_aqc_lldp_restore *cmd =

		(struct i40e_aqc_lldp_restore *)&desc.params.raw;

	i40e_status status;



	if (!(hw->flags & I40E_HW_FLAG_FW_LLDP_PERSISTENT)) {

		i40e_debug(hw, I40E_DEBUG_ALL,

			   "Restore LLDP not supported by current FW version.\n");

		return I40E_ERR_DEVICE_NOT_SUPPORTED;

	}



	i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_lldp_restore);



	if (restore)

		cmd->command |= I40E_AQ_LLDP_AGENT_RESTORE;



	status = i40e_asq_send_command(hw, &desc, NULL, 0, cmd_details);



	if (setting)

		*setting = cmd->command & 1;



	return status;

}



/**

 * i40e_aq_stop_lldp

 * @hw: pointer to the hw struct

 * @shutdown_agent: True if LLDP Agent needs to be Shutdown

 * @persist: True if stop of LLDP should be persistent across power cycles

 * @cmd_details: pointer to command details structure or NULL

 *

 * Stop or Shutdown the embedded LLDP Agent

 **/

i40e_status i40e_aq_stop_lldp(struct i40e_hw *hw, bool shutdown_agent,

				bool persist,

				struct i40e_asq_cmd_details *cmd_details)

{

	struct i40e_aq_desc desc;
@@ -3644,6 +3684,14 @@ i40e_status i40e_aq_stop_lldp(struct i40e_hw *hw, bool shutdown_agent, 
	if (shutdown_agent)

		cmd->command |= I40E_AQ_LLDP_AGENT_SHUTDOWN;



	if (persist) {

		if (hw->flags & I40E_HW_FLAG_FW_LLDP_PERSISTENT)

			cmd->command |= I40E_AQ_LLDP_AGENT_STOP_PERSIST;

		else

			i40e_debug(hw, I40E_DEBUG_ALL,

				   "Persistent Stop LLDP not supported by current FW version.\n");

	}



	status = i40e_asq_send_command(hw, &desc, NULL, 0, cmd_details);



	return status;
@@ -3653,12 +3701,13 @@ i40e_status i40e_aq_stop_lldp(struct i40e_hw *hw, bool shutdown_agent, 
 * i40e_aq_start_lldp

 * @hw: pointer to the hw struct

 * @buff: buffer for result

 * @persist: True if start of LLDP should be persistent across power cycles

 * @buff_size: buffer size

 * @cmd_details: pointer to command details structure or NULL

 *

 * Start the embedded LLDP Agent on all ports.

 **/

i40e_status i40e_aq_start_lldp(struct i40e_hw *hw,

i40e_status i40e_aq_start_lldp(struct i40e_hw *hw, bool persist,

			       struct i40e_asq_cmd_details *cmd_details)

{

	struct i40e_aq_desc desc;
@@ -3669,6 +3718,15 @@ i40e_status i40e_aq_start_lldp(struct i40e_hw *hw, 
	i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_lldp_start);



	cmd->command = I40E_AQ_LLDP_AGENT_START;



	if (persist) {

		if (hw->flags & I40E_HW_FLAG_FW_LLDP_PERSISTENT)

			cmd->command |= I40E_AQ_LLDP_AGENT_START_PERSIST;

		else

			i40e_debug(hw, I40E_DEBUG_ALL,

				   "Persistent Start LLDP not supported by current FW version.\n");

	}



	status = i40e_asq_send_command(hw, &desc, NULL, 0, cmd_details);



	return status;

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

+2 −2
Original line number Diff line number Diff line
@@ -1321,7 +1321,7 @@ static ssize_t i40e_dbg_command_write(struct file *filp, 
		if (strncmp(&cmd_buf[5], "stop", 4) == 0) {

			int ret;



			ret = i40e_aq_stop_lldp(&pf->hw, false, NULL);

			ret = i40e_aq_stop_lldp(&pf->hw, false, false, NULL);

			if (ret) {

				dev_info(&pf->pdev->dev,

					 "Stop LLDP AQ command failed =0x%x\n",
@@ -1358,7 +1358,7 @@ static ssize_t i40e_dbg_command_write(struct file *filp, 
				/* Continue and start FW LLDP anyways */

			}



			ret = i40e_aq_start_lldp(&pf->hw, NULL);

			ret = i40e_aq_start_lldp(&pf->hw, false, NULL);

			if (ret) {

				dev_info(&pf->pdev->dev,

					 "Start LLDP AQ command failed =0x%x\n",