net: Adding support for Cavium ThunderX network controller

This patch adds support for the Cavium ThunderX network controller.
The driver is on the pci bus and thus requires the Thunder PCIe host
controller driver to be enabled.

Signed-off-by: Maciej Czekaj <mjc@semihalf.com>
Signed-off-by: David Daney <david.daney@cavium.com>
Signed-off-by: Sunil Goutham <sgoutham@cavium.com>
Signed-off-by: Ganapatrao Kulkarni <ganapatrao.kulkarni@caviumnetworks.com>
Signed-off-by: Aleksey Makarov <aleksey.makarov@caviumnetworks.com>
Signed-off-by: Tomasz Nowicki <tomasz.nowicki@linaro.org>
Signed-off-by: Robert Richter <rrichter@cavium.com>
Signed-off-by: Kamil Rytarowski <kamil@semihalf.com>
Signed-off-by: Thanneeru Srinivasulu <tsrinivasulu@caviumnetworks.com>
Signed-off-by: Sruthi Vangala <svangala@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/MAINTAINERS b/MAINTAINERS
index df106f8..d1b1d22 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -921,6 +921,13 @@ M: Krzysztof Halasa <khalasa@piap.pl>
 S:     Maintained
 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
 M:     Alexander Shiyan <shc_work@mail.ru>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

diff --cc drivers/net/ethernet/Kconfig
Simple merge

diff --cc drivers/net/ethernet/Makefile
Simple merge

diff --cc drivers/net/ethernet/cavium/Kconfig
Simple merge

diff --cc drivers/net/ethernet/cavium/Makefile
Simple merge

diff --cc drivers/net/ethernet/cavium/thunder/Makefile
Simple merge

diff --cc drivers/net/ethernet/cavium/thunder/nic.h
Simple merge

diff --cc drivers/net/ethernet/cavium/thunder/nic_main.c
Simple merge

diff --cc drivers/net/ethernet/cavium/thunder/nic_reg.h
Simple merge

diff --cc drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/cavium/thunder/nicvf_main.c
Simple merge

diff --cc drivers/net/ethernet/cavium/thunder/nicvf_queues.c
Simple merge

diff --cc drivers/net/ethernet/cavium/thunder/nicvf_queues.h
Simple merge

diff --cc drivers/net/ethernet/cavium/thunder/q_struct.h
Simple merge

diff --cc drivers/net/ethernet/cavium/thunder/thunder_bgx.c
Simple merge

diff --cc drivers/net/ethernet/cavium/thunder/thunder_bgx.h
Simple merge