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

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

net: mvpp2: handle too large value handling in mvpp2_rx_pkts_coal_set() 



Currently, mvpp2_rx_pkts_coal_set() does the following to avoid setting
a too large value for the RX coalescing by packet number:

  val = (pkts & MVPP2_OCCUPIED_THRESH_MASK);

This means that if you set a value that is slightly higher the the
maximum number of packets, you in fact get a very low value. It makes a
lot more sense to simply check if the value is too high, and if it's too
high, limit it to the maximum possible value.

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 d63f9e41

drivers/net/ethernet/marvell/mvpp2.c

+4 −3
Original line number Diff line number Diff line
@@ -4381,11 +4381,12 @@ static void mvpp2_txp_max_tx_size_set(struct mvpp2_port *port) 
static void mvpp2_rx_pkts_coal_set(struct mvpp2_port *port,

				   struct mvpp2_rx_queue *rxq)

{

	u32 val;

	if (rxq->pkts_coal > MVPP2_OCCUPIED_THRESH_MASK)

		rxq->pkts_coal = 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_THRESH_REG, val);

	mvpp2_write(port->priv, MVPP2_RXQ_THRESH_REG,

		    rxq->pkts_coal);

}



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