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

Commit 45e60cb3 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 2017-04-06

This series contains updates to i40e and i40evf.

Preethi adds support for the outer checksum and TSO offloads for
encapsulated packets for the VF.

Mitch fixes a possible memory leak, where we need to remove the client
instance when the driver unloads.  Also we need to check to see if the
client (i40iw) is already present during probe, and add a client instance
if necessary.  Lastly, make sure we close any attached clients when the
driver is removed or shut down to prevent a kernel panic.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents dc423b6b 921c467c

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

+9 −0
Original line number Diff line number Diff line
@@ -436,6 +436,12 @@ int i40e_lan_add_device(struct i40e_pf *pf) 
		 pf->hw.pf_id, pf->hw.bus.bus_id,

		 pf->hw.bus.device, pf->hw.bus.func);



	/* If a client has already been registered, we need to add an instance

	 * of it to our new LAN device.

	 */

	if (registered_client)

		i40e_client_add_instance(pf);



	/* Since in some cases register may have happened before a device gets

	 * added, we can schedule a subtask to go initiate the clients if

	 * they can be launched at probe time.
@@ -459,6 +465,9 @@ int i40e_lan_del_device(struct i40e_pf *pf) 
	struct i40e_device *ldev, *tmp;

	int ret = -ENODEV;



	/* First, remove any client instance. */

	i40e_client_del_instance(pf);



	mutex_lock(&i40e_device_mutex);

	list_for_each_entry_safe(ldev, tmp, &i40e_devices, list) {

		if (ldev->pf == pf) {

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

+37 −25
Original line number Diff line number Diff line
@@ -9253,6 +9253,8 @@ static int i40e_config_netdev(struct i40e_vsi *vsi) 
	u8 broadcast[ETH_ALEN];

	u8 mac_addr[ETH_ALEN];

	int etherdev_size;

	netdev_features_t hw_enc_features;

	netdev_features_t hw_features;



	etherdev_size = sizeof(struct i40e_netdev_priv);

	netdev = alloc_etherdev_mq(etherdev_size, vsi->alloc_queue_pairs);
@@ -9263,7 +9265,7 @@ static int i40e_config_netdev(struct i40e_vsi *vsi) 
	np = netdev_priv(netdev);

	np->vsi = vsi;



	netdev->hw_enc_features |= NETIF_F_SG			|

	hw_enc_features = NETIF_F_SG			|

			  NETIF_F_IP_CSUM		|

			  NETIF_F_IPV6_CSUM		|

			  NETIF_F_HIGHDMA		|
@@ -9273,11 +9275,9 @@ static int i40e_config_netdev(struct i40e_vsi *vsi) 
			  NETIF_F_TSO6			|

			  NETIF_F_GSO_GRE		|

			  NETIF_F_GSO_GRE_CSUM		|

				   NETIF_F_GSO_IPXIP4		|

				   NETIF_F_GSO_IPXIP6		|

			  NETIF_F_GSO_PARTIAL		|

			  NETIF_F_GSO_UDP_TUNNEL	|

			  NETIF_F_GSO_UDP_TUNNEL_CSUM	|

				   NETIF_F_GSO_PARTIAL		|

			  NETIF_F_SCTP_CRC		|

			  NETIF_F_RXHASH		|

			  NETIF_F_RXCSUM		|
@@ -9288,18 +9288,20 @@ static int i40e_config_netdev(struct i40e_vsi *vsi) 


	netdev->gso_partial_features |= NETIF_F_GSO_GRE_CSUM;



	netdev->hw_enc_features |= hw_enc_features;



	/* record features VLANs can make use of */

	netdev->vlan_features |= netdev->hw_enc_features |

				 NETIF_F_TSO_MANGLEID;

	netdev->vlan_features |= hw_enc_features | NETIF_F_TSO_MANGLEID;



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

		netdev->hw_features |= NETIF_F_NTUPLE;



	netdev->hw_features |= netdev->hw_enc_features	|

	hw_features = hw_enc_features		|

		      NETIF_F_HW_VLAN_CTAG_TX	|

		      NETIF_F_HW_VLAN_CTAG_RX;



	netdev->features |= netdev->hw_features | NETIF_F_HW_VLAN_CTAG_FILTER;

	netdev->hw_features |= hw_features;



	netdev->features |= hw_features | NETIF_F_HW_VLAN_CTAG_FILTER;

	netdev->hw_enc_features |= NETIF_F_TSO_MANGLEID;



	if (vsi->type == I40E_VSI_MAIN) {
@@ -11393,6 +11395,11 @@ static void i40e_remove(struct pci_dev *pdev) 
	if (pf->service_task.func)

		cancel_work_sync(&pf->service_task);



	/* Client close must be called explicitly here because the timer

	 * has been stopped.

	 */

	i40e_notify_client_of_netdev_close(pf->vsi[pf->lan_vsi], false);



	if (pf->flags & I40E_FLAG_SRIOV_ENABLED) {

		i40e_free_vfs(pf);

		pf->flags &= ~I40E_FLAG_SRIOV_ENABLED;
@@ -11633,6 +11640,11 @@ static void i40e_shutdown(struct pci_dev *pdev) 
	cancel_work_sync(&pf->service_task);

	i40e_fdir_teardown(pf);



	/* Client close must be called explicitly here because the timer

	 * has been stopped.

	 */

	i40e_notify_client_of_netdev_close(pf->vsi[pf->lan_vsi], false);



	if (pf->wol_en && (pf->flags & I40E_FLAG_WOL_MC_MAGIC_PKT_WAKE))

		i40e_enable_mc_magic_wake(pf);

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

+2 −1
Original line number Diff line number Diff line
@@ -163,7 +163,8 @@ struct i40e_virtchnl_vsi_resource { 
#define I40E_VIRTCHNL_VF_OFFLOAD_RX_POLLING	0x00020000

#define I40E_VIRTCHNL_VF_OFFLOAD_RSS_PCTYPE_V2	0x00040000

#define I40E_VIRTCHNL_VF_OFFLOAD_RSS_PF		0X00080000

#define I40E_VIRTCHNL_VF_OFFLOAD_ENCAP_CSUM	0X00100000

#define I40E_VIRTCHNL_VF_OFFLOAD_ENCAP		0X00100000

#define I40E_VIRTCHNL_VF_OFFLOAD_ENCAP_CSUM	0X00200000



#define I40E_VF_BASE_MODE_OFFLOADS (I40E_VIRTCHNL_VF_OFFLOAD_L2 | \

				    I40E_VIRTCHNL_VF_OFFLOAD_VLAN | \

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

+7 −0
Original line number Diff line number Diff line
@@ -1408,6 +1408,13 @@ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf, u8 *msg) 
				I40E_VIRTCHNL_VF_OFFLOAD_RSS_PCTYPE_V2;

	}



	if (vf->driver_caps & I40E_VIRTCHNL_VF_OFFLOAD_ENCAP)

		vfres->vf_offload_flags |= I40E_VIRTCHNL_VF_OFFLOAD_ENCAP;



	if ((pf->flags & I40E_FLAG_OUTER_UDP_CSUM_CAPABLE) &&

	    (vf->driver_caps & I40E_VIRTCHNL_VF_OFFLOAD_ENCAP_CSUM))

		vfres->vf_offload_flags |= I40E_VIRTCHNL_VF_OFFLOAD_ENCAP_CSUM;



	if (vf->driver_caps & I40E_VIRTCHNL_VF_OFFLOAD_RX_POLLING) {

		if (pf->flags & I40E_FLAG_MFP_ENABLED) {

			dev_err(&pf->pdev->dev,

drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h

+2 −1
Original line number Diff line number Diff line
@@ -163,7 +163,8 @@ struct i40e_virtchnl_vsi_resource { 
#define I40E_VIRTCHNL_VF_OFFLOAD_RX_POLLING	0x00020000

#define I40E_VIRTCHNL_VF_OFFLOAD_RSS_PCTYPE_V2	0x00040000

#define I40E_VIRTCHNL_VF_OFFLOAD_RSS_PF		0X00080000

#define I40E_VIRTCHNL_VF_OFFLOAD_ENCAP_CSUM	0X00100000

#define I40E_VIRTCHNL_VF_OFFLOAD_ENCAP		0X00100000

#define I40E_VIRTCHNL_VF_OFFLOAD_ENCAP_CSUM	0X00200000



#define I40E_VF_BASE_MODE_OFFLOADS (I40E_VIRTCHNL_VF_OFFLOAD_L2 | \

				    I40E_VIRTCHNL_VF_OFFLOAD_VLAN | \