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

Commit c8c3d7e2 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 e1000e, igb, i40e and i40evf

Anjali provides i40e fix to remove the ATR filter on RST as well as FIN
packets.  Cleans up add_del_fdir() because it was used and implemented
only for the add, so change the name and drop a parameter.  Adds the
ability to drop a flow if we wanted to and adds a flow director
message level to be used for flow director specific messages.

Mitch fixes an issue on i40evf where the Tx watchdog handler was causing
an oops when sending an admin queue message to request a reset because
the admin queue functions use spinlocks.

Greg provides a change to i40e to make the alloc and free queue vector
calls orthogonal.

Shannon fixes i40e to verify the eeprom checksum and firmware CRC status
bits, and shutdown the driver if they fail.  This change stops the
processing of traffic, but does not kill the PF netdev so that the
NVMUpdate process still has a chance at fixing the image.  Also provides
a fix to make sure the VSI has a netdev before trying to use it in
the debugfs netdev_ops commands.

Jakub Kicinski provides patches for e1000e and igb to fix a number issues
found in the PTP code.

v2:
- drop patch 11 "i40e: Add a fallback debug flow for the driver" from the
  series based on feedback from David Miller
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2405e8f6 ed4420a3

drivers/net/ethernet/intel/e1000e/e1000.h

+2 −0
Original line number Diff line number Diff line
@@ -262,6 +262,7 @@ struct e1000_adapter { 
	u32 tx_head_addr;

	u32 tx_fifo_size;

	u32 tx_dma_failed;

	u32 tx_hwtstamp_timeouts;



	/* Rx */

	bool (*clean_rx) (struct e1000_ring *ring, int *work_done,
@@ -334,6 +335,7 @@ struct e1000_adapter { 
	struct hwtstamp_config hwtstamp_config;

	struct delayed_work systim_overflow_work;

	struct sk_buff *tx_hwtstamp_skb;

	unsigned long tx_hwtstamp_start;

	struct work_struct tx_hwtstamp_work;

	spinlock_t systim_lock;	/* protects SYSTIML/H regsters */

	struct cyclecounter cc;

drivers/net/ethernet/intel/e1000e/ethtool.c

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ static const struct e1000_stats e1000_gstrings_stats[] = { 
	E1000_STAT("rx_hwtstamp_cleared", rx_hwtstamp_cleared),

	E1000_STAT("uncorr_ecc_errors", uncorr_errors),

	E1000_STAT("corr_ecc_errors", corr_errors),

	E1000_STAT("tx_hwtstamp_timeouts", tx_hwtstamp_timeouts),

};



#define E1000_GLOBAL_STATS_LEN	ARRAY_SIZE(e1000_gstrings_stats)

drivers/net/ethernet/intel/e1000e/netdev.c

+7 −3
Original line number Diff line number Diff line
@@ -1148,9 +1148,6 @@ static void e1000e_tx_hwtstamp_work(struct work_struct *work) 
						     tx_hwtstamp_work);

	struct e1000_hw *hw = &adapter->hw;



	if (!adapter->tx_hwtstamp_skb)

		return;



	if (er32(TSYNCTXCTL) & E1000_TSYNCTXCTL_VALID) {

		struct skb_shared_hwtstamps shhwtstamps;

		u64 txstmp;
@@ -1163,6 +1160,12 @@ static void e1000e_tx_hwtstamp_work(struct work_struct *work) 
		skb_tstamp_tx(adapter->tx_hwtstamp_skb, &shhwtstamps);

		dev_kfree_skb_any(adapter->tx_hwtstamp_skb);

		adapter->tx_hwtstamp_skb = NULL;

	} else if (time_after(jiffies, adapter->tx_hwtstamp_start

			      + adapter->tx_timeout_factor * HZ)) {

		dev_kfree_skb_any(adapter->tx_hwtstamp_skb);

		adapter->tx_hwtstamp_skb = NULL;

		adapter->tx_hwtstamp_timeouts++;

		e_warn("clearing Tx timestamp hang");

	} else {

		/* reschedule to check later */

		schedule_work(&adapter->tx_hwtstamp_work);
@@ -5567,6 +5570,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb, 
			skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;

			tx_flags |= E1000_TX_FLAGS_HWTSTAMP;

			adapter->tx_hwtstamp_skb = skb_get(skb);

			adapter->tx_hwtstamp_start = jiffies;

			schedule_work(&adapter->tx_hwtstamp_work);

		} else {

			skb_tx_timestamp(skb);

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

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

	__I40E_FILTER_OVERFLOW_PROMISC,

	__I40E_SUSPENDED,

	__I40E_BAD_EEPROM,

};



enum i40e_interrupt_policy {

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

+22 −13
Original line number Diff line number Diff line
@@ -2087,9 +2087,13 @@ static ssize_t i40e_dbg_netdev_ops_write(struct file *filp, 
		if (!vsi) {

			dev_info(&pf->pdev->dev,

				 "tx_timeout: VSI %d not found\n", vsi_seid);

			goto netdev_ops_write_done;

		}

		if (rtnl_trylock()) {

		} else if (!vsi->netdev) {

			dev_info(&pf->pdev->dev, "tx_timeout: no netdev for VSI %d\n",

				 vsi_seid);

		} else if (test_bit(__I40E_DOWN, &vsi->state)) {

			dev_info(&pf->pdev->dev, "tx_timeout: VSI %d not UP\n",

				 vsi_seid);

		} else if (rtnl_trylock()) {

			vsi->netdev->netdev_ops->ndo_tx_timeout(vsi->netdev);

			rtnl_unlock();

			dev_info(&pf->pdev->dev, "tx_timeout called\n");
@@ -2108,9 +2112,10 @@ static ssize_t i40e_dbg_netdev_ops_write(struct file *filp, 
		if (!vsi) {

			dev_info(&pf->pdev->dev,

				 "change_mtu: VSI %d not found\n", vsi_seid);

			goto netdev_ops_write_done;

		}

		if (rtnl_trylock()) {

		} else if (!vsi->netdev) {

			dev_info(&pf->pdev->dev, "change_mtu: no netdev for VSI %d\n",

				 vsi_seid);

		} else if (rtnl_trylock()) {

			vsi->netdev->netdev_ops->ndo_change_mtu(vsi->netdev,

								mtu);

			rtnl_unlock();
@@ -2129,9 +2134,10 @@ static ssize_t i40e_dbg_netdev_ops_write(struct file *filp, 
		if (!vsi) {

			dev_info(&pf->pdev->dev,

				 "set_rx_mode: VSI %d not found\n", vsi_seid);

			goto netdev_ops_write_done;

		}

		if (rtnl_trylock()) {

		} else if (!vsi->netdev) {

			dev_info(&pf->pdev->dev, "set_rx_mode: no netdev for VSI %d\n",

				 vsi_seid);

		} else if (rtnl_trylock()) {

			vsi->netdev->netdev_ops->ndo_set_rx_mode(vsi->netdev);

			rtnl_unlock();

			dev_info(&pf->pdev->dev, "set_rx_mode called\n");
@@ -2149,11 +2155,14 @@ static ssize_t i40e_dbg_netdev_ops_write(struct file *filp, 
		if (!vsi) {

			dev_info(&pf->pdev->dev, "napi: VSI %d not found\n",

				 vsi_seid);

			goto netdev_ops_write_done;

		}

		} else if (!vsi->netdev) {

			dev_info(&pf->pdev->dev, "napi: no netdev for VSI %d\n",

				 vsi_seid);

		} else {

			for (i = 0; i < vsi->num_q_vectors; i++)

				napi_schedule(&vsi->q_vectors[i]->napi);

			dev_info(&pf->pdev->dev, "napi called\n");

		}

	} else {

		dev_info(&pf->pdev->dev, "unknown command '%s'\n",

			 i40e_dbg_netdev_ops_buf);