net: dsa: mv88e6xxx: Limit histogram counters to ingress traffic

Chips in this family only have one set of histogram counters, which
can be used to count ingressing and/or egressing traffic. mv88e6xxx
has, up until this point, kept the hardware default of counting both
directions.

In the mean time, standard counter group support has been added to
ethtool. Via that interface, drivers may report ingress-only and
egress-only histograms separately - but not combined.

In order for mv88e6xxx to maximize amount of diagnostic information
that can be exported via standard interfaces, we opt to limit the
histogram counters to ingress traffic only. Which will allow us to
export them via the standard "rmon" group in an upcoming commit.

The reason for choosing ingress-only over egress-only, is to be
compatible with RFC2819 (RMON MIB).

Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 627ed0d..9e36536 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -1221,7 +1221,7 @@ static size_t mv88e6095_stats_get_stat(struct mv88e6xxx_chip *chip, int port,
                return 0;
 
        *data = _mv88e6xxx_get_ethtool_stat(chip, stat, port, 0,
-                                           MV88E6XXX_G1_STATS_OP_HIST_RX_TX);
+                                           MV88E6XXX_G1_STATS_OP_HIST_RX);
        return 1;
 }
 
@@ -1233,7 +1233,7 @@ static size_t mv88e6250_stats_get_stat(struct mv88e6xxx_chip *chip, int port,
                return 0;
 
        *data = _mv88e6xxx_get_ethtool_stat(chip, stat, port, 0,
-                                           MV88E6XXX_G1_STATS_OP_HIST_RX_TX);
+                                           MV88E6XXX_G1_STATS_OP_HIST_RX);
        return 1;
 }
 
@@ -1246,7 +1246,7 @@ static size_t mv88e6320_stats_get_stat(struct mv88e6xxx_chip *chip, int port,
 
        *data = _mv88e6xxx_get_ethtool_stat(chip, stat, port,
                                            MV88E6XXX_G1_STATS_OP_BANK_1_BIT_9,
-                                           MV88E6XXX_G1_STATS_OP_HIST_RX_TX);
+                                           MV88E6XXX_G1_STATS_OP_HIST_RX);
        return 1;
 }
 

diff --git a/drivers/net/dsa/mv88e6xxx/global1.c b/drivers/net/dsa/mv88e6xxx/global1.c
index 174c773..49444a7 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/global1.c
+++ b/drivers/net/dsa/mv88e6xxx/global1.c
@@ -462,8 +462,7 @@ int mv88e6390_g1_rmu_disable(struct mv88e6xxx_chip *chip)
 int mv88e6390_g1_stats_set_histogram(struct mv88e6xxx_chip *chip)
 {
        return mv88e6xxx_g1_ctl2_mask(chip, MV88E6390_G1_CTL2_HIST_MODE_MASK,
-                                     MV88E6390_G1_CTL2_HIST_MODE_RX |
-                                     MV88E6390_G1_CTL2_HIST_MODE_TX);
+                                     MV88E6390_G1_CTL2_HIST_MODE_RX);
 }
 
 int mv88e6xxx_g1_set_device_number(struct mv88e6xxx_chip *chip, int index)
@@ -491,7 +490,7 @@ int mv88e6095_g1_stats_set_histogram(struct mv88e6xxx_chip *chip)
        if (err)
                return err;
 
-       val |= MV88E6XXX_G1_STATS_OP_HIST_RX_TX;
+       val |= MV88E6XXX_G1_STATS_OP_HIST_RX;
 
        err = mv88e6xxx_g1_write(chip, MV88E6XXX_G1_STATS_OP, val);
 
@@ -506,7 +505,7 @@ int mv88e6xxx_g1_stats_snapshot(struct mv88e6xxx_chip *chip, int port)
        err = mv88e6xxx_g1_write(chip, MV88E6XXX_G1_STATS_OP,
                                 MV88E6XXX_G1_STATS_OP_BUSY |
                                 MV88E6XXX_G1_STATS_OP_CAPTURE_PORT |
-                                MV88E6XXX_G1_STATS_OP_HIST_RX_TX | port);
+                                MV88E6XXX_G1_STATS_OP_HIST_RX | port);
        if (err)
                return err;