Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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 Diff line number Diff line
@@ -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.

drivers/net/ethernet/cavium/liquidio/Makefile

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

obj-$(CONFIG_LIQUIDIO) += liquidio.o



liquidio-objs := lio_main.o  \

	      lio_ethtool.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_console.o   \

			octeon_nic.o



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

drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c

0 → 100644
+1171 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.h

0 → 100644
+57 −0
Original line number Diff line number Diff line 
/**********************************************************************

* Author: Cavium, Inc.

*

* Contact: support@cavium.com

*          Please include "LiquidIO" in the subject.

*

* Copyright (c) 2003-2015 Cavium, Inc.

*

* This file is free software; you can redistribute it and/or modify

* it under the terms of the GNU General Public License, Version 2, as

* published by the Free Software Foundation.

*

* This file is distributed in the hope that it will be useful, but

* AS-IS and WITHOUT ANY WARRANTY; without even the implied warranty

* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, TITLE, or

* NONINFRINGEMENT.  See the GNU General Public License for more

* details.

*

* This file may also be available under a different license from Cavium.

* Contact Cavium, Inc. for more information

**********************************************************************/



/*! \file  cn23xx_device.h

 * \brief Host Driver: Routines that perform CN23XX specific operations.

*/



#ifndef __CN23XX_PF_DEVICE_H__

#define __CN23XX_PF_DEVICE_H__



#include "cn23xx_pf_regs.h"



/* Register address and configuration for a CN23XX devices.

 * If device specific changes need to be made then add a struct to include

 * device specific fields as shown in the commented section

 */

struct octeon_cn23xx_pf {

	/** PCI interrupt summary register */

	u8 __iomem *intr_sum_reg64;



	/** PCI interrupt enable register */

	u8 __iomem *intr_enb_reg64;



	/** The PCI interrupt mask used by interrupt handler */

	u64 intr_mask64;



	struct octeon_config *conf;

};



int setup_cn23xx_octeon_pf_device(struct octeon_device *oct);



int validate_cn23xx_pf_config_info(struct octeon_device *oct,

				   struct octeon_config *conf23xx);



void cn23xx_dump_pf_initialized_regs(struct octeon_device *oct);



int cn23xx_fw_loaded(struct octeon_device *oct);

#endif

drivers/net/ethernet/cavium/liquidio/cn23xx_pf_regs.h

0 → 100644
+604 −0

File added.

Preview size limit exceeded, changes collapsed.