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

Commit 734447d4 authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

net: dsa: mv88e6xxx: Re-setup interrupts on CMODE change. 



When a port changes CMODE, the SERDES interface being used can change.
Disable interrupts for the old SERDES interface, and enable interrupts
on the new.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent efd1ba6a

drivers/net/dsa/mv88e6xxx/port.c

+18 −1
Original line number Diff line number Diff line
@@ -342,8 +342,9 @@ int mv88e6390x_port_set_speed(struct mv88e6xxx_chip *chip, int port, int speed) 
int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port,

			      phy_interface_t mode)

{

	u16 reg;

	int lane;

	u16 cmode;

	u16 reg;

	int err;



	if (mode == PHY_INTERFACE_MODE_NA)
@@ -373,6 +374,16 @@ int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port, 
		cmode = 0;

	}



	lane = mv88e6390x_serdes_get_lane(chip, port);

	if (lane < 0)

		return lane;



	if (chip->ports[port].serdes_irq) {

		err = mv88e6390_serdes_irq_disable(chip, port, lane);

		if (err)

			return err;

	}



	err = mv88e6390_serdes_power(chip, port, false);

	if (err)

		return err;
@@ -392,6 +403,12 @@ int mv88e6390x_port_set_cmode(struct mv88e6xxx_chip *chip, int port, 
		err = mv88e6390_serdes_power(chip, port, true);

		if (err)

			return err;



		if (chip->ports[port].serdes_irq) {

			err = mv88e6390_serdes_irq_enable(chip, port, lane);

			if (err)

				return err;

		}

	}



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

drivers/net/dsa/mv88e6xxx/serdes.c

+3 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ static int mv88e6390_serdes_get_lane(struct mv88e6xxx_chip *chip, int port) 
 * use multiple lanes. If so, return the first lane the port uses.

 * Returns -ENODEV if a port does not have a lane.

 */

static int mv88e6390x_serdes_get_lane(struct mv88e6xxx_chip *chip, int port)

int mv88e6390x_serdes_get_lane(struct mv88e6xxx_chip *chip, int port)

{

	u8 cmode_port9, cmode_port10, cmode_port;
@@ -576,6 +576,8 @@ void mv88e6390_serdes_irq_free(struct mv88e6xxx_chip *chip, int port) 
	mutex_unlock(&chip->reg_lock);

	free_irq(chip->ports[port].serdes_irq, &chip->ports[port]);

	mutex_lock(&chip->reg_lock);



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

}



int mv88e6341_serdes_power(struct mv88e6xxx_chip *chip, int port, bool on)

drivers/net/dsa/mv88e6xxx/serdes.h

+6 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
#define MV88E6390_SGMII_INT_FALSE_CARRIER	BIT(7)

#define MV88E6390_SGMII_INT_STATUS	0xa002



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

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 mv88e6390_serdes_power(struct mv88e6xxx_chip *chip, int port, bool on);
@@ -68,4 +69,9 @@ int mv88e6352_serdes_get_strings(struct mv88e6xxx_chip *chip, 
				 int port, uint8_t *data);

int mv88e6352_serdes_get_stats(struct mv88e6xxx_chip *chip, int port,

			       uint64_t *data);

int mv88e6390_serdes_irq_enable(struct mv88e6xxx_chip *chip, int port,

				int lane);

int mv88e6390_serdes_irq_disable(struct mv88e6xxx_chip *chip, int port,

				 int lane);



#endif