Commit 863d1a8d authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

net: dsa: mv88e6xxx: remove unneeded cmode initialization 



This partially reverts ed8fe202 ("net: dsa: mv88e6xxx: prevent
interrupt storm caused by mv88e6390x_port_set_cmode"). I missed
that chip->ports[].cmode is overwritten anyway by the cmode
caching in mv88e6xxx_setup().

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 32705592

drivers/net/dsa/mv88e6xxx/chip.c

+0 −11
Original line number Diff line number Diff line
@@ -4631,14 +4631,6 @@ static int mv88e6xxx_smi_init(struct mv88e6xxx_chip *chip, 
	return 0;

}



static void mv88e6xxx_ports_cmode_init(struct mv88e6xxx_chip *chip)

{

	int i;



	for (i = 0; i < mv88e6xxx_num_ports(chip); i++)

		chip->ports[i].cmode = MV88E6XXX_PORT_STS_CMODE_INVALID;

}



static enum dsa_tag_protocol mv88e6xxx_get_tag_protocol(struct dsa_switch *ds,

							int port)

{
@@ -4675,8 +4667,6 @@ static const char *mv88e6xxx_drv_probe(struct device *dsa_dev, 
	if (err)

		goto free;



	mv88e6xxx_ports_cmode_init(chip);



	mutex_lock(&chip->reg_lock);

	err = mv88e6xxx_switch_reset(chip);

	mutex_unlock(&chip->reg_lock);
@@ -4915,7 +4905,6 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev) 
	if (err)

		goto out;



	mv88e6xxx_ports_cmode_init(chip);

	mv88e6xxx_phy_init(chip);



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

drivers/net/dsa/mv88e6xxx/port.h

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ 
#define MV88E6185_PORT_STS_CMODE_1000BASE_X	0x0005

#define MV88E6185_PORT_STS_CMODE_PHY		0x0006

#define MV88E6185_PORT_STS_CMODE_DISABLED	0x0007

#define MV88E6XXX_PORT_STS_CMODE_INVALID	0xff



/* Offset 0x01: MAC (or PCS or Physical) Control Register */

#define MV88E6XXX_PORT_MAC_CTL				0x01

CRA Git | Maintained and supported by SUSTech CRA and CCSE