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

Commit 03b01cf5 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'netronome-NFP4000-NFP6000' 

Jakub Kicinski says:

====================
Netronome NFP4000/NFP6000 NIC VF driver

This patchset adds support for VFs of Netronome's NFP-4000 and NFP-6000
based NICs. We are currently also preparing the submission for the PF
driver, but it is not quite ready yet. The PF driver can be found on
GitHub:

https://github.com/Netronome/nfp-drv-kmods


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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f4f7981e 4c352362

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -7364,6 +7364,13 @@ F: include/net/netrom.h 
F:	include/uapi/linux/netrom.h

F:	net/netrom/



NETRONOME ETHERNET DRIVERS

M:	Jakub Kicinski <jakub.kicinski@netronome.com>

M:	Rolf Neugebauer <rolf.neugebauer@netronome.com>

L:	oss-drivers@netronome.com

S:	Maintained

F:	drivers/net/ethernet/netronome/



NETWORK BLOCK DEVICE (NBD)

M:	Markus Pargmann <mpa@pengutronix.de>

S:	Maintained

drivers/net/ethernet/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ config FEALNX 
	  cards. <http://www.myson.com.tw/>



source "drivers/net/ethernet/natsemi/Kconfig"

source "drivers/net/ethernet/netronome/Kconfig"

source "drivers/net/ethernet/8390/Kconfig"



config NET_NETX

drivers/net/ethernet/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ obj-$(CONFIG_NET_VENDOR_MOXART) += moxa/ 
obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/

obj-$(CONFIG_FEALNX) += fealnx.o

obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/

obj-$(CONFIG_NET_VENDOR_NETRONOME) += netronome/

obj-$(CONFIG_NET_NETX) += netx-eth.o

obj-$(CONFIG_NET_VENDOR_NUVOTON) += nuvoton/

obj-$(CONFIG_NET_VENDOR_NVIDIA) += nvidia/

drivers/net/ethernet/netronome/Kconfig

0 → 100644
+36 −0
Original line number Diff line number Diff line 
#

# Netronome device configuration

#



config NET_VENDOR_NETRONOME

	bool "Netronome(R) devices"

	default y

	---help---

	  If you have a Netronome(R) network (Ethernet) card or device, say Y.



	  Note that the answer to this question doesn't directly affect the

	  kernel: saying N will just cause the configurator to skip all

	  the questions about Netronome(R) cards. If you say Y, you will be

	  asked for your specific card in the following questions.



if NET_VENDOR_NETRONOME



config NFP_NETVF

	tristate "Netronome(R) NFP4000/NFP6000 VF NIC driver"

	depends on PCI && PCI_MSI

	depends on VXLAN || VXLAN=n

	---help---

	  This driver supports SR-IOV virtual functions of

	  the Netronome(R) NFP4000/NFP6000 cards working as

	  a advanced Ethernet NIC.



config NFP_NET_DEBUG

	bool "Debug support for Netronome(R) NFP3200/NFP6000 NIC drivers"

	depends on NFP_NET || NFP_NETVF

	---help---

	  Enable extra sanity checks and debugfs support in

	  Netronome(R) NFP3200/NFP6000 NIC PF and VF drivers.

	  Note: selecting this option may adversely impact

		performance.



endif

drivers/net/ethernet/netronome/Makefile

0 → 100644
+5 −0
Original line number Diff line number Diff line 
#

# Makefile for the Netronome network device drivers

#



obj-$(CONFIG_NFP_NETVF) += nfp/