Skip to content

Commit

Permalink
Merge branch 'liquidio-CN23XX-part-1'
Browse files Browse the repository at this point in the history
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 <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Aug 31, 2016
2 parents 650097c + c0eab5b commit dbeb714
Show file tree
Hide file tree
Showing 25 changed files with 3,022 additions and 611 deletions.
2 changes: 1 addition & 1 deletion drivers/net/ethernet/cavium/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ config LIQUIDIO
select LIBCRC32C
---help---
This driver supports Cavium LiquidIO Intelligent Server Adapters
based on CN66XX and CN68XX chips.
based on CN66XX, CN68XX and CN23XX chips.

To compile this driver as a module, choose M here: the module
will be called liquidio. This is recommended.
Expand Down
24 changes: 13 additions & 11 deletions drivers/net/ethernet/cavium/liquidio/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@
#
obj-$(CONFIG_LIQUIDIO) += liquidio.o

liquidio-objs := lio_main.o \
lio_ethtool.o \
request_manager.o \
response_manager.o \
octeon_device.o \
cn66xx_device.o \
cn68xx_device.o \
octeon_mem_ops.o \
octeon_droq.o \
octeon_console.o \
octeon_nic.o
liquidio-$(CONFIG_LIQUIDIO) += lio_ethtool.o \
lio_core.o \
request_manager.o \
response_manager.o \
octeon_device.o \
cn66xx_device.o \
cn68xx_device.o \
cn23xx_pf_device.o \
octeon_mem_ops.o \
octeon_droq.o \
octeon_nic.o

liquidio-objs := lio_main.o octeon_console.o $(liquidio-y)
Loading

0 comments on commit dbeb714

Please sign in to comment.