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

Commit ed036f80 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/net-next 



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates

This series contains updates to i40e and i40evf.

Jacob provides a i40e patch to remove ptp_tx_work() because it conflicts
with the interrupt-based handler and will cause spurious warning messages
to be displayed in the kernel log.  Since the hardware can properly trigger
an interrupt, we do not need to poll for an available timestamp in a work
queue any more.

Greg provides two patches for i40e, first to retain the MAC filter list
when changing a port VLAN.  Second fixes an issue where the function to
set the VF MAC address was not taking the port VLAN filter into account
when setting/clearing/resetting the VF's host administered MAC address.

Mitch provides three patches for i40evf, first adds support for getting
and setting RSS hashing options, RSS LUT entries, and getting the number
of device channels from ethtool.  Fixes a panic that woudl occur in the VF
if the PF driver failed or was removed from the host kernel.

Shannon adds driver version string to the driver version command so that
can be passed down through the firmware to low-level NC-SI functions.

Neerav provides several patches, first redistributes queue vectors after
DCB reconfiguration because the total number of queues that are configured
for a VSI may change based on a change in the total number of TCs enabled
as a result of a change in the DCB configuration based on DCBX.  Second,
allows the driver probe to continue when querying DCB config fails.
Lastly, provides changes to retrieve and store missing link config
information that was not being cached in the struct i40e_link_status.

Kevin provides a couple of patches, first to change a int variable type
to u16 to avoid a typecheck failure.  Second to update a function
parameters to remove an argument which is no longer used.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents eab8c045 ded7b9a3

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

+0 −2
Original line number Diff line number Diff line
@@ -329,9 +329,7 @@ struct i40e_pf { 
	struct ptp_clock *ptp_clock;

	struct ptp_clock_info ptp_caps;

	struct sk_buff *ptp_tx_skb;

	struct work_struct ptp_tx_work;

	struct hwtstamp_config tstamp_config;

	unsigned long ptp_tx_start;

	unsigned long last_rx_ptp_check;

	spinlock_t tmreg_lock; /* Used to protect the device time registers. */

	u64 ptp_base_adj;

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

+18 −3
Original line number Diff line number Diff line
@@ -975,6 +975,13 @@ i40e_status i40e_aq_get_link_info(struct i40e_hw *hw, 
	hw_link_info->an_info = resp->an_info;

	hw_link_info->ext_info = resp->ext_info;

	hw_link_info->loopback = resp->loopback;

	hw_link_info->max_frame_size = le16_to_cpu(resp->max_frame_size);

	hw_link_info->pacing = resp->config & I40E_AQ_CONFIG_PACING_MASK;



	if (resp->config & I40E_AQ_CONFIG_CRC_ENA)

		hw_link_info->crc_enable = true;

	else

		hw_link_info->crc_enable = false;



	if (resp->command_flags & cpu_to_le16(I40E_AQ_LSE_ENABLE))

		hw_link_info->lse_enable = true;
@@ -1300,6 +1307,7 @@ i40e_status i40e_aq_send_driver_version(struct i40e_hw *hw, 
	struct i40e_aqc_driver_version *cmd =

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

	i40e_status status;

	u16 len;



	if (dv == NULL)

		return I40E_ERR_PARAM;
@@ -1311,7 +1319,14 @@ i40e_status i40e_aq_send_driver_version(struct i40e_hw *hw, 
	cmd->driver_minor_ver = dv->minor_version;

	cmd->driver_build_ver = dv->build_version;

	cmd->driver_subbuild_ver = dv->subbuild_version;

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



	len = 0;

	while (len < sizeof(dv->driver_string) &&

	       (dv->driver_string[len] < 0x80) &&

	       dv->driver_string[len])

		len++;

	status = i40e_asq_send_command(hw, &desc, dv->driver_string,

				       len, cmd_details);



	return status;

}
@@ -2094,8 +2109,8 @@ i40e_status i40e_aq_start_lldp(struct i40e_hw *hw, 
 * @cmd_details: pointer to command details structure or NULL

 **/

i40e_status i40e_aq_add_udp_tunnel(struct i40e_hw *hw,

				u16 udp_port, u8 header_len,

				u8 protocol_index, u8 *filter_index,

				u16 udp_port, u8 protocol_index,

				u8 *filter_index,

				struct i40e_asq_cmd_details *cmd_details)

{

	struct i40e_aq_desc desc;

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

+0 −6
Original line number Diff line number Diff line
@@ -1744,10 +1744,6 @@ static ssize_t i40e_dbg_command_write(struct file *filp, 
		i40e_dbg_cmd_fd_ctrl(pf, I40E_FLAG_FD_ATR_ENABLED, false);

	} else if (strncmp(cmd_buf, "fd-atr on", 9) == 0) {

		i40e_dbg_cmd_fd_ctrl(pf, I40E_FLAG_FD_ATR_ENABLED, true);

	} else if (strncmp(cmd_buf, "fd-sb off", 9) == 0) {

		i40e_dbg_cmd_fd_ctrl(pf, I40E_FLAG_FD_SB_ENABLED, false);

	} else if (strncmp(cmd_buf, "fd-sb on", 8) == 0) {

		i40e_dbg_cmd_fd_ctrl(pf, I40E_FLAG_FD_SB_ENABLED, true);

	} else if (strncmp(cmd_buf, "lldp", 4) == 0) {

		if (strncmp(&cmd_buf[5], "stop", 4) == 0) {

			int ret;
@@ -1967,8 +1963,6 @@ static ssize_t i40e_dbg_command_write(struct file *filp, 
		dev_info(&pf->pdev->dev, "  rem fd_filter <dest q_index> <flex_off> <pctype> <dest_vsi> <dest_ctl> <fd_status> <cnt_index> <fd_id> <packet_len> <packet>\n");

		dev_info(&pf->pdev->dev, "  fd-atr off\n");

		dev_info(&pf->pdev->dev, "  fd-atr on\n");

		dev_info(&pf->pdev->dev, "  fd-sb off\n");

		dev_info(&pf->pdev->dev, "  fd-sb on\n");

		dev_info(&pf->pdev->dev, "  lldp start\n");

		dev_info(&pf->pdev->dev, "  lldp stop\n");

		dev_info(&pf->pdev->dev, "  lldp get local\n");

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

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


#define DRV_VERSION_MAJOR 0

#define DRV_VERSION_MINOR 3

#define DRV_VERSION_BUILD 43

#define DRV_VERSION_BUILD 46

#define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \

	     __stringify(DRV_VERSION_MINOR) "." \

	     __stringify(DRV_VERSION_BUILD)    DRV_KERN
@@ -4027,6 +4027,8 @@ static void i40e_dcb_reconfigure(struct i40e_pf *pf) 
				 pf->vsi[v]->seid);

			/* Will try to configure as many components */

		} else {

			/* Re-configure VSI vectors based on updated TC map */

			i40e_vsi_map_rings_to_vectors(pf->vsi[v]);

			if (pf->vsi[v]->netdev)

				i40e_dcbnl_set_all(pf->vsi[v]);

		}
@@ -4066,6 +4068,9 @@ static int i40e_init_pf_dcb(struct i40e_pf *pf) 
				       DCB_CAP_DCBX_VER_IEEE;

			pf->flags |= I40E_FLAG_DCB_ENABLED;

		}

	} else {

		dev_info(&pf->pdev->dev, "AQ Querying DCB configuration failed: %d\n",

			 pf->hw.aq.asq_last_status);

	}



out:
@@ -5603,7 +5608,6 @@ static void i40e_handle_mdd_event(struct i40e_pf *pf) 
 **/

static void i40e_sync_vxlan_filters_subtask(struct i40e_pf *pf)

{

	const int vxlan_hdr_qwords = 4;

	struct i40e_hw *hw = &pf->hw;

	i40e_status ret;

	u8 filter_index;
@@ -5621,7 +5625,6 @@ static void i40e_sync_vxlan_filters_subtask(struct i40e_pf *pf) 
			port = pf->vxlan_ports[i];

			ret = port ?

			      i40e_aq_add_udp_tunnel(hw, ntohs(port),

						     vxlan_hdr_qwords,

						     I40E_AQC_TUNNEL_TYPE_VXLAN,

						     &filter_index, NULL)

			      : i40e_aq_del_udp_tunnel(hw, i, NULL);
@@ -6778,10 +6781,12 @@ static int i40e_config_netdev(struct i40e_vsi *vsi) 
			   NETIF_F_TSO_ECN	       |

			   NETIF_F_TSO6		       |

			   NETIF_F_RXCSUM	       |

			   NETIF_F_NTUPLE	       |

			   NETIF_F_RXHASH	       |

			   0;



	if (!(pf->flags & I40E_FLAG_MFP_ENABLED))

		netdev->features |= NETIF_F_NTUPLE;



	/* copy netdev features into list of user selectable features */

	netdev->hw_features |= netdev->features;
@@ -8298,7 +8303,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (err) {

		dev_info(&pdev->dev, "init_pf_dcb failed: %d\n", err);

		pf->flags &= ~I40E_FLAG_DCB_ENABLED;

		goto err_init_dcb;

		/* Continue without DCB enabled */

	}

#endif /* CONFIG_I40E_DCB */
@@ -8394,6 +8399,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	dv.minor_version = DRV_VERSION_MINOR;

	dv.build_version = DRV_VERSION_BUILD;

	dv.subbuild_version = 0;

	strncpy(dv.driver_string, DRV_VERSION, sizeof(dv.driver_string));

	i40e_aq_send_driver_version(&pf->hw, &dv, NULL);



	/* since everything's happy, start the service_task timer */
@@ -8435,9 +8441,6 @@ err_vsis: 
err_switch_setup:

	i40e_reset_interrupt_capability(pf);

	del_timer_sync(&pf->service_timer);

#ifdef CONFIG_I40E_DCB

err_init_dcb:

#endif /* CONFIG_I40E_DCB */

err_mac_addr:

err_configure_lan_hmc:

	(void)i40e_shutdown_lan_hmc(hw);

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

+2 −2
Original line number Diff line number Diff line
@@ -157,8 +157,8 @@ i40e_status i40e_aq_stop_lldp(struct i40e_hw *hw, bool shutdown_agent, 
i40e_status i40e_aq_start_lldp(struct i40e_hw *hw,

				struct i40e_asq_cmd_details *cmd_details);

i40e_status i40e_aq_add_udp_tunnel(struct i40e_hw *hw,

				u16 udp_port, u8 header_len,

				u8 protocol_index, u8 *filter_index,

				u16 udp_port, u8 protocol_index,

				u8 *filter_index,

				struct i40e_asq_cmd_details *cmd_details);

i40e_status i40e_aq_del_udp_tunnel(struct i40e_hw *hw, u8 index,

				struct i40e_asq_cmd_details *cmd_details);