Commit 1548a536 authored by Simon Guinot's avatar Simon Guinot Committed by Luis Henriques

net: mvneta: disable IP checksum with jumbo frames for Armada 370

commit b65657fc upstream.

The Ethernet controller found in the Armada 370, 380 and 385 SoCs don't
support TCP/IP checksumming with frame sizes larger than 1600 bytes.

This patch fixes the issue by disabling the features NETIF_F_IP_CSUM and
NETIF_F_TSO for the Armada 370 and compatibles SoCs when the MTU is set
to a value greater than 1600 bytes.
Signed-off-by: default avatarSimon Guinot <simon.guinot@sequanux.org>
Fixes: c5aff182 ("net: mvneta: driver for Marvell Armada 370/XP network unit")
Acked-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
[ luis: backported to 3.16: adjusted context ]
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent 47ce5c73
...@@ -303,6 +303,7 @@ struct mvneta_port { ...@@ -303,6 +303,7 @@ struct mvneta_port {
unsigned int link; unsigned int link;
unsigned int duplex; unsigned int duplex;
unsigned int speed; unsigned int speed;
unsigned int tx_csum_limit;
}; };
/* The mvneta_tx_desc and mvneta_rx_desc structures describe the /* The mvneta_tx_desc and mvneta_rx_desc structures describe the
...@@ -2439,8 +2440,10 @@ static int mvneta_change_mtu(struct net_device *dev, int mtu) ...@@ -2439,8 +2440,10 @@ static int mvneta_change_mtu(struct net_device *dev, int mtu)
dev->mtu = mtu; dev->mtu = mtu;
if (!netif_running(dev)) if (!netif_running(dev)) {
netdev_update_features(dev);
return 0; return 0;
}
/* The interface is running, so we have to force a /* The interface is running, so we have to force a
* reallocation of the queues * reallocation of the queues
...@@ -2469,9 +2472,26 @@ static int mvneta_change_mtu(struct net_device *dev, int mtu) ...@@ -2469,9 +2472,26 @@ static int mvneta_change_mtu(struct net_device *dev, int mtu)
mvneta_start_dev(pp); mvneta_start_dev(pp);
mvneta_port_up(pp); mvneta_port_up(pp);
netdev_update_features(dev);
return 0; return 0;
} }
static netdev_features_t mvneta_fix_features(struct net_device *dev,
netdev_features_t features)
{
struct mvneta_port *pp = netdev_priv(dev);
if (pp->tx_csum_limit && dev->mtu > pp->tx_csum_limit) {
features &= ~(NETIF_F_IP_CSUM | NETIF_F_TSO);
netdev_info(dev,
"Disable IP checksum for MTU greater than %dB\n",
pp->tx_csum_limit);
}
return features;
}
/* Get mac address */ /* Get mac address */
static void mvneta_get_mac_addr(struct mvneta_port *pp, unsigned char *addr) static void mvneta_get_mac_addr(struct mvneta_port *pp, unsigned char *addr)
{ {
...@@ -2789,6 +2809,7 @@ static const struct net_device_ops mvneta_netdev_ops = { ...@@ -2789,6 +2809,7 @@ static const struct net_device_ops mvneta_netdev_ops = {
.ndo_set_rx_mode = mvneta_set_rx_mode, .ndo_set_rx_mode = mvneta_set_rx_mode,
.ndo_set_mac_address = mvneta_set_mac_addr, .ndo_set_mac_address = mvneta_set_mac_addr,
.ndo_change_mtu = mvneta_change_mtu, .ndo_change_mtu = mvneta_change_mtu,
.ndo_fix_features = mvneta_fix_features,
.ndo_get_stats64 = mvneta_get_stats64, .ndo_get_stats64 = mvneta_get_stats64,
.ndo_do_ioctl = mvneta_ioctl, .ndo_do_ioctl = mvneta_ioctl,
}; };
...@@ -3027,6 +3048,9 @@ static int mvneta_probe(struct platform_device *pdev) ...@@ -3027,6 +3048,9 @@ static int mvneta_probe(struct platform_device *pdev)
} }
} }
if (of_device_is_compatible(dn, "marvell,armada-370-neta"))
pp->tx_csum_limit = 1600;
pp->tx_ring_size = MVNETA_MAX_TXD; pp->tx_ring_size = MVNETA_MAX_TXD;
pp->rx_ring_size = MVNETA_MAX_RXD; pp->rx_ring_size = MVNETA_MAX_RXD;
......
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