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

Commit 48365e48 authored by Sucheta Chakraborty's avatar Sucheta Chakraborty Committed by David S. Miller
Browse files

qlcnic: dcb: Add support for CEE Netlink interface. 



o Adapter and driver supports only CEE dcbnl ops. Only GET callbacks
  within dcbnl ops are supported currently.

Signed-off-by: default avatarSucheta Chakraborty <sucheta.chakraborty@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2d8ebcab

drivers/net/ethernet/qlogic/qlcnic/qlcnic.h

+8 −0
Original line number Diff line number Diff line
@@ -2183,4 +2183,12 @@ static inline void qlcnic_dcb_handle_aen(struct qlcnic_adapter *adapter, 
	if (dcb && dcb->ops->handle_aen)

		dcb->ops->handle_aen(adapter, msg);

}



static inline void qlcnic_dcb_init_dcbnl_ops(struct qlcnic_adapter *adapter)

{

	struct qlcnic_dcb *dcb = adapter->dcb;



	if (dcb && dcb->ops->init_dcbnl_ops)

		dcb->ops->init_dcbnl_ops(adapter);

}

#endif				/* __QLCNIC_H_ */

drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.c

+618 −1
Original line number Diff line number Diff line
@@ -9,11 +9,18 @@ 
#include "qlcnic.h"



#define QLC_DCB_NUM_PARAM		3

#define QLC_DCB_LOCAL_IDX		0

#define QLC_DCB_OPER_IDX		1

#define QLC_DCB_PEER_IDX		2



#define QLC_DCB_GET_MAP(V)		(1 << V)



#define QLC_DCB_AEN_BIT			0x2

#define QLC_DCB_FW_VER			0x2

#define QLC_DCB_MAX_TC			0x8

#define QLC_DCB_MAX_APP			0x8

#define QLC_DCB_MAX_PRIO		QLC_DCB_MAX_TC

#define QLC_DCB_MAX_PG			QLC_DCB_MAX_TC



#define QLC_DCB_TSA_SUPPORT(V)		(V & 0x1)

#define QLC_DCB_ETS_SUPPORT(V)		((V >> 1) & 0x1)
@@ -45,8 +52,12 @@ 
#define QLC_82XX_DCB_GET_PRIOMAP_APP(X)	(1 << X)

#define QLC_82XX_DCB_PRIO_TC_MAP	(0x76543210)



static const struct dcbnl_rtnl_ops qlcnic_dcbnl_ops;



static void qlcnic_dcb_aen_work(struct work_struct *);

static void qlcnic_dcb_data_cee_param_map(struct qlcnic_adapter *);



static inline void __qlcnic_init_dcbnl_ops(struct qlcnic_adapter *);

static void __qlcnic_dcb_free(struct qlcnic_adapter *);

static int __qlcnic_dcb_attach(struct qlcnic_adapter *);

static int __qlcnic_dcb_query_hw_capability(struct qlcnic_adapter *, char *);
@@ -94,12 +105,72 @@ struct qlcnic_82xx_dcb_param_mbx_le { 
	__le32 app[QLC_DCB_MAX_APP];

};



enum qlcnic_dcb_selector {

	QLC_SELECTOR_DEF = 0x0,

	QLC_SELECTOR_ETHER,

	QLC_SELECTOR_TCP,

	QLC_SELECTOR_UDP,

};



enum qlcnic_dcb_prio_type {

	QLC_PRIO_NONE = 0,

	QLC_PRIO_GROUP,

	QLC_PRIO_LINK,

};



enum qlcnic_dcb_pfc_type {

	QLC_PFC_DISABLED = 0,

	QLC_PFC_FULL,

	QLC_PFC_TX,

	QLC_PFC_RX

};



struct qlcnic_dcb_prio_cfg {

	bool valid;

	enum qlcnic_dcb_pfc_type pfc_type;

};



struct qlcnic_dcb_pg_cfg {

	bool valid;

	u8 total_bw_percent;		/* of Link/ port BW */

	u8 prio_count;

	u8 tsa_type;

};



struct qlcnic_dcb_tc_cfg {

	bool valid;

	struct qlcnic_dcb_prio_cfg prio_cfg[QLC_DCB_MAX_PRIO];

	enum qlcnic_dcb_prio_type prio_type;	/* always prio_link */

	u8 link_percent;			/* % of link bandwidth */

	u8 bwg_percent;				/* % of BWG's bandwidth */

	u8 up_tc_map;

	u8 pgid;

};



struct qlcnic_dcb_app {

	bool valid;

	enum qlcnic_dcb_selector selector;

	u16 protocol;

	u8 priority;

};



struct qlcnic_dcb_cee {

	struct qlcnic_dcb_tc_cfg tc_cfg[QLC_DCB_MAX_TC];

	struct qlcnic_dcb_pg_cfg pg_cfg[QLC_DCB_MAX_PG];

	struct qlcnic_dcb_app app[QLC_DCB_MAX_APP];

	bool tc_param_valid;

	bool pfc_mode_enable;

};



struct qlcnic_dcb_cfg {

	/* 0 - local, 1 - operational, 2 - remote */

	struct qlcnic_dcb_cee type[QLC_DCB_NUM_PARAM];

	struct qlcnic_dcb_capability capability;

	u32 version;

};



static struct qlcnic_dcb_ops qlcnic_83xx_dcb_ops = {

	.init_dcbnl_ops		= __qlcnic_init_dcbnl_ops,

	.free			= __qlcnic_dcb_free,

	.attach			= __qlcnic_dcb_attach,

	.query_hw_capability	= __qlcnic_dcb_query_hw_capability,
@@ -113,6 +184,7 @@ static struct qlcnic_dcb_ops qlcnic_83xx_dcb_ops = { 
};



static struct qlcnic_dcb_ops qlcnic_82xx_dcb_ops = {

	.init_dcbnl_ops		= __qlcnic_init_dcbnl_ops,

	.free			= __qlcnic_dcb_free,

	.attach			= __qlcnic_dcb_attach,

	.query_hw_capability	= __qlcnic_dcb_query_hw_capability,
@@ -132,6 +204,50 @@ static u8 qlcnic_dcb_get_num_app(struct qlcnic_adapter *adapter, u32 val) 
		return QLC_83XX_DCB_GET_NUMAPP(val);

}



static inline u8 qlcnic_dcb_pfc_hdr_valid(struct qlcnic_adapter *adapter,

					  u32 val)

{

	if (qlcnic_82xx_check(adapter))

		return QLC_82XX_DCB_PFC_VALID(val);

	else

		return QLC_83XX_DCB_PFC_VALID(val);

}



static inline u8 qlcnic_dcb_tsa_hdr_valid(struct qlcnic_adapter *adapter,

					  u32 val)

{

	if (qlcnic_82xx_check(adapter))

		return QLC_82XX_DCB_TSA_VALID(val);

	else

		return QLC_83XX_DCB_TSA_VALID(val);

}



static inline u8 qlcnic_dcb_get_prio_map_app(struct qlcnic_adapter *adapter,

					     u32 val)

{

	if (qlcnic_82xx_check(adapter))

		return QLC_82XX_DCB_GET_PRIOMAP_APP(val);

	else

		return QLC_83XX_DCB_GET_PRIOMAP_APP(val);

}



static int qlcnic_dcb_prio_count(u8 up_tc_map)

{

	int j;



	for (j = 0; j < QLC_DCB_MAX_TC; j++)

		if (up_tc_map & QLC_DCB_GET_MAP(j))

			break;



	return j;

}



static inline void __qlcnic_init_dcbnl_ops(struct qlcnic_adapter *adapter)

{

	if (test_bit(__QLCNIC_DCB_STATE, &adapter->state))

		adapter->netdev->dcbnl_ops = &qlcnic_dcbnl_ops;

}



void qlcnic_set_dcb_ops(struct qlcnic_adapter *adapter)

{

	if (qlcnic_82xx_check(adapter))
@@ -403,6 +519,8 @@ static int qlcnic_82xx_dcb_get_cee_cfg(struct qlcnic_adapter *adapter) 


	mbx->prio_tc_map = QLC_82XX_DCB_PRIO_TC_MAP;



	qlcnic_dcb_data_cee_param_map(adapter);



	return err;

}
@@ -517,8 +635,15 @@ out: 
static int qlcnic_83xx_dcb_get_cee_cfg(struct qlcnic_adapter *adapter)

{

	struct qlcnic_dcb *dcb = adapter->dcb;

	int err;



	err = qlcnic_dcb_query_cee_param(adapter, (char *)dcb->param, 0);

	if (err)

		return err;



	qlcnic_dcb_data_cee_param_map(adapter);



	return qlcnic_dcb_query_cee_param(adapter, (char *)dcb->param, 0);

	return err;

}



static int qlcnic_83xx_dcb_register_aen(struct qlcnic_adapter *adapter,
@@ -560,3 +685,495 @@ static void qlcnic_83xx_dcb_handle_aen(struct qlcnic_adapter *adapter, 


	queue_delayed_work(dcb->wq, &dcb->aen_work, 0);

}



static void qlcnic_dcb_fill_cee_tc_params(struct qlcnic_dcb_mbx_params *mbx,

					  struct qlcnic_dcb_param *each,

					  struct qlcnic_dcb_cee *type)

{

	struct qlcnic_dcb_tc_cfg *tc_cfg;

	u8 i, tc, pgid;



	for (i = 0; i < QLC_DCB_MAX_PRIO; i++) {

		tc = QLC_DCB_GET_TC_PRIO(mbx->prio_tc_map, i);

		tc_cfg = &type->tc_cfg[tc];

		tc_cfg->valid = true;

		tc_cfg->up_tc_map |= QLC_DCB_GET_MAP(i);



		if (QLC_DCB_GET_PFC_PRIO(each->hdr_prio_pfc_map[1], i) &&

		    type->pfc_mode_enable) {

			tc_cfg->prio_cfg[i].valid = true;

			tc_cfg->prio_cfg[i].pfc_type = QLC_PFC_FULL;

		}



		if (i < 4)

			pgid = QLC_DCB_GET_PGID_PRIO(each->prio_pg_map[0], i);

		else

			pgid = QLC_DCB_GET_PGID_PRIO(each->prio_pg_map[1], i);



		tc_cfg->pgid = pgid;



		tc_cfg->prio_type = QLC_PRIO_LINK;

		type->pg_cfg[tc_cfg->pgid].prio_count++;

	}

}



static void qlcnic_dcb_fill_cee_pg_params(struct qlcnic_dcb_param *each,

					  struct qlcnic_dcb_cee *type)

{

	struct qlcnic_dcb_pg_cfg *pg_cfg;

	u8 i, tsa, bw_per;



	for (i = 0; i < QLC_DCB_MAX_PG; i++) {

		pg_cfg = &type->pg_cfg[i];

		pg_cfg->valid = true;



		if (i < 4) {

			bw_per = QLC_DCB_GET_BWPER_PG(each->pg_bw_map[0], i);

			tsa = QLC_DCB_GET_TSA_PG(each->pg_tsa_map[0], i);

		} else {

			bw_per = QLC_DCB_GET_BWPER_PG(each->pg_bw_map[1], i);

			tsa = QLC_DCB_GET_TSA_PG(each->pg_tsa_map[1], i);

		}



		pg_cfg->total_bw_percent = bw_per;

		pg_cfg->tsa_type = tsa;

	}

}



static void

qlcnic_dcb_fill_cee_app_params(struct qlcnic_adapter *adapter, u8 idx,

			       struct qlcnic_dcb_param *each,

			       struct qlcnic_dcb_cee *type)

{

	struct qlcnic_dcb_app *app;

	u8 i, num_app, map, cnt;

	struct dcb_app new_app;



	num_app = qlcnic_dcb_get_num_app(adapter, each->hdr_prio_pfc_map[0]);

	for (i = 0; i < num_app; i++) {

		app = &type->app[i];

		app->valid = true;



		/* Only for CEE (-1) */

		app->selector = QLC_DCB_GET_SELECTOR_APP(each->app[i]) - 1;

		new_app.selector = app->selector;

		app->protocol = QLC_DCB_GET_PROTO_ID_APP(each->app[i]);

		new_app.protocol = app->protocol;

		map = qlcnic_dcb_get_prio_map_app(adapter, each->app[i]);

		cnt = qlcnic_dcb_prio_count(map);



		if (cnt >= QLC_DCB_MAX_TC)

			cnt = 0;



		app->priority = cnt;

		new_app.priority = cnt;



		if (idx == QLC_DCB_OPER_IDX && adapter->netdev->dcbnl_ops)

			dcb_setapp(adapter->netdev, &new_app);

	}

}



static void qlcnic_dcb_map_cee_params(struct qlcnic_adapter *adapter, u8 idx)

{

	struct qlcnic_dcb_mbx_params *mbx = adapter->dcb->param;

	struct qlcnic_dcb_param *each = &mbx->type[idx];

	struct qlcnic_dcb_cfg *cfg = adapter->dcb->cfg;

	struct qlcnic_dcb_cee *type = &cfg->type[idx];



	type->tc_param_valid = false;

	type->pfc_mode_enable = false;

	memset(type->tc_cfg, 0,

	       sizeof(struct qlcnic_dcb_tc_cfg) * QLC_DCB_MAX_TC);

	memset(type->pg_cfg, 0,

	       sizeof(struct qlcnic_dcb_pg_cfg) * QLC_DCB_MAX_TC);



	if (qlcnic_dcb_pfc_hdr_valid(adapter, each->hdr_prio_pfc_map[0]) &&

	    cfg->capability.max_pfc_tc)

		type->pfc_mode_enable = true;



	if (qlcnic_dcb_tsa_hdr_valid(adapter, each->hdr_prio_pfc_map[0]) &&

	    cfg->capability.max_ets_tc)

		type->tc_param_valid = true;



	qlcnic_dcb_fill_cee_tc_params(mbx, each, type);

	qlcnic_dcb_fill_cee_pg_params(each, type);

	qlcnic_dcb_fill_cee_app_params(adapter, idx, each, type);

}



static void qlcnic_dcb_data_cee_param_map(struct qlcnic_adapter *adapter)

{

	int i;



	for (i = 0; i < QLC_DCB_NUM_PARAM; i++)

		qlcnic_dcb_map_cee_params(adapter, i);



	dcbnl_cee_notify(adapter->netdev, RTM_GETDCB, DCB_CMD_CEE_GET, 0, 0);

}



static u8 qlcnic_dcb_get_state(struct net_device *netdev)

{

	struct qlcnic_adapter *adapter = netdev_priv(netdev);



	return test_bit(__QLCNIC_DCB_STATE, &adapter->state);

}



static void qlcnic_dcb_get_perm_hw_addr(struct net_device *netdev, u8 *addr)

{

	memcpy(addr, netdev->dev_addr, netdev->addr_len);

}



static void

qlcnic_dcb_get_pg_tc_cfg_tx(struct net_device *netdev, int tc, u8 *prio,

			    u8 *pgid, u8 *bw_per, u8 *up_tc_map)

{

	struct qlcnic_adapter *adapter = netdev_priv(netdev);

	struct qlcnic_dcb_tc_cfg *tc_cfg, *temp;

	struct qlcnic_dcb_cee *type;

	u8 i, cnt, pg;



	type = &adapter->dcb->cfg->type[QLC_DCB_OPER_IDX];

	*prio = *pgid = *bw_per = *up_tc_map = 0;



	if (!test_bit(__QLCNIC_DCB_STATE, &adapter->state) ||

	    !type->tc_param_valid)

		return;



	if (tc < 0 || (tc > QLC_DCB_MAX_TC))

		return;



	tc_cfg = &type->tc_cfg[tc];

	if (!tc_cfg->valid)

		return;



	*pgid = tc_cfg->pgid;

	*prio = tc_cfg->prio_type;

	*up_tc_map = tc_cfg->up_tc_map;

	pg = *pgid;



	for (i = 0, cnt = 0; i < QLC_DCB_MAX_TC; i++) {

		temp = &type->tc_cfg[i];

		if (temp->valid && (pg == temp->pgid))

			cnt++;

	}



	tc_cfg->bwg_percent = (100 / cnt);

	*bw_per = tc_cfg->bwg_percent;

}



static void qlcnic_dcb_get_pg_bwg_cfg_tx(struct net_device *netdev, int pgid,

					 u8 *bw_pct)

{

	struct qlcnic_adapter *adapter = netdev_priv(netdev);

	struct qlcnic_dcb_pg_cfg *pgcfg;

	struct qlcnic_dcb_cee *type;



	*bw_pct = 0;

	type = &adapter->dcb->cfg->type[QLC_DCB_OPER_IDX];



	if (!test_bit(__QLCNIC_DCB_STATE, &adapter->state) ||

	    !type->tc_param_valid)

		return;



	if (pgid < 0 || pgid > QLC_DCB_MAX_PG)

		return;



	pgcfg = &type->pg_cfg[pgid];

	if (!pgcfg->valid)

		return;



	*bw_pct = pgcfg->total_bw_percent;

}



static void qlcnic_dcb_get_pfc_cfg(struct net_device *netdev, int prio,

				   u8 *setting)

{

	struct qlcnic_adapter *adapter = netdev_priv(netdev);

	struct qlcnic_dcb_tc_cfg *tc_cfg;

	u8 val = QLC_DCB_GET_MAP(prio);

	struct qlcnic_dcb_cee *type;

	u8 i;



	*setting = 0;

	type = &adapter->dcb->cfg->type[QLC_DCB_OPER_IDX];



	if (!test_bit(__QLCNIC_DCB_STATE, &adapter->state) ||

	    !type->pfc_mode_enable)

		return;



	for (i = 0; i < QLC_DCB_MAX_TC; i++) {

		tc_cfg = &type->tc_cfg[i];

		if (!tc_cfg->valid)

			continue;



		if ((val & tc_cfg->up_tc_map) && (tc_cfg->prio_cfg[prio].valid))

			*setting = tc_cfg->prio_cfg[prio].pfc_type;

	}

}



static u8 qlcnic_dcb_get_capability(struct net_device *netdev, int capid,

				    u8 *cap)

{

	struct qlcnic_adapter *adapter = netdev_priv(netdev);



	if (!test_bit(__QLCNIC_DCB_STATE, &adapter->state))

		return 0;



	switch (capid) {

	case DCB_CAP_ATTR_PG:

	case DCB_CAP_ATTR_UP2TC:

	case DCB_CAP_ATTR_PFC:

	case DCB_CAP_ATTR_GSP:

		*cap = true;

		break;

	case DCB_CAP_ATTR_PG_TCS:

	case DCB_CAP_ATTR_PFC_TCS:

		*cap = 0x80;	/* 8 priorities for PGs */

		break;

	case DCB_CAP_ATTR_DCBX:

		*cap = adapter->dcb->cfg->capability.dcb_capability;

		break;

	default:

		*cap = false;

	}



	return 0;

}



static int qlcnic_dcb_get_num_tcs(struct net_device *netdev, int attr, u8 *num)

{

	struct qlcnic_adapter *adapter = netdev_priv(netdev);

	struct qlcnic_dcb_cfg *cfg = adapter->dcb->cfg;



	if (!test_bit(__QLCNIC_DCB_STATE, &adapter->state))

		return -EINVAL;



	switch (attr) {

	case DCB_NUMTCS_ATTR_PG:

		*num = cfg->capability.max_ets_tc;

		return 0;

	case DCB_NUMTCS_ATTR_PFC:

		*num = cfg->capability.max_pfc_tc;

		return 0;

	default:

		return -EINVAL;

	}

}



static u8 qlcnic_dcb_get_app(struct net_device *netdev, u8 idtype, u16 id)

{

	struct qlcnic_adapter *adapter = netdev_priv(netdev);

	struct dcb_app app = {

				.selector = idtype,

				.protocol = id,

			     };



	if (!test_bit(__QLCNIC_DCB_STATE, &adapter->state))

		return 0;



	return dcb_getapp(netdev, &app);

}



static u8 qlcnic_dcb_get_pfc_state(struct net_device *netdev)

{

	struct qlcnic_adapter *adapter = netdev_priv(netdev);

	struct qlcnic_dcb *dcb = adapter->dcb;



	if (!test_bit(__QLCNIC_DCB_STATE, &adapter->state))

		return 0;



	return dcb->cfg->type[QLC_DCB_OPER_IDX].pfc_mode_enable;

}



static u8 qlcnic_dcb_get_dcbx(struct net_device *netdev)

{

	struct qlcnic_adapter *adapter = netdev_priv(netdev);

	struct qlcnic_dcb_cfg *cfg = adapter->dcb->cfg;



	if (!test_bit(__QLCNIC_DCB_STATE, &adapter->state))

		return 0;



	return cfg->capability.dcb_capability;

}



static u8 qlcnic_dcb_get_feat_cfg(struct net_device *netdev, int fid, u8 *flag)

{

	struct qlcnic_adapter *adapter = netdev_priv(netdev);

	struct qlcnic_dcb_cee *type;



	if (!test_bit(__QLCNIC_DCB_STATE, &adapter->state))

		return 1;



	type = &adapter->dcb->cfg->type[QLC_DCB_OPER_IDX];

	*flag = 0;



	switch (fid) {

	case DCB_FEATCFG_ATTR_PG:

		if (type->tc_param_valid)

			*flag |= DCB_FEATCFG_ENABLE;

		else

			*flag |= DCB_FEATCFG_ERROR;

		break;

	case DCB_FEATCFG_ATTR_PFC:

		if (type->pfc_mode_enable) {

			if (type->tc_cfg[0].prio_cfg[0].pfc_type)

				*flag |= DCB_FEATCFG_ENABLE;

		} else {

			*flag |= DCB_FEATCFG_ERROR;

		}

		break;

	case DCB_FEATCFG_ATTR_APP:

		*flag |= DCB_FEATCFG_ENABLE;

		break;

	default:

		netdev_err(netdev, "Invalid Feature ID %d\n", fid);

		return 1;

	}



	return 0;

}



static inline void

qlcnic_dcb_get_pg_tc_cfg_rx(struct net_device *netdev, int prio, u8 *prio_type,

			    u8 *pgid, u8 *bw_pct, u8 *up_map)

{

	*prio_type = *pgid = *bw_pct = *up_map = 0;

}



static inline void

qlcnic_dcb_get_pg_bwg_cfg_rx(struct net_device *netdev, int pgid, u8 *bw_pct)

{

	*bw_pct = 0;

}



static int qlcnic_dcb_peer_app_info(struct net_device *netdev,

				    struct dcb_peer_app_info *info,

				    u16 *app_count)

{

	struct qlcnic_adapter *adapter = netdev_priv(netdev);

	struct qlcnic_dcb_cee *peer;

	int i;



	*app_count = 0;



	if (!test_bit(__QLCNIC_DCB_STATE, &adapter->state))

		return 0;



	peer = &adapter->dcb->cfg->type[QLC_DCB_PEER_IDX];



	for (i = 0; i < QLC_DCB_MAX_APP; i++) {

		if (peer->app[i].valid)

			(*app_count)++;

	}



	return 0;

}



static int qlcnic_dcb_peer_app_table(struct net_device *netdev,

				     struct dcb_app *table)

{

	struct qlcnic_adapter *adapter = netdev_priv(netdev);

	struct qlcnic_dcb_cee *peer;

	struct qlcnic_dcb_app *app;

	int i, j;



	if (!test_bit(__QLCNIC_DCB_STATE, &adapter->state))

		return 0;



	peer = &adapter->dcb->cfg->type[QLC_DCB_PEER_IDX];



	for (i = 0, j = 0; i < QLC_DCB_MAX_APP; i++) {

		app = &peer->app[i];

		if (!app->valid)

			continue;



		table[j].selector = app->selector;

		table[j].priority = app->priority;

		table[j++].protocol = app->protocol;

	}



	return 0;

}



static int qlcnic_dcb_cee_peer_get_pg(struct net_device *netdev,

				      struct cee_pg *pg)

{

	struct qlcnic_adapter *adapter = netdev_priv(netdev);

	struct qlcnic_dcb_cee *peer;

	u8 i, j, k, map;



	if (!test_bit(__QLCNIC_DCB_STATE, &adapter->state))

		return 0;



	peer = &adapter->dcb->cfg->type[QLC_DCB_PEER_IDX];



	for (i = 0, j = 0; i < QLC_DCB_MAX_PG; i++) {

		if (!peer->pg_cfg[i].valid)

			continue;



		pg->pg_bw[j] = peer->pg_cfg[i].total_bw_percent;



		for (k = 0; k < QLC_DCB_MAX_TC; k++) {

			if (peer->tc_cfg[i].valid &&

			    (peer->tc_cfg[i].pgid == i)) {

				map = peer->tc_cfg[i].up_tc_map;

				pg->prio_pg[j++] = map;

				break;

			}

		}

	}



	return 0;

}



static int qlcnic_dcb_cee_peer_get_pfc(struct net_device *netdev,

				       struct cee_pfc *pfc)

{

	struct qlcnic_adapter *adapter = netdev_priv(netdev);

	struct qlcnic_dcb_cfg *cfg = adapter->dcb->cfg;

	struct qlcnic_dcb_tc_cfg *tc;

	struct qlcnic_dcb_cee *peer;

	u8 i, setting, prio;



	pfc->pfc_en = 0;



	if (!test_bit(__QLCNIC_DCB_STATE, &adapter->state))

		return 0;



	peer = &cfg->type[QLC_DCB_PEER_IDX];



	for (i = 0; i < QLC_DCB_MAX_TC; i++) {

		tc = &peer->tc_cfg[i];

		prio = qlcnic_dcb_prio_count(tc->up_tc_map);



		setting = 0;

		qlcnic_dcb_get_pfc_cfg(netdev, prio, &setting);

		if (setting)

			pfc->pfc_en |= QLC_DCB_GET_MAP(i);

	}



	pfc->tcs_supported = cfg->capability.max_pfc_tc;



	return 0;

}



static const struct dcbnl_rtnl_ops qlcnic_dcbnl_ops = {

	.getstate		= qlcnic_dcb_get_state,

	.getpermhwaddr		= qlcnic_dcb_get_perm_hw_addr,

	.getpgtccfgtx		= qlcnic_dcb_get_pg_tc_cfg_tx,

	.getpgbwgcfgtx		= qlcnic_dcb_get_pg_bwg_cfg_tx,

	.getpfccfg		= qlcnic_dcb_get_pfc_cfg,

	.getcap			= qlcnic_dcb_get_capability,

	.getnumtcs		= qlcnic_dcb_get_num_tcs,

	.getapp			= qlcnic_dcb_get_app,

	.getpfcstate		= qlcnic_dcb_get_pfc_state,

	.getdcbx		= qlcnic_dcb_get_dcbx,

	.getfeatcfg		= qlcnic_dcb_get_feat_cfg,



	.getpgtccfgrx		= qlcnic_dcb_get_pg_tc_cfg_rx,

	.getpgbwgcfgrx		= qlcnic_dcb_get_pg_bwg_cfg_rx,



	.peer_getappinfo	= qlcnic_dcb_peer_app_info,

	.peer_getapptable	= qlcnic_dcb_peer_app_table,

	.cee_peer_getpg		= qlcnic_dcb_cee_peer_get_pg,

	.cee_peer_getpfc	= qlcnic_dcb_cee_peer_get_pfc,

};

drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.h

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ static inline int __qlcnic_register_dcb(struct qlcnic_adapter *adapter) 
#endif



struct qlcnic_dcb_ops {

	void (*init_dcbnl_ops) (struct qlcnic_adapter *);

	void (*free) (struct qlcnic_adapter *);

	int (*attach) (struct qlcnic_adapter *);

	int (*query_hw_capability) (struct qlcnic_adapter *, char *);

drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c

+2 −0
Original line number Diff line number Diff line
@@ -2028,6 +2028,8 @@ qlcnic_setup_netdev(struct qlcnic_adapter *adapter, struct net_device *netdev, 
		return err;

	}



	qlcnic_dcb_init_dcbnl_ops(adapter);



	return 0;

}