net: mvpp2: fix the computation of the RXQs

The patch fixes the computation of RXQs being used by the PPv2 driver,
which is set depending on the PPv2 engine version and the queue mode
used. There are three cases:

- PPv2.1: 1 RXQ per CPU.
- PPV2.2 with MVPP2_QDIST_MULTI_MODE: 1 RXQ per CPU.
- PPv2.2 with MVPP2_QDIST_SINGLE_MODE: 1 RXQ is shared between the CPUs.

The PPv2 engine supports a maximum of 32 queues per port. This patch
adds a check so that we do not overstep this maximum.

It appeared the calculation was broken for PPv2.1 engines since
f8c6ba8424b0, as PPv2.1 ports ended up with a single RXQ while they
needed 4. This patch fixes it.

Fixes: f8c6ba8424b0 ("net: mvpp2: use only one rx queue per port per CPU")
Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
index 17ff330cce5f19236b929c5ab219a94573fe295c..687e011de5ef6169486959172457ba5536d74a99 100644 (file)
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
@@ -549,8 +549,8 @@
 #define MVPP2_MAX_TSO_SEGS             300
 #define MVPP2_MAX_SKB_DESCS            (MVPP2_MAX_TSO_SEGS * 2 + MAX_SKB_FRAGS)
 
-/* Default number of RXQs in use */
-#define MVPP2_DEFAULT_RXQ              1
+/* Max number of RXQs per port */
+#define MVPP2_PORT_MAX_RXQ             32
 
 /* Max number of Rx descriptors */
 #define MVPP2_MAX_RXD_MAX              1024

diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
index e7d768381f4fe674baf8ba77a4f5947f9a1a629b..2a6faddeb95f04a21bd0bbccd57ec68dc23b0b32 100644 (file)
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -4061,8 +4061,8 @@ static int mvpp2_multi_queue_vectors_init(struct mvpp2_port *port,
                        snprintf(irqname, sizeof(irqname), "hif%d", i);
 
                if (queue_mode == MVPP2_QDIST_MULTI_MODE) {
-                       v->first_rxq = i * MVPP2_DEFAULT_RXQ;
-                       v->nrxqs = MVPP2_DEFAULT_RXQ;
+                       v->first_rxq = i;
+                       v->nrxqs = 1;
                } else if (queue_mode == MVPP2_QDIST_SINGLE_MODE &&
                           i == (port->nqvecs - 1)) {
                        v->first_rxq = 0;
@@ -4155,8 +4155,7 @@ static int mvpp2_port_init(struct mvpp2_port *port)
            MVPP2_MAX_PORTS * priv->max_port_rxqs)
                return -EINVAL;
 
-       if (port->nrxqs % MVPP2_DEFAULT_RXQ ||
-           port->nrxqs > priv->max_port_rxqs || port->ntxqs > MVPP2_MAX_TXQ)
+       if (port->nrxqs > priv->max_port_rxqs || port->ntxqs > MVPP2_MAX_TXQ)
                return -EINVAL;
 
        /* Disable port */
@@ -4777,10 +4776,18 @@ static int mvpp2_port_probe(struct platform_device *pdev,
        }
 
        ntxqs = MVPP2_MAX_TXQ;
-       if (priv->hw_version == MVPP22 && queue_mode == MVPP2_QDIST_MULTI_MODE)
-               nrxqs = MVPP2_DEFAULT_RXQ * num_possible_cpus();
-       else
-               nrxqs = MVPP2_DEFAULT_RXQ;
+       if (priv->hw_version == MVPP22 && queue_mode == MVPP2_QDIST_SINGLE_MODE) {
+               nrxqs = 1;
+       } else {
+               /* According to the PPv2.2 datasheet and our experiments on
+                * PPv2.1, RX queues have an allocation granularity of 4 (when
+                * more than a single one on PPv2.2).
+                * Round up to nearest multiple of 4.
+                */
+               nrxqs = (num_possible_cpus() + 3) & ~0x3;
+               if (nrxqs > MVPP2_PORT_MAX_RXQ)
+                       nrxqs = MVPP2_PORT_MAX_RXQ;
+       }
 
        dev = alloc_etherdev_mqs(sizeof(*port), ntxqs, nrxqs);
        if (!dev)