Commit 79523473 authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

net: dsa: mv88e6xxx: Add mv88e6390 stats snapshot operation 



The MV88E6390 has a control register for what the histogram statistics
actually contain. This means the stat_snapshot method should not set
this information. So implement the 6390 stats_snapshot function without
these bits.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4b325d8c

drivers/net/dsa/mv88e6xxx/chip.c

+7 −0
Original line number Diff line number Diff line
@@ -3283,6 +3283,7 @@ static const struct mv88e6xxx_ops mv88e6190_ops = { 
	.port_set_duplex = mv88e6xxx_port_set_duplex,

	.port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,

	.port_set_speed = mv88e6390_port_set_speed,

	.stats_snapshot = mv88e6390_g1_stats_snapshot,

};



static const struct mv88e6xxx_ops mv88e6190x_ops = {
@@ -3294,6 +3295,7 @@ static const struct mv88e6xxx_ops mv88e6190x_ops = { 
	.port_set_duplex = mv88e6xxx_port_set_duplex,

	.port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,

	.port_set_speed = mv88e6390x_port_set_speed,

	.stats_snapshot = mv88e6390_g1_stats_snapshot,

};



static const struct mv88e6xxx_ops mv88e6191_ops = {
@@ -3305,6 +3307,7 @@ static const struct mv88e6xxx_ops mv88e6191_ops = { 
	.port_set_duplex = mv88e6xxx_port_set_duplex,

	.port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,

	.port_set_speed = mv88e6390_port_set_speed,

	.stats_snapshot = mv88e6390_g1_stats_snapshot,

};



static const struct mv88e6xxx_ops mv88e6240_ops = {
@@ -3330,6 +3333,7 @@ static const struct mv88e6xxx_ops mv88e6290_ops = { 
	.port_set_duplex = mv88e6xxx_port_set_duplex,

	.port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,

	.port_set_speed = mv88e6390_port_set_speed,

	.stats_snapshot = mv88e6390_g1_stats_snapshot,

};



static const struct mv88e6xxx_ops mv88e6320_ops = {
@@ -3405,6 +3409,7 @@ static const struct mv88e6xxx_ops mv88e6390_ops = { 
	.port_set_duplex = mv88e6xxx_port_set_duplex,

	.port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,

	.port_set_speed = mv88e6390_port_set_speed,

	.stats_snapshot = mv88e6390_g1_stats_snapshot,

};



static const struct mv88e6xxx_ops mv88e6390x_ops = {
@@ -3416,6 +3421,7 @@ static const struct mv88e6xxx_ops mv88e6390x_ops = { 
	.port_set_duplex = mv88e6xxx_port_set_duplex,

	.port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,

	.port_set_speed = mv88e6390x_port_set_speed,

	.stats_snapshot = mv88e6390_g1_stats_snapshot,

};



static const struct mv88e6xxx_ops mv88e6391_ops = {
@@ -3427,6 +3433,7 @@ static const struct mv88e6xxx_ops mv88e6391_ops = { 
	.port_set_duplex = mv88e6xxx_port_set_duplex,

	.port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,

	.port_set_speed = mv88e6390_port_set_speed,

	.stats_snapshot = mv88e6390_g1_stats_snapshot,

};



static const struct mv88e6xxx_info mv88e6xxx_table[] = {

drivers/net/dsa/mv88e6xxx/global1.c

+16 −0
Original line number Diff line number Diff line
@@ -59,3 +59,19 @@ int mv88e6320_g1_stats_snapshot(struct mv88e6xxx_chip *chip, int port) 


	return mv88e6xxx_g1_stats_snapshot(chip, port);

}



int mv88e6390_g1_stats_snapshot(struct mv88e6xxx_chip *chip, int port)

{

	int err;



	port = (port + 1) << 5;



	/* Snapshot the hardware statistics counters for this port. */

	err = mv88e6xxx_g1_write(chip, GLOBAL_STATS_OP,

				 GLOBAL_STATS_OP_CAPTURE_PORT | port);

	if (err)

		return err;



	/* Wait for the snapshotting to complete. */

	return mv88e6xxx_g1_stats_wait(chip);

}

drivers/net/dsa/mv88e6xxx/global1.h

+1 −0
Original line number Diff line number Diff line
@@ -21,5 +21,6 @@ int mv88e6xxx_g1_write(struct mv88e6xxx_chip *chip, int reg, u16 val); 
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);



#endif /* _MV88E6XXX_GLOBAL1_H */

drivers/net/dsa/mv88e6xxx/mv88e6xxx.h

+3 −1
Original line number Diff line number Diff line
@@ -283,7 +283,9 @@ 
#define GLOBAL_CONTROL_2	0x1c

#define GLOBAL_CONTROL_2_NO_CASCADE		0xe000

#define GLOBAL_CONTROL_2_MULTIPLE_CASCADE	0xf000



#define GLOBAL_CONTROL_2_HIST_RX	       (0x1 << 6)

#define GLOBAL_CONTROL_2_HIST_TX	       (0x2 << 6)

#define GLOBAL_CONTROL_2_HIST_RX_TX	       (0x3 << 6)

#define GLOBAL_STATS_OP		0x1d

#define GLOBAL_STATS_OP_BUSY	BIT(15)

#define GLOBAL_STATS_OP_NOP		(0 << 12)

CRA Git | Maintained and supported by SUSTech CRA and CCSE