Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de227387 authored Nov 21, 2016 by Andrew Lunn Committed by David S. Miller Nov 22, 2016

net: dsa: mv88e6xxx: Add mv88e6390 statistics unit init



The statistics unit on the mv88e6390 needs the histogram mode to be
configured in a different register compared to other devices. Add an
ops to do this.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
v2:
  Rename to mv88e6390_g1_stats_set_histogram
  Move into global1.c
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 79523473

drivers/net/dsa/mv88e6xxx/chip.c

+20 −0

Original line number	Diff line number	Diff line
		@@ -1009,6 +1009,14 @@ static void mv88e6xxx_get_ethtool_stats(struct dsa_switch *ds, int port,
		mutex_unlock(&chip->reg_lock);
		}

		static int mv88e6xxx_stats_set_histogram(struct mv88e6xxx_chip *chip)
		{
		if (chip->info->ops->stats_set_histogram)
		return chip->info->ops->stats_set_histogram(chip);

		return 0;
		}

		static int mv88e6xxx_get_regs_len(struct dsa_switch *ds, int port)
		{
		return 32 * sizeof(u16);
		@@ -2797,6 +2805,11 @@ static int mv88e6xxx_g1_setup(struct mv88e6xxx_chip *chip)
		if (err)
		return err;

		/* Initialize the statistics unit */
		err = mv88e6xxx_stats_set_histogram(chip);
		if (err)
		return err;

		/* Clear the statistics counters for all ports */
		err = mv88e6xxx_g1_write(chip, GLOBAL_STATS_OP,
		GLOBAL_STATS_OP_FLUSH_ALL);
		@@ -3284,6 +3297,7 @@ static const struct mv88e6xxx_ops mv88e6190_ops = {
		.port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,
		.port_set_speed = mv88e6390_port_set_speed,
		.stats_snapshot = mv88e6390_g1_stats_snapshot,
		.stats_set_histogram = mv88e6390_g1_stats_set_histogram,
		};

		static const struct mv88e6xxx_ops mv88e6190x_ops = {
		@@ -3296,6 +3310,7 @@ static const struct mv88e6xxx_ops mv88e6190x_ops = {
		.port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,
		.port_set_speed = mv88e6390x_port_set_speed,
		.stats_snapshot = mv88e6390_g1_stats_snapshot,
		.stats_set_histogram = mv88e6390_g1_stats_set_histogram,
		};

		static const struct mv88e6xxx_ops mv88e6191_ops = {
		@@ -3308,6 +3323,7 @@ static const struct mv88e6xxx_ops mv88e6191_ops = {
		.port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,
		.port_set_speed = mv88e6390_port_set_speed,
		.stats_snapshot = mv88e6390_g1_stats_snapshot,
		.stats_set_histogram = mv88e6390_g1_stats_set_histogram,
		};

		static const struct mv88e6xxx_ops mv88e6240_ops = {
		@@ -3334,6 +3350,7 @@ static const struct mv88e6xxx_ops mv88e6290_ops = {
		.port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,
		.port_set_speed = mv88e6390_port_set_speed,
		.stats_snapshot = mv88e6390_g1_stats_snapshot,
		.stats_set_histogram = mv88e6390_g1_stats_set_histogram,
		};

		static const struct mv88e6xxx_ops mv88e6320_ops = {
		@@ -3410,6 +3427,7 @@ static const struct mv88e6xxx_ops mv88e6390_ops = {
		.port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,
		.port_set_speed = mv88e6390_port_set_speed,
		.stats_snapshot = mv88e6390_g1_stats_snapshot,
		.stats_set_histogram = mv88e6390_g1_stats_set_histogram,
		};

		static const struct mv88e6xxx_ops mv88e6390x_ops = {
		@@ -3422,6 +3440,7 @@ static const struct mv88e6xxx_ops mv88e6390x_ops = {
		.port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,
		.port_set_speed = mv88e6390x_port_set_speed,
		.stats_snapshot = mv88e6390_g1_stats_snapshot,
		.stats_set_histogram = mv88e6390_g1_stats_set_histogram,
		};

		static const struct mv88e6xxx_ops mv88e6391_ops = {
		@@ -3434,6 +3453,7 @@ static const struct mv88e6xxx_ops mv88e6391_ops = {
		.port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,
		.port_set_speed = mv88e6390_port_set_speed,
		.stats_snapshot = mv88e6390_g1_stats_snapshot,
		.stats_set_histogram = mv88e6390_g1_stats_set_histogram,
		};

		static const struct mv88e6xxx_info mv88e6xxx_table[] = {

drivers/net/dsa/mv88e6xxx/global1.c

+20 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,26 @@ int mv88e6xxx_g1_wait(struct mv88e6xxx_chip *chip, int reg, u16 mask)
		return mv88e6xxx_wait(chip, chip->info->global1_addr, reg, mask);
		}

		/* Offset 0x1c: Global Control 2 */

		int mv88e6390_g1_stats_set_histogram(struct mv88e6xxx_chip *chip)
		{
		u16 val;
		int err;

		err = mv88e6xxx_g1_read(chip, GLOBAL_CONTROL_2, &val);
		if (err)
		return err;

		val \|= GLOBAL_CONTROL_2_HIST_RX_TX;

		err = mv88e6xxx_g1_write(chip, GLOBAL_CONTROL_2, val);

		return err;
		}

		/* Offset 0x1d: Statistics Operation 2 */

		static int mv88e6xxx_g1_stats_wait(struct mv88e6xxx_chip *chip)
		{
		return mv88e6xxx_g1_wait(chip, GLOBAL_STATS_OP, GLOBAL_STATS_OP_BUSY);

drivers/net/dsa/mv88e6xxx/global1.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -22,5 +22,6 @@ int mv88e6xxx_g1_wait(struct mv88e6xxx_chip *chip, int reg, u16 mask);
		int mv88e6xxx_g1_stats_snapshot(struct mv88e6xxx_chip *chip, int port);
		int mv88e6320_g1_stats_snapshot(struct mv88e6xxx_chip *chip, int port);
		int mv88e6390_g1_stats_snapshot(struct mv88e6xxx_chip *chip, int port);
		int mv88e6390_g1_stats_set_histogram(struct mv88e6xxx_chip *chip);

		#endif /* _MV88E6XXX_GLOBAL1_H */

drivers/net/dsa/mv88e6xxx/mv88e6xxx.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -801,6 +801,11 @@ struct mv88e6xxx_ops {
		* be read back a leisure but still with a consistent view.
		*/
		int (stats_snapshot)(struct mv88e6xxx_chip chip, int port);

		/* Set the histogram mode for statistics, when the control registers
		* are separated out of the STATS_OP register.
		*/
		int (stats_set_histogram)(struct mv88e6xxx_chip chip);
		};

		enum stat_type {