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

Commit d3cf7d8f authored Aug 26, 2019 by Marek Behún Committed by David S. Miller Aug 27, 2019

net: dsa: mv88e6xxx: simplify SERDES code for Topaz and Peridot



By adding an additional serdes_get_lane implementation (for Topaz), we
can merge the implementations of other SERDES functions (powering and
IRQs). We can skip checking port numbers, since the serdes_get_lane()
methods inform if there is no lane on a port or if the lane cannot be
used for given cmode.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 17deaf5c

drivers/net/dsa/mv88e6xxx/chip.c

+10 −8

Original line number	Original line	Diff line number	Diff line
	@@ -2927,7 +2927,8 @@ static const struct mv88e6xxx_ops mv88e6141_ops = {
	.reset = mv88e6352_g1_reset,		.reset = mv88e6352_g1_reset,
	.vtu_getnext = mv88e6352_g1_vtu_getnext,		.vtu_getnext = mv88e6352_g1_vtu_getnext,
	.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,		.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
	.serdes_power = mv88e6341_serdes_power,		.serdes_power = mv88e6390_serdes_power,
			.serdes_get_lane = mv88e6341_serdes_get_lane,
	.gpio_ops = &mv88e6352_gpio_ops,		.gpio_ops = &mv88e6352_gpio_ops,
	.phylink_validate = mv88e6341_phylink_validate,		.phylink_validate = mv88e6341_phylink_validate,
	};		};
	@@ -3301,10 +3302,10 @@ static const struct mv88e6xxx_ops mv88e6190x_ops = {
	.rmu_disable = mv88e6390_g1_rmu_disable,		.rmu_disable = mv88e6390_g1_rmu_disable,
	.vtu_getnext = mv88e6390_g1_vtu_getnext,		.vtu_getnext = mv88e6390_g1_vtu_getnext,
	.vtu_loadpurge = mv88e6390_g1_vtu_loadpurge,		.vtu_loadpurge = mv88e6390_g1_vtu_loadpurge,
	.serdes_power = mv88e6390x_serdes_power,		.serdes_power = mv88e6390_serdes_power,
	.serdes_get_lane = mv88e6390x_serdes_get_lane,		.serdes_get_lane = mv88e6390x_serdes_get_lane,
	.serdes_irq_setup = mv88e6390x_serdes_irq_setup,		.serdes_irq_setup = mv88e6390_serdes_irq_setup,
	.serdes_irq_free = mv88e6390x_serdes_irq_free,		.serdes_irq_free = mv88e6390_serdes_irq_free,
	.gpio_ops = &mv88e6352_gpio_ops,		.gpio_ops = &mv88e6352_gpio_ops,
	.phylink_validate = mv88e6390x_phylink_validate,		.phylink_validate = mv88e6390x_phylink_validate,
	};		};
	@@ -3621,7 +3622,8 @@ static const struct mv88e6xxx_ops mv88e6341_ops = {
	.reset = mv88e6352_g1_reset,		.reset = mv88e6352_g1_reset,
	.vtu_getnext = mv88e6352_g1_vtu_getnext,		.vtu_getnext = mv88e6352_g1_vtu_getnext,
	.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,		.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
	.serdes_power = mv88e6341_serdes_power,		.serdes_power = mv88e6390_serdes_power,
			.serdes_get_lane = mv88e6341_serdes_get_lane,
	.gpio_ops = &mv88e6352_gpio_ops,		.gpio_ops = &mv88e6352_gpio_ops,
	.avb_ops = &mv88e6390_avb_ops,		.avb_ops = &mv88e6390_avb_ops,
	.ptp_ops = &mv88e6352_ptp_ops,		.ptp_ops = &mv88e6352_ptp_ops,
	@@ -3854,10 +3856,10 @@ static const struct mv88e6xxx_ops mv88e6390x_ops = {
	.rmu_disable = mv88e6390_g1_rmu_disable,		.rmu_disable = mv88e6390_g1_rmu_disable,
	.vtu_getnext = mv88e6390_g1_vtu_getnext,		.vtu_getnext = mv88e6390_g1_vtu_getnext,
	.vtu_loadpurge = mv88e6390_g1_vtu_loadpurge,		.vtu_loadpurge = mv88e6390_g1_vtu_loadpurge,
	.serdes_power = mv88e6390x_serdes_power,		.serdes_power = mv88e6390_serdes_power,
	.serdes_get_lane = mv88e6390x_serdes_get_lane,		.serdes_get_lane = mv88e6390x_serdes_get_lane,
	.serdes_irq_setup = mv88e6390x_serdes_irq_setup,		.serdes_irq_setup = mv88e6390_serdes_irq_setup,
	.serdes_irq_free = mv88e6390x_serdes_irq_free,		.serdes_irq_free = mv88e6390_serdes_irq_free,
	.gpio_ops = &mv88e6352_gpio_ops,		.gpio_ops = &mv88e6352_gpio_ops,
	.avb_ops = &mv88e6390_avb_ops,		.avb_ops = &mv88e6390_avb_ops,
	.ptp_ops = &mv88e6352_ptp_ops,		.ptp_ops = &mv88e6352_ptp_ops,

drivers/net/dsa/mv88e6xxx/port.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -445,7 +445,7 @@ int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port,
	return err;		return err;
	}		}

	err = mv88e6390x_serdes_power(chip, port, false);		err = mv88e6390_serdes_power(chip, port, false);
	if (err)		if (err)
	return err;		return err;
	}		}
	@@ -470,7 +470,7 @@ int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port,
	if (err)		if (err)
	return err;		return err;

	err = mv88e6390x_serdes_power(chip, port, true);		err = mv88e6390_serdes_power(chip, port, true);
	if (err)		if (err)
	return err;		return err;

drivers/net/dsa/mv88e6xxx/serdes.c

+28 −77

Original line number	Original line	Diff line number	Diff line
	@@ -286,6 +286,23 @@ void mv88e6352_serdes_irq_free(struct mv88e6xxx_chip *chip, int port)
	chip->ports[port].serdes_irq = 0;		chip->ports[port].serdes_irq = 0;
	}		}

			int mv88e6341_serdes_get_lane(struct mv88e6xxx_chip chip, int port, u8 lane)
			{
			u8 cmode = chip->ports[port].cmode;

			if (port != 5)
			return -ENODEV;

			if (cmode == MV88E6XXX_PORT_STS_CMODE_1000BASE_X \|\|
			cmode == MV88E6XXX_PORT_STS_CMODE_SGMII \|\|
			cmode == MV88E6XXX_PORT_STS_CMODE_2500BASEX) {
			*lane = MV88E6341_PORT5_LANE;
			return 0;
			}

			return -ENODEV;
			}

	int mv88e6390_serdes_get_lane(struct mv88e6xxx_chip chip, int port, u8 lane)		int mv88e6390_serdes_get_lane(struct mv88e6xxx_chip chip, int port, u8 lane)
	{		{
	u8 cmode = chip->ports[port].cmode;		u8 cmode = chip->ports[port].cmode;
	@@ -467,26 +484,9 @@ static int mv88e6390_serdes_power_sgmii(struct mv88e6xxx_chip *chip, u8 lane,
	return err;		return err;
	}		}

	static int mv88e6390_serdes_power_lane(struct mv88e6xxx_chip *chip, int port,
	u8 lane, bool on)
	{
	u8 cmode = chip->ports[port].cmode;

	switch (cmode) {
	case MV88E6XXX_PORT_STS_CMODE_SGMII:
	case MV88E6XXX_PORT_STS_CMODE_1000BASE_X:
	case MV88E6XXX_PORT_STS_CMODE_2500BASEX:
	return mv88e6390_serdes_power_sgmii(chip, lane, on);
	case MV88E6XXX_PORT_STS_CMODE_XAUI:
	case MV88E6XXX_PORT_STS_CMODE_RXAUI:
	return mv88e6390_serdes_power_10g(chip, lane, on);
	}

	return 0;
	}

	int mv88e6390_serdes_power(struct mv88e6xxx_chip *chip, int port, bool on)		int mv88e6390_serdes_power(struct mv88e6xxx_chip *chip, int port, bool on)
	{		{
			u8 cmode = chip->ports[port].cmode;
	u8 lane;		u8 lane;
	int err;		int err;

	@@ -497,31 +497,14 @@ int mv88e6390_serdes_power(struct mv88e6xxx_chip *chip, int port, bool on)
	return err;		return err;
	}		}

	switch (port) {		switch (cmode) {
	case 9 ... 10:		case MV88E6XXX_PORT_STS_CMODE_SGMII:
	return mv88e6390_serdes_power_lane(chip, port, lane, on);		case MV88E6XXX_PORT_STS_CMODE_1000BASE_X:
	}		case MV88E6XXX_PORT_STS_CMODE_2500BASEX:
			return mv88e6390_serdes_power_sgmii(chip, lane, on);
	return 0;		case MV88E6XXX_PORT_STS_CMODE_XAUI:
	}		case MV88E6XXX_PORT_STS_CMODE_RXAUI:
			return mv88e6390_serdes_power_10g(chip, lane, on);
	int mv88e6390x_serdes_power(struct mv88e6xxx_chip *chip, int port, bool on)
	{
	u8 lane;
	int err;

	err = mv88e6xxx_serdes_get_lane(chip, port, &lane);
	if (err) {
	if (err == -ENODEV)
	err = 0;
	return err;
	}

	switch (port) {
	case 2 ... 4:
	case 5 ... 7:
	case 9 ... 10:
	return mv88e6390_serdes_power_lane(chip, port, lane, on);
	}		}

	return 0;		return 0;
	@@ -686,7 +669,7 @@ static irqreturn_t mv88e6390_serdes_thread_fn(int irq, void *dev_id)
	return ret;		return ret;
	}		}

	int mv88e6390x_serdes_irq_setup(struct mv88e6xxx_chip *chip, int port)		int mv88e6390_serdes_irq_setup(struct mv88e6xxx_chip *chip, int port)
	{		{
	int err;		int err;
	u8 lane;		u8 lane;
	@@ -725,15 +708,7 @@ int mv88e6390x_serdes_irq_setup(struct mv88e6xxx_chip *chip, int port)
	return mv88e6390_serdes_irq_enable(chip, port, lane);		return mv88e6390_serdes_irq_enable(chip, port, lane);
	}		}

	int mv88e6390_serdes_irq_setup(struct mv88e6xxx_chip *chip, int port)		void mv88e6390_serdes_irq_free(struct mv88e6xxx_chip *chip, int port)
	{
	if (port < 9)
	return 0;

	return mv88e6390x_serdes_irq_setup(chip, port);
	}

	void mv88e6390x_serdes_irq_free(struct mv88e6xxx_chip *chip, int port)
	{		{
	int err;		int err;
	u8 lane;		u8 lane;
	@@ -757,27 +732,3 @@ void mv88e6390x_serdes_irq_free(struct mv88e6xxx_chip *chip, int port)

	chip->ports[port].serdes_irq = 0;		chip->ports[port].serdes_irq = 0;
	}		}

	void mv88e6390_serdes_irq_free(struct mv88e6xxx_chip *chip, int port)
	{
	if (port < 9)
	return;

	mv88e6390x_serdes_irq_free(chip, port);
	}

	int mv88e6341_serdes_power(struct mv88e6xxx_chip *chip, int port, bool on)
	{
	u8 cmode = chip->ports[port].cmode;

	if (port != 5)
	return 0;

	if (cmode == MV88E6XXX_PORT_STS_CMODE_1000BASE_X \|\|
	cmode == MV88E6XXX_PORT_STS_CMODE_SGMII \|\|
	cmode == MV88E6XXX_PORT_STS_CMODE_2500BASEX)
	return mv88e6390_serdes_power_sgmii(chip, MV88E6341_ADDR_SERDES,
	on);

	return 0;
	}

drivers/net/dsa/mv88e6xxx/serdes.h

+2 −5

Original line number	Original line	Diff line number	Diff line
	@@ -28,7 +28,7 @@
	#define MV88E6352_SERDES_INT_STATUS 0x13		#define MV88E6352_SERDES_INT_STATUS 0x13


	#define MV88E6341_ADDR_SERDES 0x15		#define MV88E6341_PORT5_LANE 0x15

	#define MV88E6390_PORT9_LANE0 0x09		#define MV88E6390_PORT9_LANE0 0x09
	#define MV88E6390_PORT9_LANE1 0x12		#define MV88E6390_PORT9_LANE1 0x12
	@@ -87,16 +87,13 @@ static inline int mv88e6xxx_serdes_get_lane(struct mv88e6xxx_chip *chip,
	return chip->info->ops->serdes_get_lane(chip, port, lane);		return chip->info->ops->serdes_get_lane(chip, port, lane);
	}		}

			int mv88e6341_serdes_get_lane(struct mv88e6xxx_chip chip, int port, u8 lane);
	int mv88e6390_serdes_get_lane(struct mv88e6xxx_chip chip, int port, u8 lane);		int mv88e6390_serdes_get_lane(struct mv88e6xxx_chip chip, int port, u8 lane);
	int mv88e6390x_serdes_get_lane(struct mv88e6xxx_chip chip, int port, u8 lane);		int mv88e6390x_serdes_get_lane(struct mv88e6xxx_chip chip, int port, u8 lane);
	int mv88e6341_serdes_power(struct mv88e6xxx_chip *chip, int port, bool on);
	int mv88e6352_serdes_power(struct mv88e6xxx_chip *chip, int port, bool on);		int mv88e6352_serdes_power(struct mv88e6xxx_chip *chip, int port, bool on);
	int mv88e6390_serdes_power(struct mv88e6xxx_chip *chip, int port, bool on);		int mv88e6390_serdes_power(struct mv88e6xxx_chip *chip, int port, bool on);
	int mv88e6390x_serdes_power(struct mv88e6xxx_chip *chip, int port, bool on);
	int mv88e6390_serdes_irq_setup(struct mv88e6xxx_chip *chip, int port);		int mv88e6390_serdes_irq_setup(struct mv88e6xxx_chip *chip, int port);
	void mv88e6390_serdes_irq_free(struct mv88e6xxx_chip *chip, int port);		void mv88e6390_serdes_irq_free(struct mv88e6xxx_chip *chip, int port);
	int mv88e6390x_serdes_irq_setup(struct mv88e6xxx_chip *chip, int port);
	void mv88e6390x_serdes_irq_free(struct mv88e6xxx_chip *chip, int port);
	int mv88e6352_serdes_get_sset_count(struct mv88e6xxx_chip *chip, int port);		int mv88e6352_serdes_get_sset_count(struct mv88e6xxx_chip *chip, int port);
	int mv88e6352_serdes_get_strings(struct mv88e6xxx_chip *chip,		int mv88e6352_serdes_get_strings(struct mv88e6xxx_chip *chip,
	int port, uint8_t *data);		int port, uint8_t *data);