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

Commit b35d322a authored Dec 03, 2016 by Andrew Lunn Committed by David S. Miller Dec 03, 2016

net: dsa: mv88e6xxx: Refactor pause configuration



The mv88e6390 has a different mechanism for configuring pause.
Refactor the code into an ops function, and for the moment, don't add
any mv88e6390 code yet.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent ef70b111

drivers/net/dsa/mv88e6xxx/chip.c

+20 −8

Original line number	Diff line number	Diff line
		@@ -2625,17 +2625,15 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port)
		if (err)
		return err;

		if (mv88e6xxx_6352_family(chip) \|\| mv88e6xxx_6351_family(chip) \|\|
		mv88e6xxx_6165_family(chip) \|\| mv88e6xxx_6097_family(chip) \|\|
		mv88e6xxx_6320_family(chip)) {
		/* Do not limit the period of time that this port can
		* be paused for by the remote end or the period of
		* time that this port can pause the remote end.
		*/
		err = mv88e6xxx_port_write(chip, port, PORT_PAUSE_CTRL, 0x0000);
		if (chip->info->ops->port_pause_config) {
		err = chip->info->ops->port_pause_config(chip, port);
		if (err)
		return err;
		}

		if (mv88e6xxx_6352_family(chip) \|\| mv88e6xxx_6351_family(chip) \|\|
		mv88e6xxx_6165_family(chip) \|\| mv88e6xxx_6097_family(chip) \|\|
		mv88e6xxx_6320_family(chip)) {
		/* Port ATU control: disable limiting the number of
		* address database entries that this port is allowed
		* to use.
		@@ -3220,6 +3218,7 @@ static const struct mv88e6xxx_ops mv88e6085_ops = {
		.port_set_egress_unknowns = mv88e6351_port_set_egress_unknowns,
		.port_set_ether_type = mv88e6351_port_set_ether_type,
		.port_egress_rate_limiting = mv88e6097_port_egress_rate_limiting,
		.port_pause_config = mv88e6097_port_pause_config,
		.stats_snapshot = mv88e6xxx_g1_stats_snapshot,
		.stats_get_sset_count = mv88e6095_stats_get_sset_count,
		.stats_get_strings = mv88e6095_stats_get_strings,
		@@ -3260,6 +3259,7 @@ static const struct mv88e6xxx_ops mv88e6097_ops = {
		.port_set_ether_type = mv88e6351_port_set_ether_type,
		.port_jumbo_config = mv88e6165_port_jumbo_config,
		.port_egress_rate_limiting = mv88e6095_port_egress_rate_limiting,
		.port_pause_config = mv88e6097_port_pause_config,
		.stats_snapshot = mv88e6xxx_g1_stats_snapshot,
		.stats_get_sset_count = mv88e6095_stats_get_sset_count,
		.stats_get_strings = mv88e6095_stats_get_strings,
		@@ -3302,6 +3302,7 @@ static const struct mv88e6xxx_ops mv88e6131_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 = mv88e6097_port_pause_config,
		.stats_snapshot = mv88e6xxx_g1_stats_snapshot,
		.stats_get_sset_count = mv88e6095_stats_get_sset_count,
		.stats_get_strings = mv88e6095_stats_get_strings,
		@@ -3325,6 +3326,7 @@ static const struct mv88e6xxx_ops mv88e6161_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 = mv88e6097_port_pause_config,
		.stats_snapshot = mv88e6xxx_g1_stats_snapshot,
		.stats_get_sset_count = mv88e6095_stats_get_sset_count,
		.stats_get_strings = mv88e6095_stats_get_strings,
		@@ -3366,6 +3368,7 @@ static const struct mv88e6xxx_ops mv88e6171_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 = mv88e6097_port_pause_config,
		.stats_snapshot = mv88e6320_g1_stats_snapshot,
		.stats_get_sset_count = mv88e6095_stats_get_sset_count,
		.stats_get_strings = mv88e6095_stats_get_strings,
		@@ -3392,6 +3395,7 @@ static const struct mv88e6xxx_ops mv88e6172_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 = mv88e6097_port_pause_config,
		.stats_snapshot = mv88e6320_g1_stats_snapshot,
		.stats_get_sset_count = mv88e6095_stats_get_sset_count,
		.stats_get_strings = mv88e6095_stats_get_strings,
		@@ -3416,6 +3420,7 @@ static const struct mv88e6xxx_ops mv88e6175_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 = mv88e6097_port_pause_config,
		.stats_snapshot = mv88e6320_g1_stats_snapshot,
		.stats_get_sset_count = mv88e6095_stats_get_sset_count,
		.stats_get_strings = mv88e6095_stats_get_strings,
		@@ -3442,6 +3447,7 @@ static const struct mv88e6xxx_ops mv88e6176_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 = mv88e6097_port_pause_config,
		.stats_snapshot = mv88e6320_g1_stats_snapshot,
		.stats_get_sset_count = mv88e6095_stats_get_sset_count,
		.stats_get_strings = mv88e6095_stats_get_strings,
		@@ -3557,6 +3563,7 @@ static const struct mv88e6xxx_ops mv88e6240_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 = mv88e6097_port_pause_config,
		.stats_snapshot = mv88e6320_g1_stats_snapshot,
		.stats_get_sset_count = mv88e6095_stats_get_sset_count,
		.stats_get_strings = mv88e6095_stats_get_strings,
		@@ -3605,6 +3612,7 @@ static const struct mv88e6xxx_ops mv88e6320_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 = mv88e6097_port_pause_config,
		.stats_snapshot = mv88e6320_g1_stats_snapshot,
		.stats_get_sset_count = mv88e6320_stats_get_sset_count,
		.stats_get_strings = mv88e6320_stats_get_strings,
		@@ -3630,6 +3638,7 @@ static const struct mv88e6xxx_ops mv88e6321_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 = mv88e6097_port_pause_config,
		.stats_snapshot = mv88e6320_g1_stats_snapshot,
		.stats_get_sset_count = mv88e6320_stats_get_sset_count,
		.stats_get_strings = mv88e6320_stats_get_strings,
		@@ -3653,6 +3662,7 @@ static const struct mv88e6xxx_ops mv88e6350_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 = mv88e6097_port_pause_config,
		.stats_snapshot = mv88e6320_g1_stats_snapshot,
		.stats_get_sset_count = mv88e6095_stats_get_sset_count,
		.stats_get_strings = mv88e6095_stats_get_strings,
		@@ -3677,6 +3687,7 @@ static const struct mv88e6xxx_ops mv88e6351_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 = mv88e6097_port_pause_config,
		.stats_snapshot = mv88e6320_g1_stats_snapshot,
		.stats_get_sset_count = mv88e6095_stats_get_sset_count,
		.stats_get_strings = mv88e6095_stats_get_strings,
		@@ -3703,6 +3714,7 @@ static const struct mv88e6xxx_ops mv88e6352_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 = mv88e6097_port_pause_config,
		.stats_snapshot = mv88e6320_g1_stats_snapshot,
		.stats_get_sset_count = mv88e6095_stats_get_sset_count,
		.stats_get_strings = mv88e6095_stats_get_strings,

drivers/net/dsa/mv88e6xxx/mv88e6xxx.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -836,6 +836,7 @@ struct mv88e6xxx_ops {
		int (port_jumbo_config)(struct mv88e6xxx_chip chip, int port);

		int (port_egress_rate_limiting)(struct mv88e6xxx_chip chip, int port);
		int (port_pause_config)(struct mv88e6xxx_chip chip, int port);

		/* Snapshot the statistics for a port. The statistics can then
		* be read back a leisure but still with a consistent view.

drivers/net/dsa/mv88e6xxx/port.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -304,6 +304,17 @@ int mv88e6390x_port_set_speed(struct mv88e6xxx_chip *chip, int port, int speed)
		return mv88e6xxx_port_set_speed(chip, port, speed, true, true);
		}

		/* Offset 0x02: Pause Control
		*
		* Do not limit the period of time that this port can be paused for by
		* the remote end or the period of time that this port can pause the
		* remote end.
		*/
		int mv88e6097_port_pause_config(struct mv88e6xxx_chip *chip, int port)
		{
		return mv88e6xxx_port_write(chip, port, PORT_PAUSE_CTRL, 0x0000);
		}

		/* 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
		@@ -65,5 +65,6 @@ int mv88e6351_port_set_ether_type(struct mv88e6xxx_chip *chip, int port,
		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);

		#endif /* _MV88E6XXX_PORT_H */