Commit dc6c0bfb authored by Linus Walleij's avatar Linus Walleij Committed by Jakub Kicinski

net: ethernet: cortina: Fix MTU max setting

The RX max frame size is over 10000 for the Gemini ethernet,
but the TX max frame size is actually just 2047 (0x7ff after
checking the datasheet). Reflect this in what we offer to Linux,
cap the MTU at the TX max frame minus ethernet headers.

We delete the code disabling the hardware checksum for large
MTUs as netdev->mtu can no longer be larger than
netdev->max_mtu meaning the if()-clause in gmac_fix_features()
is never true.

Fixes: 4d5ae32f ("net: ethernet: Add a driver for Gemini gigabit ethernet")
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
Link: https://lore.kernel.org/r/20231109-gemini-largeframe-fix-v4-3-6e611528db08@linaro.orgSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent d4d0c5b4
...@@ -2000,15 +2000,6 @@ static int gmac_change_mtu(struct net_device *netdev, int new_mtu) ...@@ -2000,15 +2000,6 @@ static int gmac_change_mtu(struct net_device *netdev, int new_mtu)
return 0; return 0;
} }
static netdev_features_t gmac_fix_features(struct net_device *netdev,
netdev_features_t features)
{
if (netdev->mtu + ETH_HLEN + VLAN_HLEN > MTU_SIZE_BIT_MASK)
features &= ~GMAC_OFFLOAD_FEATURES;
return features;
}
static int gmac_set_features(struct net_device *netdev, static int gmac_set_features(struct net_device *netdev,
netdev_features_t features) netdev_features_t features)
{ {
...@@ -2234,7 +2225,6 @@ static const struct net_device_ops gmac_351x_ops = { ...@@ -2234,7 +2225,6 @@ static const struct net_device_ops gmac_351x_ops = {
.ndo_set_mac_address = gmac_set_mac_address, .ndo_set_mac_address = gmac_set_mac_address,
.ndo_get_stats64 = gmac_get_stats64, .ndo_get_stats64 = gmac_get_stats64,
.ndo_change_mtu = gmac_change_mtu, .ndo_change_mtu = gmac_change_mtu,
.ndo_fix_features = gmac_fix_features,
.ndo_set_features = gmac_set_features, .ndo_set_features = gmac_set_features,
}; };
...@@ -2486,11 +2476,12 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev) ...@@ -2486,11 +2476,12 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev)
netdev->hw_features = GMAC_OFFLOAD_FEATURES; netdev->hw_features = GMAC_OFFLOAD_FEATURES;
netdev->features |= GMAC_OFFLOAD_FEATURES | NETIF_F_GRO; netdev->features |= GMAC_OFFLOAD_FEATURES | NETIF_F_GRO;
/* We can handle jumbo frames up to 10236 bytes so, let's accept /* We can receive jumbo frames up to 10236 bytes but only
* payloads of 10236 bytes minus VLAN and ethernet header * transmit 2047 bytes so, let's accept payloads of 2047
* bytes minus VLAN and ethernet header
*/ */
netdev->min_mtu = ETH_MIN_MTU; netdev->min_mtu = ETH_MIN_MTU;
netdev->max_mtu = 10236 - VLAN_ETH_HLEN; netdev->max_mtu = MTU_SIZE_BIT_MASK - VLAN_ETH_HLEN;
port->freeq_refill = 0; port->freeq_refill = 0;
netif_napi_add(netdev, &port->napi, gmac_napi_poll); netif_napi_add(netdev, &port->napi, gmac_napi_poll);
......
...@@ -502,7 +502,7 @@ union gmac_txdesc_3 { ...@@ -502,7 +502,7 @@ union gmac_txdesc_3 {
#define SOF_BIT 0x80000000 #define SOF_BIT 0x80000000
#define EOF_BIT 0x40000000 #define EOF_BIT 0x40000000
#define EOFIE_BIT BIT(29) #define EOFIE_BIT BIT(29)
#define MTU_SIZE_BIT_MASK 0x1fff #define MTU_SIZE_BIT_MASK 0x7ff /* Max MTU 2047 bytes */
/* GMAC Tx Descriptor */ /* GMAC Tx Descriptor */
struct gmac_txdesc { struct gmac_txdesc {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment