lkml.org 
[lkml]   [2021]   [Oct]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 45/93] dsa: mv88e6xxx: Include tagger overhead when setting MTU for DSA and CPU ports
    Date
    From: Andrew Lunn <andrew@lunn.ch>

    [ Upstream commit b9c587fed61cf88bd45822c3159644445f6d5aa6 ]

    Same members of the Marvell Ethernet switches impose MTU restrictions
    on ports used for connecting to the CPU or another switch for DSA. If
    the MTU is set too low, tagged frames will be discarded. Ensure the
    worst case tagger overhead is included in setting the MTU for DSA and
    CPU ports.

    Fixes: 1baf0fac10fb ("net: dsa: mv88e6xxx: Use chip-wide max frame size for MTU")
    Reported by: 曹煜 <cao88yu@gmail.com>
    Signed-off-by: Andrew Lunn <andrew@lunn.ch>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/dsa/mv88e6xxx/chip.c | 9 ++++++---
    drivers/net/dsa/mv88e6xxx/chip.h | 1 +
    2 files changed, 7 insertions(+), 3 deletions(-)

    diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
    index 50bbea220fbf..18388ea5ebd9 100644
    --- a/drivers/net/dsa/mv88e6xxx/chip.c
    +++ b/drivers/net/dsa/mv88e6xxx/chip.c
    @@ -2718,10 +2718,10 @@ static int mv88e6xxx_get_max_mtu(struct dsa_switch *ds, int port)
    struct mv88e6xxx_chip *chip = ds->priv;

    if (chip->info->ops->port_set_jumbo_size)
    - return 10240 - VLAN_ETH_HLEN - ETH_FCS_LEN;
    + return 10240 - VLAN_ETH_HLEN - EDSA_HLEN - ETH_FCS_LEN;
    else if (chip->info->ops->set_max_frame_size)
    - return 1632 - VLAN_ETH_HLEN - ETH_FCS_LEN;
    - return 1522 - VLAN_ETH_HLEN - ETH_FCS_LEN;
    + return 1632 - VLAN_ETH_HLEN - EDSA_HLEN - ETH_FCS_LEN;
    + return 1522 - VLAN_ETH_HLEN - EDSA_HLEN - ETH_FCS_LEN;
    }

    static int mv88e6xxx_change_mtu(struct dsa_switch *ds, int port, int new_mtu)
    @@ -2729,6 +2729,9 @@ static int mv88e6xxx_change_mtu(struct dsa_switch *ds, int port, int new_mtu)
    struct mv88e6xxx_chip *chip = ds->priv;
    int ret = 0;

    + if (dsa_is_dsa_port(ds, port) || dsa_is_cpu_port(ds, port))
    + new_mtu += EDSA_HLEN;
    +
    mv88e6xxx_reg_lock(chip);
    if (chip->info->ops->port_set_jumbo_size)
    ret = chip->info->ops->port_set_jumbo_size(chip, port, new_mtu);
    diff --git a/drivers/net/dsa/mv88e6xxx/chip.h b/drivers/net/dsa/mv88e6xxx/chip.h
    index 81c244fc0419..51a7ff44478e 100644
    --- a/drivers/net/dsa/mv88e6xxx/chip.h
    +++ b/drivers/net/dsa/mv88e6xxx/chip.h
    @@ -18,6 +18,7 @@
    #include <linux/timecounter.h>
    #include <net/dsa.h>

    +#define EDSA_HLEN 8
    #define MV88E6XXX_N_FID 4096

    /* PVT limits for 4-bit port and 5-bit switch */
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-10-04 15:23    [W:4.053 / U:0.176 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site