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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c
index dfeee9636c7a0153453a615634e67b7b7f12b398..679811db51a1333ae58182128159288ec684a7c6 100644 (file)
--- a/drivers/net/ethernet/marvell/mvpp2.c
+++ b/drivers/net/ethernet/marvell/mvpp2.c
@@ -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 */