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

Commit d63f9e41 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by David S. Miller
Browse files

net: mvpp2: remove useless arguments in mvpp2_rx_{pkts, time}_coal_set 



As noticed by Russell King, the last argument of
mvpp2_rx_{pkts,time}_coal_set() is useless, since the packet/time
coalescing value is already stored in the 'struct mvpp2_rx_queue *'
passed as argument to these functions. So passing the packet/time value
as an additional argument, and setting them again in the mvpp2_rx_queue
structure is useles.

This commit therefore gets rid of this additional argument, assuming the
caller has assigned the appropriate value to rxq->pkts_coal or
rxq->time_coal before calling the respective functions.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 239a3b66

drivers/net/ethernet/marvell/mvpp2.c

+8 −12
Original line number Original line Diff line number Diff line
@@ -4379,27 +4379,23 @@ static void mvpp2_txp_max_tx_size_set(struct mvpp2_port *port) 
 * will be generated by HW.

 * will be generated by HW.

 */

 */

static void mvpp2_rx_pkts_coal_set(struct mvpp2_port *port,

static void mvpp2_rx_pkts_coal_set(struct mvpp2_port *port,

				   struct mvpp2_rx_queue *rxq, u32 pkts)

				   struct mvpp2_rx_queue *rxq)

{

{

	u32 val;

	u32 val;





	val = (pkts & MVPP2_OCCUPIED_THRESH_MASK);

	val = (rxq->pkts_coal & MVPP2_OCCUPIED_THRESH_MASK);

	mvpp2_write(port->priv, MVPP2_RXQ_NUM_REG, rxq->id);

	mvpp2_write(port->priv, MVPP2_RXQ_NUM_REG, rxq->id);

	mvpp2_write(port->priv, MVPP2_RXQ_THRESH_REG, val);

	mvpp2_write(port->priv, MVPP2_RXQ_THRESH_REG, val);



	rxq->pkts_coal = pkts;

}

}





/* Set the time delay in usec before Rx interrupt */

/* Set the time delay in usec before Rx interrupt */

static void mvpp2_rx_time_coal_set(struct mvpp2_port *port,

static void mvpp2_rx_time_coal_set(struct mvpp2_port *port,

				   struct mvpp2_rx_queue *rxq, u32 usec)

				   struct mvpp2_rx_queue *rxq)

{

{

	u32 val;

	u32 val;





	val = (port->priv->tclk / USEC_PER_SEC) * usec;

	val = (port->priv->tclk / USEC_PER_SEC) * rxq->time_coal;

	mvpp2_write(port->priv, MVPP2_ISR_RX_THRESHOLD_REG(rxq->id), val);

	mvpp2_write(port->priv, MVPP2_ISR_RX_THRESHOLD_REG(rxq->id), val);



	rxq->time_coal = usec;

}

}





/* Free Tx queue skbuffs */

/* Free Tx queue skbuffs */
@@ -4543,8 +4539,8 @@ static int mvpp2_rxq_init(struct mvpp2_port *port, 
	mvpp2_rxq_offset_set(port, rxq->id, NET_SKB_PAD);

	mvpp2_rxq_offset_set(port, rxq->id, NET_SKB_PAD);





	/* Set coalescing pkts and time */

	/* Set coalescing pkts and time */

	mvpp2_rx_pkts_coal_set(port, rxq, rxq->pkts_coal);

	mvpp2_rx_pkts_coal_set(port, rxq);

	mvpp2_rx_time_coal_set(port, rxq, rxq->time_coal);

	mvpp2_rx_time_coal_set(port, rxq);





	/* Add number of descriptors ready for receiving packets */

	/* Add number of descriptors ready for receiving packets */

	mvpp2_rxq_status_update(port, rxq->id, 0, rxq->size);

	mvpp2_rxq_status_update(port, rxq->id, 0, rxq->size);
@@ -5801,8 +5797,8 @@ static int mvpp2_ethtool_set_coalesce(struct net_device *dev, 




		rxq->time_coal = c->rx_coalesce_usecs;

		rxq->time_coal = c->rx_coalesce_usecs;

		rxq->pkts_coal = c->rx_max_coalesced_frames;

		rxq->pkts_coal = c->rx_max_coalesced_frames;

		mvpp2_rx_pkts_coal_set(port, rxq, rxq->pkts_coal);

		mvpp2_rx_pkts_coal_set(port, rxq);

		mvpp2_rx_time_coal_set(port, rxq, rxq->time_coal);

		mvpp2_rx_time_coal_set(port, rxq);

	}

	}





	for (queue = 0; queue < txq_number; queue++) {

	for (queue = 0; queue < txq_number; queue++) {