Commit b84d66b0 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mv88e6xxx-counters' 



Tobias Waldekranz says:

====================
net: dsa: mv88e6xxx: Add "eth-mac" and "rmon" counter group support

The majority of the changes (2/8) are about refactoring the existing
ethtool statistics support to make it possible to read individual
counters, rather than the whole set.

4/8 tries to collect all information about a stat in a single place
using a mapper macro, which is then used to generate the original list
of stats, along with a matching enum. checkpatch is less than amused
with this construct, but prior art exists (__BPF_FUNC_MAPPER in
include/uapi/linux/bpf.h, for example).

To support the histogram counters from the "rmon" group, we have to
change mv88e6xxx's configuration of them. Instead of counting rx and
tx, we restrict them to rx-only. 6/8 has the details.

With that in place, adding the actual counter groups is pretty
straight forward (5,7/8).

Tie it all together with a selftest (8/8).

v3 -> v4:
- Return size_t from mv88e6xxx_stats_get_stats
- Spelling errors in commit message of 6/8
- Improve selftest:
  - Report progress per-bucket
  - Test both ports in the pair
  - Increase MTU, if required

v2 -> v3:
- Added 6/8
- Added 8/8

v1 -> v2:
- Added 1/6
- Added 3/6
- Changed prototype of stats operation to reflect the fact that the
  number of read stats are returned, no errors
- Moved comma into MV88E6XXX_HW_STAT_MAPPER definition
- Avoid the construction of mapping table iteration which relied on
  struct layouts outside of mv88e6xxx's control
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9ed816b1 00e7f29d

drivers/net/dsa/mv88e6xxx/chip.c

+254 −138

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/dsa/mv88e6xxx/chip.h

+16 −15
Original line number Diff line number Diff line
@@ -318,6 +318,17 @@ struct mv88e6xxx_mst { 
	struct mv88e6xxx_stu_entry stu;

};



#define STATS_TYPE_PORT		BIT(0)

#define STATS_TYPE_BANK0	BIT(1)

#define STATS_TYPE_BANK1	BIT(2)



struct mv88e6xxx_hw_stat {

	char string[ETH_GSTRING_LEN];

	size_t size;

	int reg;

	int type;

};



struct mv88e6xxx_chip {

	const struct mv88e6xxx_info *info;
@@ -574,7 +585,8 @@ struct mv88e6xxx_ops { 
	/* Return the number of strings describing statistics */

	int (*stats_get_sset_count)(struct mv88e6xxx_chip *chip);

	int (*stats_get_strings)(struct mv88e6xxx_chip *chip,  uint8_t *data);

	int (*stats_get_stats)(struct mv88e6xxx_chip *chip,  int port,

	size_t (*stats_get_stat)(struct mv88e6xxx_chip *chip, int port,

				 const struct mv88e6xxx_hw_stat *stat,

				 uint64_t *data);

	int (*set_cpu_port)(struct mv88e6xxx_chip *chip, int port);

	int (*set_egress_port)(struct mv88e6xxx_chip *chip,
@@ -601,7 +613,7 @@ struct mv88e6xxx_ops { 
	int (*serdes_get_sset_count)(struct mv88e6xxx_chip *chip, int port);

	int (*serdes_get_strings)(struct mv88e6xxx_chip *chip,  int port,

				  uint8_t *data);

	int (*serdes_get_stats)(struct mv88e6xxx_chip *chip,  int port,

	size_t (*serdes_get_stats)(struct mv88e6xxx_chip *chip, int port,

				   uint64_t *data);



	/* SERDES registers for ethtool */
@@ -727,17 +739,6 @@ struct mv88e6xxx_pcs_ops { 


};



#define STATS_TYPE_PORT		BIT(0)

#define STATS_TYPE_BANK0	BIT(1)

#define STATS_TYPE_BANK1	BIT(2)



struct mv88e6xxx_hw_stat {

	char string[ETH_GSTRING_LEN];

	size_t size;

	int reg;

	int type;

};



static inline bool mv88e6xxx_has_stu(struct mv88e6xxx_chip *chip)

{

	return chip->info->max_sid > 0 &&

drivers/net/dsa/mv88e6xxx/global1.c

+3 −4
Original line number Diff line number Diff line
@@ -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;

drivers/net/dsa/mv88e6xxx/serdes.c

+5 −5
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static uint64_t mv88e6352_serdes_get_stat(struct mv88e6xxx_chip *chip, 
	return val;

}



int mv88e6352_serdes_get_stats(struct mv88e6xxx_chip *chip, int port,

size_t mv88e6352_serdes_get_stats(struct mv88e6xxx_chip *chip, int port,

				  uint64_t *data)

{

	struct mv88e6xxx_port *mv88e6xxx_port = &chip->ports[port];
@@ -187,7 +187,7 @@ int mv88e6352_serdes_get_stats(struct mv88e6xxx_chip *chip, int port, 


	err = mv88e6352_g2_scratch_port_has_serdes(chip, port);

	if (err <= 0)

		return err;

		return 0;



	BUILD_BUG_ON(ARRAY_SIZE(mv88e6352_serdes_hw_stats) >

		     ARRAY_SIZE(mv88e6xxx_port->serdes_stats));
@@ -429,7 +429,7 @@ static uint64_t mv88e6390_serdes_get_stat(struct mv88e6xxx_chip *chip, int lane, 
	return reg[0] | ((u64)reg[1] << 16) | ((u64)reg[2] << 32);

}



int mv88e6390_serdes_get_stats(struct mv88e6xxx_chip *chip, int port,

size_t mv88e6390_serdes_get_stats(struct mv88e6xxx_chip *chip, int port,

				  uint64_t *data)

{

	struct mv88e6390_serdes_hw_stat *stat;

drivers/net/dsa/mv88e6xxx/serdes.h

+4 −4
Original line number Diff line number Diff line
@@ -127,12 +127,12 @@ unsigned int mv88e6390_serdes_irq_mapping(struct mv88e6xxx_chip *chip, 
int mv88e6352_serdes_get_sset_count(struct mv88e6xxx_chip *chip, int port);

int mv88e6352_serdes_get_strings(struct mv88e6xxx_chip *chip,

				 int port, uint8_t *data);

int mv88e6352_serdes_get_stats(struct mv88e6xxx_chip *chip, int port,

size_t mv88e6352_serdes_get_stats(struct mv88e6xxx_chip *chip, int port,

				  uint64_t *data);

int mv88e6390_serdes_get_sset_count(struct mv88e6xxx_chip *chip, int port);

int mv88e6390_serdes_get_strings(struct mv88e6xxx_chip *chip,

				 int port, uint8_t *data);

int mv88e6390_serdes_get_stats(struct mv88e6xxx_chip *chip, int port,

size_t mv88e6390_serdes_get_stats(struct mv88e6xxx_chip *chip, int port,

				  uint64_t *data);



int mv88e6352_serdes_get_regs_len(struct mv88e6xxx_chip *chip, int port);