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

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 650097cd c0eab5b3

drivers/net/ethernet/cavium/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -58,7 +58,7 @@ config LIQUIDIO 
	select LIBCRC32C

	select LIBCRC32C

	---help---

	---help---

	  This driver supports Cavium LiquidIO Intelligent Server Adapters

	  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

	  To compile this driver as a module, choose M here: the module

	  will be called liquidio.  This is recommended.

	  will be called liquidio.  This is recommended.

drivers/net/ethernet/cavium/liquidio/Makefile

+13 −11
Original line number Original line Diff line number Diff line
@@ -3,14 +3,16 @@ 
#

#

obj-$(CONFIG_LIQUIDIO) += liquidio.o

obj-$(CONFIG_LIQUIDIO) += liquidio.o





liquidio-objs := lio_main.o  \

liquidio-$(CONFIG_LIQUIDIO) += lio_ethtool.o \

	      lio_ethtool.o      \

			lio_core.o         \

			request_manager.o  \

			request_manager.o  \

			response_manager.o \

			response_manager.o \

			octeon_device.o    \

			octeon_device.o    \

			cn66xx_device.o    \

			cn66xx_device.o    \

			cn68xx_device.o    \

			cn68xx_device.o    \

			cn23xx_pf_device.o \

			octeon_mem_ops.o   \

			octeon_mem_ops.o   \

			octeon_droq.o      \

			octeon_droq.o      \

	      octeon_console.o   \

			octeon_nic.o

			octeon_nic.o



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

CRA Git | Maintained and supported by SUSTech CRA and CCSE