Commit 907b9b9f authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: mv88e6xxx: introduce .serdes_irq_status 



Introduce a new .serdes_irq_status operation to prepare the abstraction
of IRQ thread from the SERDES IRQ setup code.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 61a46b41

drivers/net/dsa/mv88e6xxx/chip.c

+11 −0
Original line number Diff line number Diff line
@@ -2935,6 +2935,7 @@ static const struct mv88e6xxx_ops mv88e6141_ops = { 
	.serdes_get_lane = mv88e6341_serdes_get_lane,

	.serdes_irq_mapping = mv88e6390_serdes_irq_mapping,

	.serdes_irq_enable = mv88e6390_serdes_irq_enable,

	.serdes_irq_status = mv88e6390_serdes_irq_status,

	.serdes_irq_setup = mv88e6390_serdes_irq_setup,

	.serdes_irq_free = mv88e6390_serdes_irq_free,

	.gpio_ops = &mv88e6352_gpio_ops,
@@ -3186,6 +3187,7 @@ static const struct mv88e6xxx_ops mv88e6176_ops = { 
	.serdes_power = mv88e6352_serdes_power,

	.serdes_irq_mapping = mv88e6352_serdes_irq_mapping,

	.serdes_irq_enable = mv88e6352_serdes_irq_enable,

	.serdes_irq_status = mv88e6352_serdes_irq_status,

	.serdes_irq_setup = mv88e6352_serdes_irq_setup,

	.serdes_irq_free = mv88e6352_serdes_irq_free,

	.gpio_ops = &mv88e6352_gpio_ops,
@@ -3271,6 +3273,7 @@ static const struct mv88e6xxx_ops mv88e6190_ops = { 
	.serdes_get_lane = mv88e6390_serdes_get_lane,

	.serdes_irq_mapping = mv88e6390_serdes_irq_mapping,

	.serdes_irq_enable = mv88e6390_serdes_irq_enable,

	.serdes_irq_status = mv88e6390_serdes_irq_status,

	.serdes_irq_setup = mv88e6390_serdes_irq_setup,

	.serdes_irq_free = mv88e6390_serdes_irq_free,

	.gpio_ops = &mv88e6352_gpio_ops,
@@ -3320,6 +3323,7 @@ static const struct mv88e6xxx_ops mv88e6190x_ops = { 
	.serdes_get_lane = mv88e6390x_serdes_get_lane,

	.serdes_irq_mapping = mv88e6390_serdes_irq_mapping,

	.serdes_irq_enable = mv88e6390_serdes_irq_enable,

	.serdes_irq_status = mv88e6390_serdes_irq_status,

	.serdes_irq_setup = mv88e6390_serdes_irq_setup,

	.serdes_irq_free = mv88e6390_serdes_irq_free,

	.gpio_ops = &mv88e6352_gpio_ops,
@@ -3369,6 +3373,7 @@ static const struct mv88e6xxx_ops mv88e6191_ops = { 
	.serdes_get_lane = mv88e6390_serdes_get_lane,

	.serdes_irq_mapping = mv88e6390_serdes_irq_mapping,

	.serdes_irq_enable = mv88e6390_serdes_irq_enable,

	.serdes_irq_status = mv88e6390_serdes_irq_status,

	.serdes_irq_setup = mv88e6390_serdes_irq_setup,

	.serdes_irq_free = mv88e6390_serdes_irq_free,

	.avb_ops = &mv88e6390_avb_ops,
@@ -3420,6 +3425,7 @@ static const struct mv88e6xxx_ops mv88e6240_ops = { 
	.serdes_power = mv88e6352_serdes_power,

	.serdes_irq_mapping = mv88e6352_serdes_irq_mapping,

	.serdes_irq_enable = mv88e6352_serdes_irq_enable,

	.serdes_irq_status = mv88e6352_serdes_irq_status,

	.serdes_irq_setup = mv88e6352_serdes_irq_setup,

	.serdes_irq_free = mv88e6352_serdes_irq_free,

	.gpio_ops = &mv88e6352_gpio_ops,
@@ -3511,6 +3517,7 @@ static const struct mv88e6xxx_ops mv88e6290_ops = { 
	.serdes_get_lane = mv88e6390_serdes_get_lane,

	.serdes_irq_mapping = mv88e6390_serdes_irq_mapping,

	.serdes_irq_enable = mv88e6390_serdes_irq_enable,

	.serdes_irq_status = mv88e6390_serdes_irq_status,

	.serdes_irq_setup = mv88e6390_serdes_irq_setup,

	.serdes_irq_free = mv88e6390_serdes_irq_free,

	.gpio_ops = &mv88e6352_gpio_ops,
@@ -3650,6 +3657,7 @@ static const struct mv88e6xxx_ops mv88e6341_ops = { 
	.serdes_get_lane = mv88e6341_serdes_get_lane,

	.serdes_irq_mapping = mv88e6390_serdes_irq_mapping,

	.serdes_irq_enable = mv88e6390_serdes_irq_enable,

	.serdes_irq_status = mv88e6390_serdes_irq_status,

	.serdes_irq_setup = mv88e6390_serdes_irq_setup,

	.serdes_irq_free = mv88e6390_serdes_irq_free,

	.gpio_ops = &mv88e6352_gpio_ops,
@@ -3784,6 +3792,7 @@ static const struct mv88e6xxx_ops mv88e6352_ops = { 
	.serdes_power = mv88e6352_serdes_power,

	.serdes_irq_mapping = mv88e6352_serdes_irq_mapping,

	.serdes_irq_enable = mv88e6352_serdes_irq_enable,

	.serdes_irq_status = mv88e6352_serdes_irq_status,

	.serdes_irq_setup = mv88e6352_serdes_irq_setup,

	.serdes_irq_free = mv88e6352_serdes_irq_free,

	.gpio_ops = &mv88e6352_gpio_ops,
@@ -3840,6 +3849,7 @@ static const struct mv88e6xxx_ops mv88e6390_ops = { 
	.serdes_get_lane = mv88e6390_serdes_get_lane,

	.serdes_irq_mapping = mv88e6390_serdes_irq_mapping,

	.serdes_irq_enable = mv88e6390_serdes_irq_enable,

	.serdes_irq_status = mv88e6390_serdes_irq_status,

	.serdes_irq_setup = mv88e6390_serdes_irq_setup,

	.serdes_irq_free = mv88e6390_serdes_irq_free,

	.gpio_ops = &mv88e6352_gpio_ops,
@@ -3893,6 +3903,7 @@ static const struct mv88e6xxx_ops mv88e6390x_ops = { 
	.serdes_get_lane = mv88e6390x_serdes_get_lane,

	.serdes_irq_mapping = mv88e6390_serdes_irq_mapping,

	.serdes_irq_enable = mv88e6390_serdes_irq_enable,

	.serdes_irq_status = mv88e6390_serdes_irq_status,

	.serdes_irq_setup = mv88e6390_serdes_irq_setup,

	.serdes_irq_free = mv88e6390_serdes_irq_free,

	.gpio_ops = &mv88e6352_gpio_ops,

drivers/net/dsa/mv88e6xxx/chip.h

+2 −0
Original line number Diff line number Diff line
@@ -454,6 +454,8 @@ struct mv88e6xxx_ops { 
	void (*serdes_irq_free)(struct mv88e6xxx_chip *chip, int port);

	int (*serdes_irq_enable)(struct mv88e6xxx_chip *chip, int port, u8 lane,

				 bool enable);

	irqreturn_t (*serdes_irq_status)(struct mv88e6xxx_chip *chip, int port,

					 u8 lane);



	/* Statistics from the SERDES interface */

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

drivers/net/dsa/mv88e6xxx/serdes.c

+38 −21
Original line number Diff line number Diff line
@@ -202,25 +202,33 @@ static void mv88e6352_serdes_irq_link(struct mv88e6xxx_chip *chip, int port) 
	dsa_port_phylink_mac_change(ds, port, up);

}



static irqreturn_t mv88e6352_serdes_thread_fn(int irq, void *dev_id)

irqreturn_t mv88e6352_serdes_irq_status(struct mv88e6xxx_chip *chip, int port,

					u8 lane)

{

	struct mv88e6xxx_port *port = dev_id;

	struct mv88e6xxx_chip *chip = port->chip;

	irqreturn_t ret = IRQ_NONE;

	u16 status;

	int err;



	mv88e6xxx_reg_lock(chip);



	err = mv88e6352_serdes_read(chip, MV88E6352_SERDES_INT_STATUS, &status);

	if (err)

		goto out;

		return ret;



	if (status & MV88E6352_SERDES_INT_LINK_CHANGE) {

		ret = IRQ_HANDLED;

		mv88e6352_serdes_irq_link(chip, port->port);

		mv88e6352_serdes_irq_link(chip, port);

	}

out:



	return ret;

}



static irqreturn_t mv88e6352_serdes_thread_fn(int irq, void *dev_id)

{

	struct mv88e6xxx_port *port = dev_id;

	struct mv88e6xxx_chip *chip = port->chip;

	irqreturn_t ret = IRQ_NONE;



	mv88e6xxx_reg_lock(chip);

	ret = mv88e6xxx_serdes_irq_status(chip, port->port, 0);

	mv88e6xxx_reg_unlock(chip);



	return ret;
@@ -589,21 +597,13 @@ static int mv88e6390_serdes_irq_status_sgmii(struct mv88e6xxx_chip *chip, 
	return err;

}



static irqreturn_t mv88e6390_serdes_thread_fn(int irq, void *dev_id)

irqreturn_t mv88e6390_serdes_irq_status(struct mv88e6xxx_chip *chip, int port,

					u8 lane)

{

	struct mv88e6xxx_port *port = dev_id;

	struct mv88e6xxx_chip *chip = port->chip;

	u8 cmode = chip->ports[port].cmode;

	irqreturn_t ret = IRQ_NONE;

	u8 cmode = port->cmode;

	u16 status;

	int err;

	u8 lane;



	mv88e6xxx_reg_lock(chip);



	lane = mv88e6xxx_serdes_get_lane(chip, port->port);

	if (!lane)

		goto out;



	switch (cmode) {

	case MV88E6XXX_PORT_STS_CMODE_SGMII:
@@ -611,13 +611,30 @@ static irqreturn_t mv88e6390_serdes_thread_fn(int irq, void *dev_id) 
	case MV88E6XXX_PORT_STS_CMODE_2500BASEX:

		err = mv88e6390_serdes_irq_status_sgmii(chip, lane, &status);

		if (err)

			goto out;

			return ret;

		if (status & (MV88E6390_SGMII_INT_LINK_DOWN |

			      MV88E6390_SGMII_INT_LINK_UP)) {

			ret = IRQ_HANDLED;

			mv88e6390_serdes_irq_link_sgmii(chip, port->port, lane);

			mv88e6390_serdes_irq_link_sgmii(chip, port, lane);

		}

	}



	return ret;

}



static irqreturn_t mv88e6390_serdes_thread_fn(int irq, void *dev_id)

{

	struct mv88e6xxx_port *port = dev_id;

	struct mv88e6xxx_chip *chip = port->chip;

	irqreturn_t ret = IRQ_NONE;

	u8 lane;



	mv88e6xxx_reg_lock(chip);

	lane = mv88e6xxx_serdes_get_lane(chip, port->port);

	if (!lane)

		goto out;



	ret = mv88e6xxx_serdes_irq_status(chip, port->port, lane);

out:

	mv88e6xxx_reg_unlock(chip);

drivers/net/dsa/mv88e6xxx/serdes.h

+13 −0
Original line number Diff line number Diff line
@@ -92,6 +92,10 @@ int mv88e6352_serdes_irq_enable(struct mv88e6xxx_chip *chip, int port, u8 lane, 
				bool enable);

int mv88e6390_serdes_irq_enable(struct mv88e6xxx_chip *chip, int port, u8 lane,

				bool enable);

irqreturn_t mv88e6352_serdes_irq_status(struct mv88e6xxx_chip *chip, int port,

					u8 lane);

irqreturn_t mv88e6390_serdes_irq_status(struct mv88e6xxx_chip *chip, int port,

					u8 lane);

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

int mv88e6352_serdes_get_strings(struct mv88e6xxx_chip *chip,

				 int port, uint8_t *data);
@@ -155,4 +159,13 @@ static inline int mv88e6xxx_serdes_irq_disable(struct mv88e6xxx_chip *chip, 
	return chip->info->ops->serdes_irq_enable(chip, port, lane, false);

}



static inline irqreturn_t

mv88e6xxx_serdes_irq_status(struct mv88e6xxx_chip *chip, int port, u8 lane)

{

	if (!chip->info->ops->serdes_irq_status)

		return IRQ_NONE;



	return chip->info->ops->serdes_irq_status(chip, port, lane);

}



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE