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

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

net: dsa: mv88e6xxx: Implement mv88e6390 pause control 



The mv88e6390 has a number flow control registers accessed via the
Flow Control register. Use these to set the pause control.

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

drivers/net/dsa/mv88e6xxx/chip.c

+7 −0
Original line number Diff line number Diff line
@@ -3490,6 +3490,7 @@ static const struct mv88e6xxx_ops mv88e6190_ops = { 
	.port_set_frame_mode = mv88e6351_port_set_frame_mode,

	.port_set_egress_unknowns = mv88e6351_port_set_egress_unknowns,

	.port_set_ether_type = mv88e6351_port_set_ether_type,

	.port_pause_config = mv88e6390_port_pause_config,

	.stats_snapshot = mv88e6390_g1_stats_snapshot,

	.stats_set_histogram = mv88e6390_g1_stats_set_histogram,

	.stats_get_sset_count = mv88e6320_stats_get_sset_count,
@@ -3513,6 +3514,7 @@ static const struct mv88e6xxx_ops mv88e6190x_ops = { 
	.port_set_frame_mode = mv88e6351_port_set_frame_mode,

	.port_set_egress_unknowns = mv88e6351_port_set_egress_unknowns,

	.port_set_ether_type = mv88e6351_port_set_ether_type,

	.port_pause_config = mv88e6390_port_pause_config,

	.stats_snapshot = mv88e6390_g1_stats_snapshot,

	.stats_set_histogram = mv88e6390_g1_stats_set_histogram,

	.stats_get_sset_count = mv88e6320_stats_get_sset_count,
@@ -3536,6 +3538,7 @@ static const struct mv88e6xxx_ops mv88e6191_ops = { 
	.port_set_frame_mode = mv88e6351_port_set_frame_mode,

	.port_set_egress_unknowns = mv88e6351_port_set_egress_unknowns,

	.port_set_ether_type = mv88e6351_port_set_ether_type,

	.port_pause_config = mv88e6390_port_pause_config,

	.stats_snapshot = mv88e6390_g1_stats_snapshot,

	.stats_set_histogram = mv88e6390_g1_stats_set_histogram,

	.stats_get_sset_count = mv88e6320_stats_get_sset_count,
@@ -3586,6 +3589,7 @@ static const struct mv88e6xxx_ops mv88e6290_ops = { 
	.port_set_frame_mode = mv88e6351_port_set_frame_mode,

	.port_set_egress_unknowns = mv88e6351_port_set_egress_unknowns,

	.port_set_ether_type = mv88e6351_port_set_ether_type,

	.port_pause_config = mv88e6390_port_pause_config,

	.stats_snapshot = mv88e6390_g1_stats_snapshot,

	.stats_set_histogram = mv88e6390_g1_stats_set_histogram,

	.stats_get_sset_count = mv88e6320_stats_get_sset_count,
@@ -3739,6 +3743,7 @@ static const struct mv88e6xxx_ops mv88e6390_ops = { 
	.port_set_ether_type = mv88e6351_port_set_ether_type,

	.port_jumbo_config = mv88e6165_port_jumbo_config,

	.port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting,

	.port_pause_config = mv88e6390_port_pause_config,

	.stats_snapshot = mv88e6390_g1_stats_snapshot,

	.stats_set_histogram = mv88e6390_g1_stats_set_histogram,

	.stats_get_sset_count = mv88e6320_stats_get_sset_count,
@@ -3764,6 +3769,7 @@ static const struct mv88e6xxx_ops mv88e6390x_ops = { 
	.port_set_ether_type = mv88e6351_port_set_ether_type,

	.port_jumbo_config = mv88e6165_port_jumbo_config,

	.port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting,

	.port_pause_config = mv88e6390_port_pause_config,

	.stats_snapshot = mv88e6390_g1_stats_snapshot,

	.stats_set_histogram = mv88e6390_g1_stats_set_histogram,

	.stats_get_sset_count = mv88e6320_stats_get_sset_count,
@@ -3787,6 +3793,7 @@ static const struct mv88e6xxx_ops mv88e6391_ops = { 
	.port_set_frame_mode = mv88e6351_port_set_frame_mode,

	.port_set_egress_unknowns = mv88e6351_port_set_egress_unknowns,

	.port_set_ether_type = mv88e6351_port_set_ether_type,

	.port_pause_config = mv88e6390_port_pause_config,

	.stats_snapshot = mv88e6390_g1_stats_snapshot,

	.stats_set_histogram = mv88e6390_g1_stats_set_histogram,

	.stats_get_sset_count = mv88e6320_stats_get_sset_count,

drivers/net/dsa/mv88e6xxx/mv88e6xxx.h

+2 −0
Original line number Diff line number Diff line
@@ -78,6 +78,8 @@ 
#define PORT_PCS_CTRL_SPEED_10000	(0x03) /* 6390X */

#define PORT_PCS_CTRL_SPEED_UNFORCED	(0x03)

#define PORT_PAUSE_CTRL		0x02

#define PORT_FLOW_CTRL_LIMIT_IN		((0x00 << 8) | BIT(15))

#define PORT_FLOW_CTRL_LIMIT_OUT	((0x01 << 8) | BIT(15))

#define PORT_SWITCH_ID		0x03

#define PORT_SWITCH_ID_PROD_NUM_6085	0x04a

#define PORT_SWITCH_ID_PROD_NUM_6095	0x095

drivers/net/dsa/mv88e6xxx/port.c

+13 −0
Original line number Diff line number Diff line
@@ -315,6 +315,19 @@ int mv88e6097_port_pause_config(struct mv88e6xxx_chip *chip, int port) 
	return mv88e6xxx_port_write(chip, port, PORT_PAUSE_CTRL, 0x0000);

}



int mv88e6390_port_pause_config(struct mv88e6xxx_chip *chip, int port)

{

	int err;



	err = mv88e6xxx_port_write(chip, port, PORT_PAUSE_CTRL,

				   PORT_FLOW_CTRL_LIMIT_IN | 0);

	if (err)

		return err;



	return mv88e6xxx_port_write(chip, port, PORT_PAUSE_CTRL,

				    PORT_FLOW_CTRL_LIMIT_OUT | 0);

}



/* Offset 0x04: Port Control Register */



static const char * const mv88e6xxx_port_state_names[] = {

drivers/net/dsa/mv88e6xxx/port.h

+1 −0
Original line number Diff line number Diff line
@@ -66,5 +66,6 @@ int mv88e6165_port_jumbo_config(struct mv88e6xxx_chip *chip, int port); 
int mv88e6095_port_egress_rate_limiting(struct mv88e6xxx_chip *chip, int port);

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

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

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



#endif /* _MV88E6XXX_PORT_H */