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

Commit 26422340 authored by Marek Behún's avatar Marek Behún Committed by David S. Miller
Browse files

net: dsa: mv88e6xxx: Fix 88E6141/6341 2500mbps SERDES speed 



This is a fix for the port_set_speed method for the Topaz family.
Currently the same method is used as for the Peridot family, but
this is wrong for the SERDES port.

On Topaz, the SERDES port is port 5, not 9 and 10 as in Peridot.
Moreover setting alt_bit on Topaz only makes sense for port 0 (for
(differentiating 100mbps vs 200mbps). The SERDES port does not
support more than 2500mbps, so alt_bit does not make any difference.

Signed-off-by: default avatarMarek Behún <marek.behun@nic.cz>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e943d94e

drivers/net/dsa/mv88e6xxx/chip.c

+2 −2
Original line number Diff line number Diff line
@@ -2907,7 +2907,7 @@ static const struct mv88e6xxx_ops mv88e6141_ops = { 
	.port_set_link = mv88e6xxx_port_set_link,

	.port_set_duplex = mv88e6xxx_port_set_duplex,

	.port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,

	.port_set_speed = mv88e6390_port_set_speed,

	.port_set_speed = mv88e6341_port_set_speed,

	.port_tag_remap = mv88e6095_port_tag_remap,

	.port_set_frame_mode = mv88e6351_port_set_frame_mode,

	.port_set_egress_floods = mv88e6352_port_set_egress_floods,
@@ -3528,7 +3528,7 @@ static const struct mv88e6xxx_ops mv88e6341_ops = { 
	.port_set_link = mv88e6xxx_port_set_link,

	.port_set_duplex = mv88e6xxx_port_set_duplex,

	.port_set_rgmii_delay = mv88e6390_port_set_rgmii_delay,

	.port_set_speed = mv88e6390_port_set_speed,

	.port_set_speed = mv88e6341_port_set_speed,

	.port_tag_remap = mv88e6095_port_tag_remap,

	.port_set_frame_mode = mv88e6351_port_set_frame_mode,

	.port_set_egress_floods = mv88e6352_port_set_egress_floods,

drivers/net/dsa/mv88e6xxx/port.c

+23 −2
Original line number Diff line number Diff line
@@ -228,8 +228,11 @@ static int mv88e6xxx_port_set_speed(struct mv88e6xxx_chip *chip, int port, 
		ctrl = MV88E6XXX_PORT_MAC_CTL_SPEED_1000;

		break;

	case 2500:

		if (alt_bit)

			ctrl = MV88E6390_PORT_MAC_CTL_SPEED_10000 |

				MV88E6390_PORT_MAC_CTL_ALTSPEED;

		else

			ctrl = MV88E6390_PORT_MAC_CTL_SPEED_10000;

		break;

	case 10000:

		/* all bits set, fall through... */
@@ -291,6 +294,24 @@ int mv88e6185_port_set_speed(struct mv88e6xxx_chip *chip, int port, int speed) 
	return mv88e6xxx_port_set_speed(chip, port, speed, false, false);

}



/* Support 10, 100, 200, 1000, 2500 Mbps (e.g. 88E6341) */

int mv88e6341_port_set_speed(struct mv88e6xxx_chip *chip, int port, int speed)

{

	if (speed == SPEED_MAX)

		speed = port < 5 ? 1000 : 2500;



	if (speed > 2500)

		return -EOPNOTSUPP;



	if (speed == 200 && port != 0)

		return -EOPNOTSUPP;



	if (speed == 2500 && port < 5)

		return -EOPNOTSUPP;



	return mv88e6xxx_port_set_speed(chip, port, speed, !port, true);

}



/* Support 10, 100, 200, 1000 Mbps (e.g. 88E6352 family) */

int mv88e6352_port_set_speed(struct mv88e6xxx_chip *chip, int port, int speed)

{

drivers/net/dsa/mv88e6xxx/port.h

+1 −0
Original line number Diff line number Diff line
@@ -269,6 +269,7 @@ int mv88e6xxx_port_set_duplex(struct mv88e6xxx_chip *chip, int port, int dup); 


int mv88e6065_port_set_speed(struct mv88e6xxx_chip *chip, int port, int speed);

int mv88e6185_port_set_speed(struct mv88e6xxx_chip *chip, int port, int speed);

int mv88e6341_port_set_speed(struct mv88e6xxx_chip *chip, int port, int speed);

int mv88e6352_port_set_speed(struct mv88e6xxx_chip *chip, int port, int speed);

int mv88e6390_port_set_speed(struct mv88e6xxx_chip *chip, int port, int speed);

int mv88e6390x_port_set_speed(struct mv88e6xxx_chip *chip, int port, int speed);