Skip to content

Commit f21fb3e

Browse files
Raghu Vatsavayidavem330
Raghu Vatsavayi
authored and
davem330
committed
Add support of Cavium Liquidio ethernet adapters
Following patch V8 adds support for Cavium Liquidio pci express based 10Gig ethernet adapters. 1) Consolidated all debug macros to either call dev_* or netdev_* macros directly, feedback from previous patch. 2) Changed soft commands to avoid crash when running in interrupt context. 3) Fixed link status not reflecting correct status when NetworkManager is running. Added MODULE_FIRMWARE declarations. Following were the previous patches. Patch V7: 1) Minor comments from v6 release regarding debug statements. 2) Fix for large multicast lists. 3) Fixed lockup issue if port initialization fails. 4) Enabled MSI by default. https://patchwork.ozlabs.org/patch/464441/ Patch V6: 1) Addressed the uint64 vs u64 issue, feedback from previous patch. 2) Consolidated some receive processing routines. 3) Removed link status polling method. https://patchwork.ozlabs.org/patch/459514/ Patch V5: Based on the feedback from earlier patches with regards to consolidation of common functions like device init, register programming for cn66xx and cn68xx devices. https://patchwork.ozlabs.org/patch/438979/ Patch V4: Following were the changes based on the feedback from earlier patch: 1) Added mmiowb while synchronizing queue updates and other hw interactions. 2) Statistics will now be incremented non-atomically per each ring. liquidio_get_stats will add stats of each ring while reporting the total statistics counts. 3) Modified liquidio_ioctl to return proper return codes. 4) Modified device naming to use standard Ethernet naming. 5) Global function names in the driver will have lio_/liquidio_/octeon_ prefix. 6) Ethtool related changes for: Removed redundant stats and jiffies. Use default ethtool handler of link status. Speed setting will make use of ethtool_cmd_speed_set. 7) Added checks for pci_map_* return codes. 8) Check for signals while waiting in interruptible mode https://patchwork.ozlabs.org/patch/435073/ Patch v3: Implemented feedback from previous patch like: Removed NAPI Config and DEBUG config options, added BQL and xmit_more support. https://patchwork.ozlabs.org/patch/422749/ Patch V2: Implemented feedback from previous patch. https://patchwork.ozlabs.org/patch/413539/ First Patch: https://patchwork.ozlabs.org/patch/412946/ Signed-off-by: Derek Chickles <derek.chickles@caviumnetworks.com> Signed-off-by: Satanand Burla <satananda.burla@caviumnetworks.com> Signed-off-by: Felix Manlunas <felix.manlunas@caviumnetworks.com> Signed-off-by: Robert Richter <Robert.Richter@caviumnetworks.com> Signed-off-by: Aleksey Makarov <Aleksey.Makarov@caviumnetworks.com> Signed-off-by: Raghu Vatsavayi <raghu.vatsavayi@caviumnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 048856f commit f21fb3e

30 files changed

+14457
-12
lines changed

‎MAINTAINERS

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2442,6 +2442,17 @@ S: Maintained
24422442
F: drivers/iio/light/cm*
24432443
F: Documentation/devicetree/bindings/i2c/trivial-devices.txt
24442444

2445+
CAVIUM LIQUIDIO NETWORK DRIVER
2446+
M: Derek Chickles <derek.chickles@caviumnetworks.com>
2447+
M: Satanand Burla <satananda.burla@caviumnetworks.com>
2448+
M: Felix Manlunas <felix.manlunas@caviumnetworks.com>
2449+
M: Raghu Vatsavayi <raghu.vatsavayi@caviumnetworks.com>
2450+
L: netdev@vger.kernel.org
2451+
W: http://www.cavium.com
2452+
S: Supported
2453+
F: drivers/net/ethernet/cavium/
2454+
F: drivers/net/ethernet/cavium/liquidio/
2455+
24452456
CC2520 IEEE-802.15.4 RADIO DRIVER
24462457
M: Varka Bhadram <varkabhadram@gmail.com>
24472458
L: linux-wpan@vger.kernel.org

‎drivers/net/ethernet/cavium/Kconfig

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,53 @@
44

55
config NET_VENDOR_CAVIUM
66
tristate "Cavium ethernet drivers"
7-
depends on PCI && 64BIT
7+
depends on PCI
8+
default y
89
---help---
9-
Enable support for the Cavium ThunderX Network Interface
10-
Controller (NIC). The NIC provides the controller and DMA
11-
engines to move network traffic to/from the memory. The NIC
12-
works closely with TNS, BGX and SerDes to implement the
13-
functions replacing and virtualizing those of a typical
14-
standalone PCIe NIC chip.
10+
Select this option if you want enable Cavium network support.
1511

16-
If you have a Cavium Thunder board, say Y.
12+
If you have a Cavium SoC or network adapter, say Y.
1713

1814
if NET_VENDOR_CAVIUM
1915

2016
config THUNDER_NIC_PF
2117
tristate "Thunder Physical function driver"
22-
default NET_VENDOR_CAVIUM
18+
depends on 64BIT
19+
default ARCH_THUNDER
2320
select THUNDER_NIC_BGX
2421
---help---
2522
This driver supports Thunder's NIC physical function.
23+
The NIC provides the controller and DMA engines to
24+
move network traffic to/from the memory. The NIC
25+
works closely with TNS, BGX and SerDes to implement the
26+
functions replacing and virtualizing those of a typical
27+
standalone PCIe NIC chip.
2628

2729
config THUNDER_NIC_VF
2830
tristate "Thunder Virtual function driver"
29-
default NET_VENDOR_CAVIUM
31+
depends on 64BIT
32+
default ARCH_THUNDER
3033
---help---
3134
This driver supports Thunder's NIC virtual function
3235

3336
config THUNDER_NIC_BGX
3437
tristate "Thunder MAC interface driver (BGX)"
35-
default NET_VENDOR_CAVIUM
38+
depends on 64BIT
39+
default ARCH_THUNDER
3640
---help---
3741
This driver supports programming and controlling of MAC
3842
interface from NIC physical function driver.
3943

44+
config LIQUIDIO
45+
tristate "Cavium LiquidIO support"
46+
select PTP_1588_CLOCK
47+
select FW_LOADER
48+
select LIBCRC32
49+
---help---
50+
This driver supports Cavium LiquidIO Intelligent Server Adapters
51+
based on CN66XX and CN68XX chips.
52+
53+
To compile this driver as a module, choose M here: the module
54+
will be called liquidio. This is recommended.
55+
4056
endif # NET_VENDOR_CAVIUM

‎drivers/net/ethernet/cavium/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
22
# Makefile for the Cavium ethernet device drivers.
33
#
4-
54
obj-$(CONFIG_NET_VENDOR_CAVIUM) += thunder/
5+
obj-$(CONFIG_NET_VENDOR_CAVIUM) += liquidio/

‎drivers/net/ethernet/cavium/liquidio/Makefile

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#
2+
# Cavium Liquidio ethernet device driver
3+
#
4+
obj-$(CONFIG_LIQUIDIO) += liquidio.o
5+
6+
liquidio-objs := lio_main.o \
7+
lio_ethtool.o \
8+
request_manager.o \
9+
response_manager.o \
10+
octeon_device.o \
11+
cn66xx_device.o \
12+
cn68xx_device.o \
13+
octeon_mem_ops.o \
14+
octeon_droq.o \
15+
octeon_console.o \
16+
octeon_nic.o

0 commit comments

Comments
 (0)