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

Commit 516782ac authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'thunderx'

Aleksey Makarov says:

====================
Adding support for Cavium ThunderX network controller

This patchset adds support for the Cavium ThunderX network controller.

changes in v6:
 * unused preprocessor symbols were removed
 * reduce no of atomic operations in SQ maintenance
 * support for TCP segmentation at driver level
 * reset RBDR if fifo state is FAIL
 * fixed an issue with link state mailbox message

changes in v5:
 * __packed were removed.  now we rely on C language ABI
 * nic_dbg() -> netdev_dbg()
 * fixes for a typo, constant spelling and using BIT_ULL
 * use print_hex_dump()
 * unnecessary conditions in a long if() chain were removed

changes in v4:
 * the patch "pci: Add Cavium PCI vendor id" was attributed correctly
 * a note that Cavium id is used in many drivers was added
 * the license comments now match MODULE_LICENSE
 * a comment explaining usage of writeq_relaxed()/readq_relaxed() was added

changes in v3:
 * code cleanup
 * issues discovered by reviewers were addressed

changes in v2:
 * non-generic module parameters removed
 * ethtool support added (nicvf_set_rxnfc())

v5: https://lkml.kernel.org/g/<1432344498-17131-1-git-send-email-aleksey.makarov@caviumnetworks.com>
v4: https://lkml.kernel.org/g/<1432000757-28700-1-git-send-email-aleksey.makarov@auriga.com>
v3: https://lkml.kernel.org/g/<1431747401-20847-1-git-send-email-aleksey.makarov@auriga.com>
v2: https://lkml.kernel.org/g/<1415596445-10061-1-git-send-email-rric@kernel.org>
v1: https://lkml.kernel.org/g/<20141030165434.GW20170@rric.localhost

>
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents bde28bc6 4863dea3
Loading
Loading
Loading
Loading
+7 −0
Original line number Original line Diff line number Diff line
@@ -921,6 +921,13 @@ M: Krzysztof Halasa <khalasa@piap.pl>
S:	Maintained
S:	Maintained
F:	arch/arm/mach-cns3xxx/
F:	arch/arm/mach-cns3xxx/


ARM/CAVIUM THUNDER NETWORK DRIVER
M:	Sunil Goutham <sgoutham@cavium.com>
M:	Robert Richter <rric@kernel.org>
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S:	Supported
F:	drivers/net/ethernet/cavium/

ARM/CIRRUS LOGIC CLPS711X ARM ARCHITECTURE
ARM/CIRRUS LOGIC CLPS711X ARM ARCHITECTURE
M:	Alexander Shiyan <shc_work@mail.ru>
M:	Alexander Shiyan <shc_work@mail.ru>
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+1 −0
Original line number Original line Diff line number Diff line
@@ -34,6 +34,7 @@ source "drivers/net/ethernet/adi/Kconfig"
source "drivers/net/ethernet/broadcom/Kconfig"
source "drivers/net/ethernet/broadcom/Kconfig"
source "drivers/net/ethernet/brocade/Kconfig"
source "drivers/net/ethernet/brocade/Kconfig"
source "drivers/net/ethernet/calxeda/Kconfig"
source "drivers/net/ethernet/calxeda/Kconfig"
source "drivers/net/ethernet/cavium/Kconfig"
source "drivers/net/ethernet/chelsio/Kconfig"
source "drivers/net/ethernet/chelsio/Kconfig"
source "drivers/net/ethernet/cirrus/Kconfig"
source "drivers/net/ethernet/cirrus/Kconfig"
source "drivers/net/ethernet/cisco/Kconfig"
source "drivers/net/ethernet/cisco/Kconfig"
+1 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ obj-$(CONFIG_NET_BFIN) += adi/
obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
obj-$(CONFIG_NET_CALXEDA_XGMAC) += calxeda/
obj-$(CONFIG_NET_CALXEDA_XGMAC) += calxeda/
obj-$(CONFIG_NET_VENDOR_CAVIUM) += cavium/
obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
obj-$(CONFIG_NET_VENDOR_CIRRUS) += cirrus/
obj-$(CONFIG_NET_VENDOR_CIRRUS) += cirrus/
obj-$(CONFIG_NET_VENDOR_CISCO) += cisco/
obj-$(CONFIG_NET_VENDOR_CISCO) += cisco/
+40 −0
Original line number Original line Diff line number Diff line
#
# Cavium ethernet device configuration
#

config NET_VENDOR_CAVIUM
	tristate "Cavium ethernet drivers"
	depends on PCI
	---help---
	  Enable support for the Cavium ThunderX Network Interface
	  Controller (NIC). The NIC provides the controller and DMA
	  engines to move network traffic to/from the memory. The NIC
	  works closely with TNS, BGX and SerDes to implement the
	  functions replacing and virtualizing those of a typical
	  standalone PCIe NIC chip.

	  If you have a Cavium Thunder board, say Y.

if NET_VENDOR_CAVIUM

config THUNDER_NIC_PF
	tristate "Thunder Physical function driver"
	default NET_VENDOR_CAVIUM
	select THUNDER_NIC_BGX
	---help---
	  This driver supports Thunder's NIC physical function.

config THUNDER_NIC_VF
	tristate "Thunder Virtual function driver"
	default NET_VENDOR_CAVIUM
	---help---
	  This driver supports Thunder's NIC virtual function

config	THUNDER_NIC_BGX
	tristate "Thunder MAC interface driver (BGX)"
	default NET_VENDOR_CAVIUM
	---help---
	  This driver supports programming and controlling of MAC
	  interface from NIC physical function driver.

endif # NET_VENDOR_CAVIUM
+5 −0
Original line number Original line Diff line number Diff line
#
# Makefile for the Cavium ethernet device drivers.
#

obj-$(CONFIG_NET_VENDOR_CAVIUM) += thunder/
Loading