Commit 6e7da286 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-06-01

This series contains updates to i40e, i40evf and the "new" AVF virtchnl.

This is the introduction of the Intel(R) Ethernet Adaptive Virtual
Function driver code and device ID, as presented at the NetDEV 1.2
conference in 2016.
http://netdevconf.org/1.2/session.html?anjali-singhai



The idea is to convert the interface between the i40evf driver
and the parent i40e PF driver to be generic, as the i40evf driver
should in the future be able to run on top of other Intel PF
drivers, and negotiate any features beyond a "base expected" set.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b2608311 85cfa717

Documentation/networking/i40evf.txt

+15 −8
Original line number Original line Diff line number Diff line 
Linux* Base Driver for Intel(R) Network Connection

Linux* Base Driver for Intel(R) Network Connection

==================================================

==================================================





Intel XL710 X710 Virtual Function Linux driver.

Intel Ethernet Adaptive Virtual Function Linux driver.

Copyright(c) 2013 Intel Corporation.

Copyright(c) 2013-2017 Intel Corporation.





Contents

Contents

========

========
@@ -11,19 +11,26 @@ Contents 
- Known Issues/Troubleshooting

- Known Issues/Troubleshooting

- Support

- Support





This file describes the i40evf Linux* Base Driver for the Intel(R) XL710

This file describes the i40evf Linux* Base Driver.

X710 Virtual Function.





The i40evf driver supports XL710 and X710 virtual function devices that

The i40evf driver supports the below mentioned virtual function

can only be activated on kernels with CONFIG_PCI_IOV enabled.

devices and can only be activated on kernels running the i40e or

newer Physical Function (PF) driver compiled with CONFIG_PCI_IOV.

The i40evf driver requires CONFIG_PCI_MSI to be enabled.





The guest OS loading the i40evf driver must support MSI-X interrupts.

The guest OS loading the i40evf driver must support MSI-X interrupts.





Supported Hardware

==================

Intel XL710 X710 Virtual Function

Intel Ethernet Adaptive Virtual Function

Intel X722 Virtual Function



Identifying Your Adapter

Identifying Your Adapter

========================

========================





For more information on how to identify your adapter, go to the Adapter &

For more information on how to identify your adapter, go to the

Driver ID Guide at:

Adapter & Driver ID Guide at:





    http://support.intel.com/support/go/network/adapter/idguide.htm

    http://support.intel.com/support/go/network/adapter/idguide.htm

MAINTAINERS

+1 −0
Original line number Original line Diff line number Diff line
@@ -6738,6 +6738,7 @@ F: Documentation/networking/i40e.txt 
F:	Documentation/networking/i40evf.txt

F:	Documentation/networking/i40evf.txt

F:	drivers/net/ethernet/intel/

F:	drivers/net/ethernet/intel/

F:	drivers/net/ethernet/intel/*/

F:	drivers/net/ethernet/intel/*/

F:	include/linux/avf/virtchnl.h





INTEL RDMA RNIC DRIVER

INTEL RDMA RNIC DRIVER

M:     Faisal Latif <faisal.latif@intel.com>

M:     Faisal Latif <faisal.latif@intel.com>

drivers/net/ethernet/intel/Kconfig

+6 −4
Original line number Original line Diff line number Diff line
@@ -236,12 +236,14 @@ config I40E_DCB 
	  If unsure, say N.

	  If unsure, say N.





config I40EVF

config I40EVF

	tristate "Intel(R) XL710 X710 Virtual Function Ethernet support"

	tristate "Intel(R) Ethernet Adaptive Virtual Function support"

	depends on PCI_MSI

	depends on PCI_MSI

	---help---

	---help---

	  This driver supports Intel(R) XL710 and X710 virtual functions.

	  This driver supports virtual functions for Intel XL710,

	  For more information on how to identify your adapter, go to the

	  X710, X722, and all devices advertising support for Intel

	  Adapter & Driver ID Guide that can be located at:

	  Ethernet Adaptive Virtual Function devices. For more

	  information on how to identify your adapter, go to the Adapter

	  & Driver ID Guide that can be located at:





	  <http://support.intel.com>

	  <http://support.intel.com>

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -57,7 +57,7 @@ 
#include "i40e_type.h"

#include "i40e_type.h"

#include "i40e_prototype.h"

#include "i40e_prototype.h"

#include "i40e_client.h"

#include "i40e_client.h"

#include "i40e_virtchnl.h"

#include <linux/avf/virtchnl.h>

#include "i40e_virtchnl_pf.h"

#include "i40e_virtchnl_pf.h"

#include "i40e_txrx.h"

#include "i40e_txrx.h"

#include "i40e_dcb.h"

#include "i40e_dcb.h"

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -565,7 +565,7 @@ static int i40e_client_virtchnl_send(struct i40e_info *ldev, 
	struct i40e_hw *hw = &pf->hw;

	struct i40e_hw *hw = &pf->hw;

	i40e_status err;

	i40e_status err;





	err = i40e_aq_send_msg_to_vf(hw, vf_id, I40E_VIRTCHNL_OP_IWARP,

	err = i40e_aq_send_msg_to_vf(hw, vf_id, VIRTCHNL_OP_IWARP,

				     0, msg, len, NULL);

				     0, msg, len, NULL);

	if (err)

	if (err)

		dev_err(&pf->pdev->dev, "Unable to send iWarp message to VF, error %d, aq status %d\n",

		dev_err(&pf->pdev->dev, "Unable to send iWarp message to VF, error %d, aq status %d\n",