Skip to content

Commit 7e95173

Browse files
vladimirolteandavem330
authored andcommitted
net: dsa: mv88e6xxx: fix max_mtu of 1492 on 6165, 6191, 6220, 6250, 6290
There are 3 classes of switch families that the driver is aware of, as far as mv88e6xxx_change_mtu() is concerned: - MTU configuration is available per port. Here, the chip->info->ops->port_set_jumbo_size() method will be present. - MTU configuration is global to the switch. Here, the chip->info->ops->set_max_frame_size() method will be present. - We don't know how to change the MTU. Here, none of the above methods will be present. Switch families MV88E6165, MV88E6191, MV88E6220, MV88E6250 and MV88E6290 fall in category 3. The blamed commit has adjusted the MTU for all 3 categories by EDSA_HLEN (8 bytes), resulting in a new maximum MTU of 1492 being reported by the driver for these switches. I don't have the hardware to test, but I do have a MV88E6390 switch on which I can simulate this by commenting out its .port_set_jumbo_size definition from mv88e6390_ops. The result is this set of messages at probe time: mv88e6085 d0032004.mdio-mii:10: nonfatal error -34 setting MTU to 1500 on port 1 mv88e6085 d0032004.mdio-mii:10: nonfatal error -34 setting MTU to 1500 on port 2 mv88e6085 d0032004.mdio-mii:10: nonfatal error -34 setting MTU to 1500 on port 3 mv88e6085 d0032004.mdio-mii:10: nonfatal error -34 setting MTU to 1500 on port 4 mv88e6085 d0032004.mdio-mii:10: nonfatal error -34 setting MTU to 1500 on port 5 mv88e6085 d0032004.mdio-mii:10: nonfatal error -34 setting MTU to 1500 on port 6 mv88e6085 d0032004.mdio-mii:10: nonfatal error -34 setting MTU to 1500 on port 7 mv88e6085 d0032004.mdio-mii:10: nonfatal error -34 setting MTU to 1500 on port 8 It is highly implausible that there exist Ethernet switches which don't support the standard MTU of 1500 octets, and this is what the DSA framework says as well - the error comes from dsa_slave_create() -> dsa_slave_change_mtu(slave_dev, ETH_DATA_LEN). But the error messages are alarming, and it would be good to suppress them. As a consequence of this unlikeliness, we reimplement mv88e6xxx_get_max_mtu() and mv88e6xxx_change_mtu() on switches from the 3rd category as follows: the maximum supported MTU is 1500, and any request to set the MTU to a value larger than that fails in dev_validate_mtu(). Fixes: b9c587f ("dsa: mv88e6xxx: Include tagger overhead when setting MTU for DSA and CPU ports") Signed-off-by: Vladimir Oltean <[email protected]> Reviewed-by: Simon Horman <[email protected]> Reviewed-by: Florian Fainelli <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 636e8ad commit 7e95173

File tree

1 file changed

+12
-4
lines changed
  • drivers/net/dsa/mv88e6xxx

1 file changed

+12
-4
lines changed

drivers/net/dsa/mv88e6xxx/chip.c

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3549,14 +3549,25 @@ static int mv88e6xxx_get_max_mtu(struct dsa_switch *ds, int port)
35493549
return 10240 - VLAN_ETH_HLEN - EDSA_HLEN - ETH_FCS_LEN;
35503550
else if (chip->info->ops->set_max_frame_size)
35513551
return 1632 - VLAN_ETH_HLEN - EDSA_HLEN - ETH_FCS_LEN;
3552-
return 1522 - VLAN_ETH_HLEN - EDSA_HLEN - ETH_FCS_LEN;
3552+
return ETH_DATA_LEN;
35533553
}
35543554

35553555
static int mv88e6xxx_change_mtu(struct dsa_switch *ds, int port, int new_mtu)
35563556
{
35573557
struct mv88e6xxx_chip *chip = ds->priv;
35583558
int ret = 0;
35593559

3560+
/* For families where we don't know how to alter the MTU,
3561+
* just accept any value up to ETH_DATA_LEN
3562+
*/
3563+
if (!chip->info->ops->port_set_jumbo_size &&
3564+
!chip->info->ops->set_max_frame_size) {
3565+
if (new_mtu > ETH_DATA_LEN)
3566+
return -EINVAL;
3567+
3568+
return 0;
3569+
}
3570+
35603571
if (dsa_is_dsa_port(ds, port) || dsa_is_cpu_port(ds, port))
35613572
new_mtu += EDSA_HLEN;
35623573

@@ -3565,9 +3576,6 @@ static int mv88e6xxx_change_mtu(struct dsa_switch *ds, int port, int new_mtu)
35653576
ret = chip->info->ops->port_set_jumbo_size(chip, port, new_mtu);
35663577
else if (chip->info->ops->set_max_frame_size)
35673578
ret = chip->info->ops->set_max_frame_size(chip, new_mtu);
3568-
else
3569-
if (new_mtu > 1522)
3570-
ret = -EINVAL;
35713579
mv88e6xxx_reg_unlock(chip);
35723580

35733581
return ret;

0 commit comments

Comments
 (0)