Skip to content

Commit dbeb714

Browse files
committed
Merge branch 'liquidio-CN23XX-part-1'
Raghu Vatsavayi says: ==================== liquidio CN23XX support Following patchset adds support for new device "CN23XX" in liquidio family of adapters. As adviced by you I have split the previous V3 patch of 18 patches into two halves. This first patchset has first 10 patches, which are tested against net-next. I will post the second half after this one. This V4 patch also addressed all the comments from previous submission: 1) Avoid busy loop while reading registers. 2) Other minor comments about debug messages and constants. Please apply patches in following order as some of the patches depend on earlier patches. ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents 650097c + c0eab5b commit dbeb714

25 files changed

+3022
-611
lines changed

drivers/net/ethernet/cavium/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ config LIQUIDIO
5858
select LIBCRC32C
5959
---help---
6060
This driver supports Cavium LiquidIO Intelligent Server Adapters
61-
based on CN66XX and CN68XX chips.
61+
based on CN66XX, CN68XX and CN23XX chips.
6262

6363
To compile this driver as a module, choose M here: the module
6464
will be called liquidio. This is recommended.

drivers/net/ethernet/cavium/liquidio/Makefile

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,16 @@
33
#
44
obj-$(CONFIG_LIQUIDIO) += liquidio.o
55

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
6+
liquidio-$(CONFIG_LIQUIDIO) += lio_ethtool.o \
7+
lio_core.o \
8+
request_manager.o \
9+
response_manager.o \
10+
octeon_device.o \
11+
cn66xx_device.o \
12+
cn68xx_device.o \
13+
cn23xx_pf_device.o \
14+
octeon_mem_ops.o \
15+
octeon_droq.o \
16+
octeon_nic.o
17+
18+
liquidio-objs := lio_main.o octeon_console.o $(liquidio-y)

0 commit comments

Comments
 (0)