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

Commit 1fa0f68c authored by Ioana Ciocoi Radulescu's avatar Ioana Ciocoi Radulescu Committed by David S. Miller
Browse files

dpaa2-eth: Use FQ-based DPIO enqueue API 



Starting with MC10.14.0, dpaa2_io_service_enqueue_fq() API is
functional. Since there are a number of cases where it offers
better performance compared to the currently used enqueue
function, switch to it for firmware versions that support it.

Signed-off-by: default avatarIoana Radulescu <ruxandra.radulescu@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0723a3ae

drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c

+35 −6
Original line number Diff line number Diff line
@@ -264,9 +264,7 @@ static int xdp_enqueue(struct dpaa2_eth_priv *priv, struct dpaa2_fd *fd, 


	fq = &priv->fq[queue_id];

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

		err = dpaa2_io_service_enqueue_qd(fq->channel->dpio,

						  priv->tx_qdid, 0,

						  fq->tx_qdbin, fd);

		err = priv->enqueue(priv, fq, fd, 0);

		if (err != -EBUSY)

			break;

	}
@@ -785,9 +783,7 @@ static netdev_tx_t dpaa2_eth_tx(struct sk_buff *skb, struct net_device *net_dev) 
	queue_mapping = skb_get_queue_mapping(skb);

	fq = &priv->fq[queue_mapping];

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

		err = dpaa2_io_service_enqueue_qd(fq->channel->dpio,

						  priv->tx_qdid, 0,

						  fq->tx_qdbin, &fd);

		err = priv->enqueue(priv, fq, &fd, 0);

		if (err != -EBUSY)

			break;

	}
@@ -2205,6 +2201,36 @@ static int set_buffer_layout(struct dpaa2_eth_priv *priv) 
	return 0;

}



#define DPNI_ENQUEUE_FQID_VER_MAJOR	7

#define DPNI_ENQUEUE_FQID_VER_MINOR	9



static inline int dpaa2_eth_enqueue_qd(struct dpaa2_eth_priv *priv,

				       struct dpaa2_eth_fq *fq,

				       struct dpaa2_fd *fd, u8 prio)

{

	return dpaa2_io_service_enqueue_qd(fq->channel->dpio,

					   priv->tx_qdid, prio,

					   fq->tx_qdbin, fd);

}



static inline int dpaa2_eth_enqueue_fq(struct dpaa2_eth_priv *priv,

				       struct dpaa2_eth_fq *fq,

				       struct dpaa2_fd *fd,

				       u8 prio __always_unused)

{

	return dpaa2_io_service_enqueue_fq(fq->channel->dpio,

					   fq->tx_fqid, fd);

}



static void set_enqueue_mode(struct dpaa2_eth_priv *priv)

{

	if (dpaa2_eth_cmp_dpni_ver(priv, DPNI_ENQUEUE_FQID_VER_MAJOR,

				   DPNI_ENQUEUE_FQID_VER_MINOR) < 0)

		priv->enqueue = dpaa2_eth_enqueue_qd;

	else

		priv->enqueue = dpaa2_eth_enqueue_fq;

}



/* Configure the DPNI object this interface is associated with */

static int setup_dpni(struct fsl_mc_device *ls_dev)

{
@@ -2258,6 +2284,8 @@ static int setup_dpni(struct fsl_mc_device *ls_dev) 
	if (err)

		goto close;



	set_enqueue_mode(priv);



	priv->cls_rules = devm_kzalloc(dev, sizeof(struct dpaa2_eth_cls_rule) *

				       dpaa2_eth_fs_count(priv), GFP_KERNEL);

	if (!priv->cls_rules)
@@ -2342,6 +2370,7 @@ static int setup_tx_flow(struct dpaa2_eth_priv *priv, 
	}



	fq->tx_qdbin = qid.qdbin;

	fq->tx_fqid = qid.fqid;



	err = dpni_get_queue(priv->mc_io, 0, priv->mc_token,

			     DPNI_QUEUE_TX_CONFIRM, 0, fq->flowid,

drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h

+4 −0
Original line number Diff line number Diff line
@@ -276,6 +276,7 @@ struct dpaa2_eth_priv; 
struct dpaa2_eth_fq {

	u32 fqid;

	u32 tx_qdbin;

	u32 tx_fqid;

	u16 flowid;

	int target_cpu;

	u32 dq_frames;
@@ -328,6 +329,9 @@ struct dpaa2_eth_priv { 


	u8 num_fqs;

	struct dpaa2_eth_fq fq[DPAA2_ETH_MAX_QUEUES];

	int (*enqueue)(struct dpaa2_eth_priv *priv,

		       struct dpaa2_eth_fq *fq,

		       struct dpaa2_fd *fd, u8 prio);



	u8 num_channels;

	struct dpaa2_eth_channel *channel[DPAA2_ETH_MAX_DPCONS];