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

Merge branch 'cxgb4-next' 



Anish Bhatt says:

====================
cxgb4 : Add DCBx support to Chelsio cxgb4 driver

This patchset adds support for DCBx via dcbnl_ops to the cxgb4
driver. This should enable cxgb4 to work with open-lldp and the
like. The last patch only updates copyright year.

v2 : move inclusion of struct port_dcb_info to the same patch as where it is defined.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9f8b93cb ce100b8b

drivers/net/ethernet/chelsio/Kconfig

+11 −0
Original line number Original line Diff line number Diff line
@@ -86,6 +86,17 @@ config CHELSIO_T4 
	  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 cxgb4.

	  will be called cxgb4.





config CHELSIO_T4_DCB

	bool "Data Center Bridging (DCB) Support for Chelsio T4/T5 cards"

	default n

	depends on CHELSIO_T4 && DCB

	---help---

	  Enable DCB support through rtNetlink interface.

	  Say Y here if you want to enable Data Center Bridging (DCB) support

	  in the driver.



	  If unsure, say N.



config CHELSIO_T4VF

config CHELSIO_T4VF

	tristate "Chelsio Communications T4/T5 Virtual Function Ethernet support"

	tristate "Chelsio Communications T4/T5 Virtual Function Ethernet support"

	depends on PCI

	depends on PCI

drivers/net/ethernet/chelsio/cxgb4/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -5,3 +5,4 @@ 
obj-$(CONFIG_CHELSIO_T4) += cxgb4.o

obj-$(CONFIG_CHELSIO_T4) += cxgb4.o





cxgb4-objs := cxgb4_main.o l2t.o t4_hw.o sge.o

cxgb4-objs := cxgb4_main.o l2t.o t4_hw.o sge.o

cxgb4-$(CONFIG_CHELSIO_T4_DCB) +=  cxgb4_dcb.o

drivers/net/ethernet/chelsio/cxgb4/cxgb4.h

+12 −1
Original line number Original line Diff line number Diff line 
/*

/*

 * This file is part of the Chelsio T4 Ethernet driver for Linux.

 * This file is part of the Chelsio T4 Ethernet driver for Linux.

 *

 *

 * Copyright (c) 2003-2010 Chelsio Communications, Inc. All rights reserved.

 * Copyright (c) 2003-2014 Chelsio Communications, Inc. All rights reserved.

 *

 *

 * This software is available to you under a choice of one of two

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU

 * licenses.  You may choose to be licensed under the terms of the GNU
@@ -373,6 +373,8 @@ enum { 
struct adapter;

struct adapter;

struct sge_rspq;

struct sge_rspq;





#include "cxgb4_dcb.h"



struct port_info {

struct port_info {

	struct adapter *adapter;

	struct adapter *adapter;

	u16    viid;

	u16    viid;
@@ -389,6 +391,9 @@ struct port_info { 
	u8     rss_mode;

	u8     rss_mode;

	struct link_config link_cfg;

	struct link_config link_cfg;

	u16   *rss;

	u16   *rss;

#ifdef CONFIG_CHELSIO_T4_DCB

	struct port_dcb_info dcb;     /* Data Center Bridging support */

#endif

};

};





struct dentry;

struct dentry;
@@ -1007,6 +1012,10 @@ int t4_query_params(struct adapter *adap, unsigned int mbox, unsigned int pf, 
int t4_set_params(struct adapter *adap, unsigned int mbox, unsigned int pf,

int t4_set_params(struct adapter *adap, unsigned int mbox, unsigned int pf,

		  unsigned int vf, unsigned int nparams, const u32 *params,

		  unsigned int vf, unsigned int nparams, const u32 *params,

		  const u32 *val);

		  const u32 *val);

int t4_set_params_nosleep(struct adapter *adap, unsigned int mbox,

			  unsigned int pf, unsigned int vf,

			  unsigned int nparams, const u32 *params,

			  const u32 *val);

int t4_cfg_pfvf(struct adapter *adap, unsigned int mbox, unsigned int pf,

int t4_cfg_pfvf(struct adapter *adap, unsigned int mbox, unsigned int pf,

		unsigned int vf, unsigned int txq, unsigned int txq_eth_ctrl,

		unsigned int vf, unsigned int txq, unsigned int txq_eth_ctrl,

		unsigned int rxqi, unsigned int rxq, unsigned int tc,

		unsigned int rxqi, unsigned int rxq, unsigned int tc,
@@ -1025,6 +1034,8 @@ int t4_change_mac(struct adapter *adap, unsigned int mbox, unsigned int viid, 
		  int idx, const u8 *addr, bool persist, bool add_smt);

		  int idx, const u8 *addr, bool persist, bool add_smt);

int t4_set_addr_hash(struct adapter *adap, unsigned int mbox, unsigned int viid,

int t4_set_addr_hash(struct adapter *adap, unsigned int mbox, unsigned int viid,

		     bool ucast, u64 vec, bool sleep_ok);

		     bool ucast, u64 vec, bool sleep_ok);

int t4_enable_vi_params(struct adapter *adap, unsigned int mbox,

			unsigned int viid, bool rx_en, bool tx_en, bool dcb_en);

int t4_enable_vi(struct adapter *adap, unsigned int mbox, unsigned int viid,

int t4_enable_vi(struct adapter *adap, unsigned int mbox, unsigned int viid,

		 bool rx_en, bool tx_en);

		 bool rx_en, bool tx_en);

int t4_identify_port(struct adapter *adap, unsigned int mbox, unsigned int viid,

int t4_identify_port(struct adapter *adap, unsigned int mbox, unsigned int viid,

drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c

0 → 100644
+980 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h

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

 *  Copyright (C) 2013-2014 Chelsio Communications.  All rights reserved.

 *

 *  Written by Anish Bhatt (anish@chelsio.com)

 *

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

 *  under the terms and conditions of the GNU General Public License,

 *  version 2, as published by the Free Software Foundation.

 *

 *  This program is distributed in the hope it will be useful, but WITHOUT

 *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 *  more details.

 *

 *  The full GNU General Public License is included in this distribution in

 *  the file called "COPYING".

 *

 */



#ifndef __CXGB4_DCB_H

#define __CXGB4_DCB_H



#include <linux/netdevice.h>

#include <linux/dcbnl.h>

#include <net/dcbnl.h>



#ifdef CONFIG_CHELSIO_T4_DCB



#define CXGB4_DCBX_FW_SUPPORT \

	(DCB_CAP_DCBX_VER_CEE | \

	 DCB_CAP_DCBX_VER_IEEE | \

	 DCB_CAP_DCBX_LLD_MANAGED)

#define CXGB4_DCBX_HOST_SUPPORT \

	(DCB_CAP_DCBX_VER_CEE | \

	 DCB_CAP_DCBX_VER_IEEE | \

	 DCB_CAP_DCBX_HOST)



#define CXGB4_MAX_PRIORITY      CXGB4_MAX_DCBX_APP_SUPPORTED

#define CXGB4_MAX_TCS           CXGB4_MAX_DCBX_APP_SUPPORTED



#define INIT_PORT_DCB_CMD(__pcmd, __port, __op, __action) \

	do { \

		memset(&(__pcmd), 0, sizeof(__pcmd)); \

		(__pcmd).op_to_portid = \

			cpu_to_be32(FW_CMD_OP(FW_PORT_CMD) | \

				    FW_CMD_REQUEST | \

				    FW_CMD_##__op | \

				    FW_PORT_CMD_PORTID(__port)); \

		(__pcmd).action_to_len16 = \

			cpu_to_be32(FW_PORT_CMD_ACTION(__action) | \

				    FW_LEN16(pcmd)); \

	} while (0)



#define INIT_PORT_DCB_READ_PEER_CMD(__pcmd, __port) \

	INIT_PORT_DCB_CMD(__pcmd, __port, READ, FW_PORT_ACTION_DCB_READ_RECV)



#define INIT_PORT_DCB_READ_LOCAL_CMD(__pcmd, __port) \

	INIT_PORT_DCB_CMD(__pcmd, __port, READ, FW_PORT_ACTION_DCB_READ_TRANS)



#define INIT_PORT_DCB_READ_SYNC_CMD(__pcmd, __port) \

	INIT_PORT_DCB_CMD(__pcmd, __port, READ, FW_PORT_ACTION_DCB_READ_DET)



#define INIT_PORT_DCB_WRITE_CMD(__pcmd, __port) \

	INIT_PORT_DCB_CMD(__pcmd, __port, EXEC, FW_PORT_ACTION_L2_DCB_CFG)



/* States we can be in for a port's Data Center Bridging.

 */

enum cxgb4_dcb_state {

	CXGB4_DCB_STATE_START,		/* initial unknown state */

	CXGB4_DCB_STATE_HOST,		/* we're using Host DCB (if at all) */

	CXGB4_DCB_STATE_FW_INCOMPLETE,	/* using firmware DCB, incomplete */

	CXGB4_DCB_STATE_FW_ALLSYNCED,	/* using firmware DCB, all sync'ed */

};



/* Data Center Bridging state input for the Finite State Machine.

 */

enum cxgb4_dcb_state_input {

	/* Input from the firmware.

	 */

	CXGB4_DCB_INPUT_FW_DISABLED,	/* firmware DCB disabled */

	CXGB4_DCB_INPUT_FW_ENABLED,	/* firmware DCB enabled */

	CXGB4_DCB_INPUT_FW_INCOMPLETE,	/* firmware reports incomplete DCB */

	CXGB4_DCB_INPUT_FW_ALLSYNCED,	/* firmware reports all sync'ed */



};



/* Firmware DCB messages that we've received so far ...

 */

enum cxgb4_dcb_fw_msgs {

	CXGB4_DCB_FW_PGID	= 0x01,

	CXGB4_DCB_FW_PGRATE	= 0x02,

	CXGB4_DCB_FW_PRIORATE	= 0x04,

	CXGB4_DCB_FW_PFC	= 0x08,

	CXGB4_DCB_FW_APP_ID	= 0x10,

};



#define CXGB4_MAX_DCBX_APP_SUPPORTED 8



/* Data Center Bridging support;

 */

struct port_dcb_info {

	enum cxgb4_dcb_state state;	/* DCB State Machine */

	enum cxgb4_dcb_fw_msgs msgs;	/* DCB Firmware messages received */

	unsigned int supported;		/* OS DCB capabilities supported */

	bool enabled;			/* OS Enabled state */



	/* Cached copies of DCB information sent by the firmware (in Host

	 * Native Endian format).

	 */

	u32	pgid;			/* Priority Group[0..7] */

	u8	pfcen;			/* Priority Flow Control[0..7] */

	u8	pg_num_tcs_supported;	/* max PG Traffic Classes */

	u8	pfc_num_tcs_supported;	/* max PFC Traffic Classes */

	u8	pgrate[8];		/* Priority Group Rate[0..7] */

	u8	priorate[8];		/* Priority Rate[0..7] */

	struct app_priority { /* Application Information */

		u8	user_prio_map;	/* Priority Map bitfield */

		u8	sel_field;	/* Protocol ID interpretation */

		u16	protocolid;	/* Protocol ID */

	} app_priority[CXGB4_MAX_DCBX_APP_SUPPORTED];

};



void cxgb4_dcb_state_init(struct net_device *);

void cxgb4_dcb_state_fsm(struct net_device *, enum cxgb4_dcb_state_input);

void cxgb4_dcb_handle_fw_update(struct adapter *, const struct fw_port_cmd *);

void cxgb4_dcb_set_caps(struct adapter *, const struct fw_port_cmd *);

extern const struct dcbnl_rtnl_ops cxgb4_dcb_ops;



#define CXGB4_DCB_ENABLED true



#else /* !CONFIG_CHELSIO_T4_DCB */



static inline void cxgb4_dcb_state_init(struct net_device *dev)

{

}



#define CXGB4_DCB_ENABLED false



#endif /* !CONFIG_CHELSIO_T4_DCB */



#endif /* __CXGB4_DCB_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE