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

Merge branch 'dpaa2-eth-small-updates' 



Ioana Ciornei says:

====================
dpaa2-eth: small updates

This patch set adds some updates to the dpaa2-eth driver: trimming of
the frame queue debugfs counters, cleanup of the remaining sparse
warnings and some other small fixes such as a recursive header include.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 575691b3 05e19046

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

+4 −0
Original line number Diff line number Diff line
@@ -90,6 +90,10 @@ static int dpaa2_dbg_fqs_show(struct seq_file *file, void *offset) 
		if (err)

			fcnt = 0;



		/* Skip FQs with no traffic */

		if (!fq->stats.frames && !fcnt)

			continue;



		seq_printf(file, "%5d%16d%16d%16s%16llu%16u\n",

			   fq->fqid,

			   fq->target_cpu,

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

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 


#include <linux/skbuff.h>

#include <linux/netdevice.h>

#include "dpaa2-eth.h"

#include <linux/tracepoint.h>



#define TR_FMT "[%s] fd: addr=0x%llx, len=%u, off=%u"

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

+5 −1
Original line number Diff line number Diff line
@@ -611,6 +611,10 @@ static int build_sg_fd(struct dpaa2_eth_priv *priv, 


	sg_init_table(scl, nr_frags + 1);

	num_sg = skb_to_sgvec(skb, scl, 0, skb->len);

	if (unlikely(num_sg < 0)) {

		err = -ENOMEM;

		goto dma_map_sg_failed;

	}

	num_dma_bufs = dma_map_sg(dev, scl, num_sg, DMA_BIDIRECTIONAL);

	if (unlikely(!num_dma_bufs)) {

		err = -ENOMEM;
@@ -1109,7 +1113,7 @@ static void drain_bufs(struct dpaa2_eth_priv *priv, int count) 
					       buf_array, count);

		if (ret < 0) {

			if (ret == -EBUSY &&

			    retries++ >= DPAA2_ETH_SWP_BUSY_RETRIES)

			    retries++ < DPAA2_ETH_SWP_BUSY_RETRIES)

				continue;

			netdev_err(priv->net_dev, "dpaa2_io_service_acquire() failed\n");

			return;

drivers/net/ethernet/freescale/dpaa2/dpni.c

+4 −4
Original line number Diff line number Diff line
@@ -1558,10 +1558,10 @@ int dpni_get_statistics(struct fsl_mc_io *mc_io, 
 * @cmd_flags:	Command flags; one or more of 'MC_CMD_FLAG_'

 * @token:	Token of DPNI object

 * @cg_point:	Congestion point

 * @q_type:	Queue type on which the taildrop is configured.

 * @qtype:	Queue type on which the taildrop is configured.

 *		Only Rx queues are supported for now

 * @tc:		Traffic class to apply this taildrop to

 * @q_index:	Index of the queue if the DPNI supports multiple queues for

 * @index:	Index of the queue if the DPNI supports multiple queues for

 *		traffic distribution. Ignored if CONGESTION_POINT is not 0.

 * @taildrop:	Taildrop structure

 *
@@ -1602,10 +1602,10 @@ int dpni_set_taildrop(struct fsl_mc_io *mc_io, 
 * @cmd_flags:	Command flags; one or more of 'MC_CMD_FLAG_'

 * @token:	Token of DPNI object

 * @cg_point:	Congestion point

 * @q_type:	Queue type on which the taildrop is configured.

 * @qtype:	Queue type on which the taildrop is configured.

 *		Only Rx queues are supported for now

 * @tc:		Traffic class to apply this taildrop to

 * @q_index:	Index of the queue if the DPNI supports multiple queues for

 * @index:	Index of the queue if the DPNI supports multiple queues for

 *		traffic distribution. Ignored if CONGESTION_POINT is not 0.

 * @taildrop:	Taildrop structure

 *