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

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,