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

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

net: dsa: mv88e6xxx: fully support SERDES on Topaz family 



Currently we support SERDES on the Topaz family in a limited way: no
IRQs and the cmode is not writable, thus the mode is determined by
strapping pins.

Marvell's examples though show how to make cmode writable on port 5 and
support SGMII autonegotiation. It is done by writing hidden registers,
for which we already have code.

This patch adds support for making the cmode for the SERDES port
writable on the Topaz family, via a new chip operation,
.port_set_cmode_writable, which is called from mv88e6xxx_port_setup_mac
just before .port_set_cmode.

SERDES IRQs are also enabled for Topaz.

Tested on Turris Mox.

Signed-off-by: default avatarMarek Behún <marek.behun@nic.cz>
Reviewed-by: default avatarVivien Didelot <vivien.didelot@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3bbb8867

drivers/net/dsa/mv88e6xxx/chip.c

+14 −0
Original line number Diff line number Diff line
@@ -454,6 +454,12 @@ int mv88e6xxx_port_setup_mac(struct mv88e6xxx_chip *chip, int port, int link, 
			goto restore_link;

	}



	if (chip->info->ops->port_set_cmode_writable) {

		err = chip->info->ops->port_set_cmode_writable(chip, port);

		if (err && err != -EOPNOTSUPP)

			goto restore_link;

	}



	if (chip->info->ops->port_set_cmode) {

		err = chip->info->ops->port_set_cmode(chip, port, mode);

		if (err && err != -EOPNOTSUPP)
@@ -2913,6 +2919,8 @@ static const struct mv88e6xxx_ops mv88e6141_ops = { 
	.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,

	.port_link_state = mv88e6352_port_link_state,

	.port_get_cmode = mv88e6352_port_get_cmode,

	.port_set_cmode_writable = mv88e6341_port_set_cmode_writable,

	.port_set_cmode = mv88e6341_port_set_cmode,

	.port_setup_message_port = mv88e6xxx_setup_message_port,

	.stats_snapshot = mv88e6390_g1_stats_snapshot,

	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
@@ -2929,6 +2937,8 @@ static const struct mv88e6xxx_ops mv88e6141_ops = { 
	.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,

	.serdes_power = mv88e6390_serdes_power,

	.serdes_get_lane = mv88e6341_serdes_get_lane,

	.serdes_irq_setup = mv88e6390_serdes_irq_setup,

	.serdes_irq_free = mv88e6390_serdes_irq_free,

	.gpio_ops = &mv88e6352_gpio_ops,

	.phylink_validate = mv88e6341_phylink_validate,

};
@@ -3608,6 +3618,8 @@ static const struct mv88e6xxx_ops mv88e6341_ops = { 
	.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,

	.port_link_state = mv88e6352_port_link_state,

	.port_get_cmode = mv88e6352_port_get_cmode,

	.port_set_cmode_writable = mv88e6341_port_set_cmode_writable,

	.port_set_cmode = mv88e6341_port_set_cmode,

	.port_setup_message_port = mv88e6xxx_setup_message_port,

	.stats_snapshot = mv88e6390_g1_stats_snapshot,

	.stats_set_histogram = mv88e6095_g1_stats_set_histogram,
@@ -3624,6 +3636,8 @@ static const struct mv88e6xxx_ops mv88e6341_ops = { 
	.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,

	.serdes_power = mv88e6390_serdes_power,

	.serdes_get_lane = mv88e6341_serdes_get_lane,

	.serdes_irq_setup = mv88e6390_serdes_irq_setup,

	.serdes_irq_free = mv88e6390_serdes_irq_free,

	.gpio_ops = &mv88e6352_gpio_ops,

	.avb_ops = &mv88e6390_avb_ops,

	.ptp_ops = &mv88e6352_ptp_ops,

drivers/net/dsa/mv88e6xxx/chip.h

+1 −0
Original line number Diff line number Diff line
@@ -400,6 +400,7 @@ struct mv88e6xxx_ops { 
	/* CMODE control what PHY mode the MAC will use, eg. SGMII, RGMII, etc.

	 * Some chips allow this to be configured on specific ports.

	 */

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

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

			      phy_interface_t mode);

	int (*port_get_cmode)(struct mv88e6xxx_chip *chip, int port, u8 *cmode);

drivers/net/dsa/mv88e6xxx/port.c

+59 −6
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ phy_interface_t mv88e6390x_port_max_speed_mode(int port) 
	return PHY_INTERFACE_MODE_NA;

}



int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port,

static int mv88e6xxx_port_set_cmode(struct mv88e6xxx_chip *chip, int port,

				    phy_interface_t mode)

{

	u8 lane;
@@ -400,9 +400,6 @@ int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port, 
	u16 reg;

	int err;



	if (port != 9 && port != 10)

		return -EOPNOTSUPP;



	/* Default to a slow mode, so freeing up SERDES interfaces for

	 * other ports which might use them for SFPs.

	 */
@@ -484,9 +481,65 @@ int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port, 
	return 0;

}



int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port,

			      phy_interface_t mode)

{

	if (port != 9 && port != 10)

		return -EOPNOTSUPP;



	return mv88e6xxx_port_set_cmode(chip, port, mode);

}



int mv88e6390_port_set_cmode(struct mv88e6xxx_chip *chip, int port,

			     phy_interface_t mode)

{

	if (port != 9 && port != 10)

		return -EOPNOTSUPP;



	switch (mode) {

	case PHY_INTERFACE_MODE_NA:

		return 0;

	case PHY_INTERFACE_MODE_XGMII:

	case PHY_INTERFACE_MODE_XAUI:

	case PHY_INTERFACE_MODE_RXAUI:

		return -EINVAL;

	default:

		break;

	}



	return mv88e6xxx_port_set_cmode(chip, port, mode);

}



int mv88e6341_port_set_cmode_writable(struct mv88e6xxx_chip *chip, int port)

{

	int err, addr;

	u16 reg, bits;



	if (port != 5)

		return -EOPNOTSUPP;



	addr = chip->info->port_base_addr + port;



	err = mv88e6xxx_port_hidden_read(chip, 0x7, addr, 0, &reg);

	if (err)

		return err;



	bits = MV88E6341_PORT_RESERVED_1A_FORCE_CMODE |

	       MV88E6341_PORT_RESERVED_1A_SGMII_AN;



	if ((reg & bits) == bits)

		return 0;



	reg |= bits;

	return mv88e6xxx_port_hidden_write(chip, 0x7, addr, 0, reg);

}



int mv88e6341_port_set_cmode(struct mv88e6xxx_chip *chip, int port,

			     phy_interface_t mode)

{

	if (port != 5)

		return -EOPNOTSUPP;



	switch (mode) {

	case PHY_INTERFACE_MODE_NA:

		return 0;
@@ -498,7 +551,7 @@ int mv88e6390_port_set_cmode(struct mv88e6xxx_chip *chip, int port, 
		break;

	}



	return mv88e6390x_port_set_cmode(chip, port, mode);

	return mv88e6xxx_port_set_cmode(chip, port, mode);

}



int mv88e6185_port_get_cmode(struct mv88e6xxx_chip *chip, int port, u8 *cmode)

drivers/net/dsa/mv88e6xxx/port.h

+5 −0
Original line number Diff line number Diff line
@@ -269,6 +269,8 @@ 
#define MV88E6XXX_PORT_RESERVED_1A_BLOCK_SHIFT	10

#define MV88E6XXX_PORT_RESERVED_1A_CTRL_PORT	0x04

#define MV88E6XXX_PORT_RESERVED_1A_DATA_PORT	0x05

#define MV88E6341_PORT_RESERVED_1A_FORCE_CMODE	0x8000

#define MV88E6341_PORT_RESERVED_1A_SGMII_AN	0x2000



int mv88e6xxx_port_read(struct mv88e6xxx_chip *chip, int port, int reg,

			u16 *val);
@@ -334,6 +336,9 @@ int mv88e6097_port_pause_limit(struct mv88e6xxx_chip *chip, int port, u8 in, 
			       u8 out);

int mv88e6390_port_pause_limit(struct mv88e6xxx_chip *chip, int port, u8 in,

			       u8 out);

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

int mv88e6341_port_set_cmode(struct mv88e6xxx_chip *chip, int port,

			     phy_interface_t mode);

int mv88e6390_port_set_cmode(struct mv88e6xxx_chip *chip, int port,

			     phy_interface_t mode);

int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port,