Commit 647401d5 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 



Jeff Kirsher says:

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

This series contains updates to e1000e, igb, ixgbe and i40e.

Most notably are Jakub's patches to clean up the Rx time stamping
code for ixgbe and the fix up of debug messages with proper termination.

Jesse's i40e patch fixes an issue reported by Eric Dumazet that the
i40e driver was allowing the hardware to replicate the PSH flag on
all segments of a TSO operation.  With this fix, we are now configuring
the CWR bit to only be set in the first packet of a TSO and we
enable TSO_ECN in order to advertise to the stack that we do the right
thing on the wire.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6d459690 c5ffe7e1

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

+3 −3
Original line number Diff line number Diff line
@@ -1165,7 +1165,7 @@ static void e1000e_tx_hwtstamp_work(struct work_struct *work) 
		dev_kfree_skb_any(adapter->tx_hwtstamp_skb);

		adapter->tx_hwtstamp_skb = NULL;

		adapter->tx_hwtstamp_timeouts++;

		e_warn("clearing Tx timestamp hang");

		e_warn("clearing Tx timestamp hang\n");

	} else {

		/* reschedule to check later */

		schedule_work(&adapter->tx_hwtstamp_work);
@@ -5687,7 +5687,7 @@ struct rtnl_link_stats64 *e1000e_get_stats64(struct net_device *netdev, 
static int e1000_change_mtu(struct net_device *netdev, int new_mtu)

{

	struct e1000_adapter *adapter = netdev_priv(netdev);

	int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;

	int max_frame = new_mtu + VLAN_HLEN + ETH_HLEN + ETH_FCS_LEN;



	/* Jumbo frame support */

	if ((max_frame > ETH_FRAME_LEN + ETH_FCS_LEN) &&
@@ -6235,6 +6235,7 @@ static int __e1000_resume(struct pci_dev *pdev) 
	return 0;

}



#ifdef CONFIG_PM_SLEEP

static int e1000e_pm_thaw(struct device *dev)

{

	struct net_device *netdev = pci_get_drvdata(to_pci_dev(dev));
@@ -6255,7 +6256,6 @@ static int e1000e_pm_thaw(struct device *dev) 
	return 0;

}



#ifdef CONFIG_PM_SLEEP

static int e1000e_pm_suspend(struct device *dev)

{

	struct pci_dev *pdev = to_pci_dev(dev);

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

+9 −0
Original line number Diff line number Diff line
@@ -4271,6 +4271,14 @@ static int i40e_open(struct net_device *netdev) 
	if (err)

		return err;



	/* configure global TSO hardware offload settings */

	wr32(&pf->hw, I40E_GLLAN_TSOMSK_F, be32_to_cpu(TCP_FLAG_PSH |

						       TCP_FLAG_FIN) >> 16);

	wr32(&pf->hw, I40E_GLLAN_TSOMSK_M, be32_to_cpu(TCP_FLAG_PSH |

						       TCP_FLAG_FIN |

						       TCP_FLAG_CWR) >> 16);

	wr32(&pf->hw, I40E_GLLAN_TSOMSK_L, be32_to_cpu(TCP_FLAG_CWR) >> 16);



#ifdef CONFIG_I40E_VXLAN

	vxlan_get_rx_port(netdev);

#endif
@@ -6712,6 +6720,7 @@ static int i40e_config_netdev(struct i40e_vsi *vsi) 
			   NETIF_F_HW_VLAN_CTAG_FILTER |

			   NETIF_F_IPV6_CSUM	       |

			   NETIF_F_TSO		       |

			   NETIF_F_TSO_ECN	       |

			   NETIF_F_TSO6		       |

			   NETIF_F_RXCSUM	       |

			   NETIF_F_NTUPLE	       |

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

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static i40e_status i40e_poll_sr_srctl_done_bit(struct i40e_hw *hw) 
		udelay(5);

	}

	if (ret_code == I40E_ERR_TIMEOUT)

		hw_dbg(hw, "Done bit in GLNVM_SRCTL not set");

		hw_dbg(hw, "Done bit in GLNVM_SRCTL not set\n");

	return ret_code;

}

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

+2 −2
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ static void i40e_ptp_tx_work(struct work_struct *work) 
		dev_kfree_skb_any(pf->ptp_tx_skb);

		pf->ptp_tx_skb = NULL;

		pf->tx_hwtstamp_timeouts++;

		dev_warn(&pf->pdev->dev, "clearing Tx timestamp hang");

		dev_warn(&pf->pdev->dev, "clearing Tx timestamp hang\n");

		return;

	}
@@ -321,7 +321,7 @@ void i40e_ptp_rx_hang(struct i40e_vsi *vsi) 
		pf->last_rx_ptp_check = jiffies;

		pf->rx_hwtstamp_cleared++;

		dev_warn(&vsi->back->pdev->dev,

			 "%s: clearing Rx timestamp hang",

			 "%s: clearing Rx timestamp hang\n",

			 __func__);

	}

}

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

+11 −11
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ int i40e_add_del_fdir(struct i40e_vsi *vsi, 
		}

		break;

	default:

		dev_info(&pf->pdev->dev, "Could not specify spec type %d",

		dev_info(&pf->pdev->dev, "Could not specify spec type %d\n",

			 input->flow_type);

		ret = -EINVAL;

	}
@@ -478,7 +478,7 @@ static void i40e_fd_handle_status(struct i40e_ring *rx_ring, 
				pf->flags |= I40E_FLAG_FDIR_REQUIRES_REINIT;

			}

		} else {

			dev_info(&pdev->dev, "FD filter programming error");

			dev_info(&pdev->dev, "FD filter programming error\n");

		}

	} else if (error ==

			  (0x1 << I40E_RX_PROG_STATUS_DESC_NO_FD_ENTRY_SHIFT)) {
@@ -1713,9 +1713,11 @@ static int i40e_tx_prepare_vlan_flags(struct sk_buff *skb, 
				I40E_TX_FLAGS_VLAN_PRIO_SHIFT;

		if (tx_flags & I40E_TX_FLAGS_SW_VLAN) {

			struct vlan_ethhdr *vhdr;

			if (skb_header_cloned(skb) &&

			    pskb_expand_head(skb, 0, 0, GFP_ATOMIC))

				return -ENOMEM;

			int rc;



			rc = skb_cow_head(skb, 0);

			if (rc < 0)

				return rc;

			vhdr = (struct vlan_ethhdr *)skb->data;

			vhdr->h_vlan_TCI = htons(tx_flags >>

						 I40E_TX_FLAGS_VLAN_SHIFT);
@@ -1743,20 +1745,18 @@ static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb, 
		    u64 *cd_type_cmd_tso_mss, u32 *cd_tunneling)

{

	u32 cd_cmd, cd_tso_len, cd_mss;

	struct ipv6hdr *ipv6h;

	struct tcphdr *tcph;

	struct iphdr *iph;

	u32 l4len;

	int err;

	struct ipv6hdr *ipv6h;



	if (!skb_is_gso(skb))

		return 0;



	if (skb_header_cloned(skb)) {

		err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);

		if (err)

	err = skb_cow_head(skb, 0);

	if (err < 0)

		return err;

	}



	if (protocol == htons(ETH_P_IP)) {

		iph = skb->encapsulation ? inner_ip_hdr(skb) : ip_hdr(skb);

CRA Git | Maintained and supported by SUSTech CRA and CCSE