Commit 19024b5d authored by Antoine Tenart's avatar Antoine Tenart Committed by Greg Kroah-Hartman

net: mvpp2: fix bad MVPP2_TXQ_SCHED_TOKEN_CNTR_REG queue value

[ Upstream commit 21808437 ]

MVPP2_TXQ_SCHED_TOKEN_CNTR_REG() expects the logical queue id but
the current code is passing the global tx queue offset, so it ends
up writing to unknown registers (between 0x8280 and 0x82fc, which
seemed to be unused by the hardware). This fixes the issue by using
the logical queue id instead.

Fixes: 3f518509 ("ethernet: Add new driver for Marvell Armada 375 network unit")
Signed-off-by: default avatarAntoine Tenart <antoine.tenart@bootlin.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 67a3fa2f
...@@ -1455,7 +1455,7 @@ static inline void mvpp2_xlg_max_rx_size_set(struct mvpp2_port *port) ...@@ -1455,7 +1455,7 @@ static inline void mvpp2_xlg_max_rx_size_set(struct mvpp2_port *port)
/* Set defaults to the MVPP2 port */ /* Set defaults to the MVPP2 port */
static void mvpp2_defaults_set(struct mvpp2_port *port) static void mvpp2_defaults_set(struct mvpp2_port *port)
{ {
int tx_port_num, val, queue, ptxq, lrxq; int tx_port_num, val, queue, lrxq;
if (port->priv->hw_version == MVPP21) { if (port->priv->hw_version == MVPP21) {
/* Update TX FIFO MIN Threshold */ /* Update TX FIFO MIN Threshold */
...@@ -1476,11 +1476,9 @@ static void mvpp2_defaults_set(struct mvpp2_port *port) ...@@ -1476,11 +1476,9 @@ static void mvpp2_defaults_set(struct mvpp2_port *port)
mvpp2_write(port->priv, MVPP2_TXP_SCHED_FIXED_PRIO_REG, 0); mvpp2_write(port->priv, MVPP2_TXP_SCHED_FIXED_PRIO_REG, 0);
/* Close bandwidth for all queues */ /* Close bandwidth for all queues */
for (queue = 0; queue < MVPP2_MAX_TXQ; queue++) { for (queue = 0; queue < MVPP2_MAX_TXQ; queue++)
ptxq = mvpp2_txq_phys(port->id, queue);
mvpp2_write(port->priv, mvpp2_write(port->priv,
MVPP2_TXQ_SCHED_TOKEN_CNTR_REG(ptxq), 0); MVPP2_TXQ_SCHED_TOKEN_CNTR_REG(queue), 0);
}
/* Set refill period to 1 usec, refill tokens /* Set refill period to 1 usec, refill tokens
* and bucket size to maximum * and bucket size to maximum
...@@ -2336,7 +2334,7 @@ static void mvpp2_txq_deinit(struct mvpp2_port *port, ...@@ -2336,7 +2334,7 @@ static void mvpp2_txq_deinit(struct mvpp2_port *port,
txq->descs_dma = 0; txq->descs_dma = 0;
/* Set minimum bandwidth for disabled TXQs */ /* Set minimum bandwidth for disabled TXQs */
mvpp2_write(port->priv, MVPP2_TXQ_SCHED_TOKEN_CNTR_REG(txq->id), 0); mvpp2_write(port->priv, MVPP2_TXQ_SCHED_TOKEN_CNTR_REG(txq->log_id), 0);
/* Set Tx descriptors queue starting address and size */ /* Set Tx descriptors queue starting address and size */
thread = mvpp2_cpu_to_thread(port->priv, get_cpu()); thread = mvpp2_cpu_to_thread(port->priv, get_cpu());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment