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

Commit 9e0fd15d authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

bnxt: Convert ndo_setup_tc offloads to block callbacks 



Benefit from the newly introduced block callback infrastructure and
convert ndo_setup_tc calls for flower offloads to block callbacks.

Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d6c862ba

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+32 −5
Original line number Diff line number Diff line
@@ -7295,15 +7295,40 @@ int bnxt_setup_mq_tc(struct net_device *dev, u8 tc) 
	return 0;

}



static int bnxt_setup_flower(struct net_device *dev,

			     struct tc_cls_flower_offload *cls_flower)

static int bnxt_setup_tc_block_cb(enum tc_setup_type type, void *type_data,

				  void *cb_priv)

{

	struct bnxt *bp = netdev_priv(dev);

	struct bnxt *bp = cb_priv;



	if (BNXT_VF(bp))

		return -EOPNOTSUPP;



	return bnxt_tc_setup_flower(bp, bp->pf.fw_fid, cls_flower);

	switch (type) {

	case TC_SETUP_CLSFLOWER:

		return bnxt_tc_setup_flower(bp, bp->pf.fw_fid, type_data);

	default:

		return -EOPNOTSUPP;

	}

}



static int bnxt_setup_tc_block(struct net_device *dev,

			       struct tc_block_offload *f)

{

	struct bnxt *bp = netdev_priv(dev);



	if (f->binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS)

		return -EOPNOTSUPP;



	switch (f->command) {

	case TC_BLOCK_BIND:

		return tcf_block_cb_register(f->block, bnxt_setup_tc_block_cb,

					     bp, bp);

	case TC_BLOCK_UNBIND:

		tcf_block_cb_unregister(f->block, bnxt_setup_tc_block_cb, bp);

		return 0;

	default:

		return -EOPNOTSUPP;

	}

}



static int bnxt_setup_tc(struct net_device *dev, enum tc_setup_type type,
@@ -7311,7 +7336,9 @@ static int bnxt_setup_tc(struct net_device *dev, enum tc_setup_type type, 
{

	switch (type) {

	case TC_SETUP_CLSFLOWER:

		return bnxt_setup_flower(dev, type_data);

		return 0; /* will be removed after conversion from ndo */

	case TC_SETUP_BLOCK:

		return bnxt_setup_tc_block(dev, type_data);

	case TC_SETUP_MQPRIO: {

		struct tc_mqprio_qopt *mqprio = type_data;

drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c

+1 −2
Original line number Diff line number Diff line
@@ -748,8 +748,7 @@ int bnxt_tc_setup_flower(struct bnxt *bp, u16 src_fid, 
{

	int rc = 0;



	if (!is_classid_clsact_ingress(cls_flower->common.classid) ||

	    cls_flower->common.chain_index)

	if (cls_flower->common.chain_index)

		return -EOPNOTSUPP;



	switch (cls_flower->command) {

drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c

+40 −3
Original line number Diff line number Diff line
@@ -115,10 +115,11 @@ bnxt_vf_rep_get_stats64(struct net_device *dev, 
	stats->tx_bytes = vf_rep->tx_stats.bytes;

}



static int bnxt_vf_rep_setup_tc(struct net_device *dev, enum tc_setup_type type,

				void *type_data)

static int bnxt_vf_rep_setup_tc_block_cb(enum tc_setup_type type,

					 void *type_data,

					 void *cb_priv)

{

	struct bnxt_vf_rep *vf_rep = netdev_priv(dev);

	struct bnxt_vf_rep *vf_rep = cb_priv;

	struct bnxt *bp = vf_rep->bp;

	int vf_fid = bp->pf.vf[vf_rep->vf_idx].fw_fid;
@@ -130,6 +131,42 @@ static int bnxt_vf_rep_setup_tc(struct net_device *dev, enum tc_setup_type type, 
	}

}



static int bnxt_vf_rep_setup_tc_block(struct net_device *dev,

				      struct tc_block_offload *f)

{

	struct bnxt_vf_rep *vf_rep = netdev_priv(dev);



	if (f->binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS)

		return -EOPNOTSUPP;



	switch (f->command) {

	case TC_BLOCK_BIND:

		return tcf_block_cb_register(f->block,

					     bnxt_vf_rep_setup_tc_block_cb,

					     vf_rep, vf_rep);

		return 0;

	case TC_BLOCK_UNBIND:

		tcf_block_cb_unregister(f->block,

					bnxt_vf_rep_setup_tc_block_cb, vf_rep);

		return 0;

	default:

		return -EOPNOTSUPP;

	}

}



static int bnxt_vf_rep_setup_tc(struct net_device *dev, enum tc_setup_type type,

				void *type_data)

{

	switch (type) {

	case TC_SETUP_CLSFLOWER:

		return 0; /* will be removed after conversion from ndo */

	case TC_SETUP_BLOCK:

		return bnxt_vf_rep_setup_tc_block(dev, type_data);

	default:

		return -EOPNOTSUPP;

	}

}



struct net_device *bnxt_get_vf_rep(struct bnxt *bp, u16 cfa_code)

{

	u16 vf_idx;