net: mvpp2: fix RSS register definitions

There is no RSS_TABLE register in PPv2 Controller. The register 0x1510
which was specified is actually named "RSS_HASH_SEL", but isn't used by
this driver at all.

Based on how this register was used, it should have been the
RXQ2RSS_TABLE register, which allows to select the RSS table that will
be used for the incoming packet.

The RSS_TABLE_POINTER is actually a field of this RXQ2RSS_TABLE
register.

Since RSS tables are actually not used by the driver for now, this
commit does not fix a runtime bug.

Signed-off-by: Maxime Chevallier <maxime.chevallier@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 dee5231b00730201e48828c491d2ff1b806c2502..e6b182d8be5b8ed33cc8cda01be74ef293a71461 100644 (file)
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
@@ -73,9 +73,9 @@
 #define     MVPP22_RSS_INDEX_TABLE_ENTRY(idx)  (idx)
 #define     MVPP22_RSS_INDEX_TABLE(idx)                ((idx) << 8)
 #define     MVPP22_RSS_INDEX_QUEUE(idx)                ((idx) << 16)
-#define MVPP22_RSS_TABLE_ENTRY                 0x1508
-#define MVPP22_RSS_TABLE                       0x1510
+#define MVPP22_RXQ2RSS_TABLE                   0x1504
 #define     MVPP22_RSS_TABLE_POINTER(p)                (p)
+#define MVPP22_RSS_TABLE_ENTRY                 0x1508
 #define MVPP22_RSS_WIDTH                       0x150c
 
 /* Classifier Registers */

diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c
index 4d187f30725ca3bacaa52bcaa94611f634ec07b1..fe4bcaf983b25faf0bd6f7d4b6827606498723b9 100644 (file)
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c
@@ -123,7 +123,7 @@ void mvpp22_init_rss(struct mvpp2_port *port)
         */
        for (i = 0; i < MVPP2_CLS_RX_QUEUES; i++) {
                mvpp2_write(priv, MVPP22_RSS_INDEX, MVPP22_RSS_INDEX_QUEUE(i));
-               mvpp2_write(priv, MVPP22_RSS_TABLE,
+               mvpp2_write(priv, MVPP22_RXQ2RSS_TABLE,
                            MVPP22_RSS_TABLE_POINTER(0));
        }