]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: mvneta: fix bit assignment for RX packet irq enable
authorMarcin Wojtas <mw@semihalf.com>
Mon, 30 Nov 2015 12:27:43 +0000 (13:27 +0100)
committerLuis Henriques <luis.henriques@canonical.com>
Tue, 5 Jan 2016 12:08:24 +0000 (12:08 +0000)
commit dc1aadf6f1e7609590fadf7a0252413732289b2e upstream.

A value originally defined in the driver was inappropriate. Even though
the ingress was somehow working, writing MVNETA_RXQ_INTR_ENABLE_ALL_MASK
to MVNETA_INTR_ENABLE didn't make any effect, because the bits [31:16]
are reserved and read-only.

This commit updates MVNETA_RXQ_INTR_ENABLE_ALL_MASK to be compliant with
the controller's documentation.

Signed-off-by: Marcin Wojtas <mw@semihalf.com>
Fixes: c5aff18204da ("net: mvneta: driver for Marvell Armada 370/XP network
unit")
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
drivers/net/ethernet/marvell/mvneta.c

index 798f9c78a83f98aa8385ea41caac0ea2ff59ffbe..0830d23f01ae79835e5c112892f17eb175e95ebe 100644 (file)
 
 #define MVNETA_INTR_ENABLE                       0x25b8
 #define      MVNETA_TXQ_INTR_ENABLE_ALL_MASK     0x0000ff00
-#define      MVNETA_RXQ_INTR_ENABLE_ALL_MASK     0xff000000  // note: neta says it's 0x000000FF
+#define      MVNETA_RXQ_INTR_ENABLE_ALL_MASK     0x000000ff
 
 #define MVNETA_RXQ_CMD                           0x2680
 #define      MVNETA_RXQ_DISABLE_SHIFT            8