Commit 9b2c2ff7 authored by Saeed Bishara's avatar Saeed Bishara Committed by David S. Miller

mv643xx_eth: use sw csum for big packets

Some controllers (KW, Dove) limits the TX IP/layer4 checksum offloading to a max size.
Signed-off-by: default avatarSaeed Bishara <saeed@marvell.com>
Acked-by: default avatarLennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 08e554b1
...@@ -289,6 +289,7 @@ struct mv643xx_eth_shared_private { ...@@ -289,6 +289,7 @@ struct mv643xx_eth_shared_private {
unsigned int t_clk; unsigned int t_clk;
int extended_rx_coal_limit; int extended_rx_coal_limit;
int tx_bw_control; int tx_bw_control;
int tx_csum_limit;
}; };
#define TX_BW_CONTROL_ABSENT 0 #define TX_BW_CONTROL_ABSENT 0
...@@ -776,13 +777,16 @@ static int txq_submit_skb(struct tx_queue *txq, struct sk_buff *skb) ...@@ -776,13 +777,16 @@ static int txq_submit_skb(struct tx_queue *txq, struct sk_buff *skb)
l4i_chk = 0; l4i_chk = 0;
if (skb->ip_summed == CHECKSUM_PARTIAL) { if (skb->ip_summed == CHECKSUM_PARTIAL) {
int hdr_len;
int tag_bytes; int tag_bytes;
BUG_ON(skb->protocol != htons(ETH_P_IP) && BUG_ON(skb->protocol != htons(ETH_P_IP) &&
skb->protocol != htons(ETH_P_8021Q)); skb->protocol != htons(ETH_P_8021Q));
tag_bytes = (void *)ip_hdr(skb) - (void *)skb->data - ETH_HLEN; hdr_len = (void *)ip_hdr(skb) - (void *)skb->data;
if (unlikely(tag_bytes & ~12)) { tag_bytes = hdr_len - ETH_HLEN;
if (skb->len - hdr_len > mp->shared->tx_csum_limit ||
unlikely(tag_bytes & ~12)) {
if (skb_checksum_help(skb) == 0) if (skb_checksum_help(skb) == 0)
goto no_csum; goto no_csum;
kfree_skb(skb); kfree_skb(skb);
...@@ -2666,6 +2670,7 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev) ...@@ -2666,6 +2670,7 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)
* Detect hardware parameters. * Detect hardware parameters.
*/ */
msp->t_clk = (pd != NULL && pd->t_clk != 0) ? pd->t_clk : 133000000; msp->t_clk = (pd != NULL && pd->t_clk != 0) ? pd->t_clk : 133000000;
msp->tx_csum_limit = pd->tx_csum_limit ? pd->tx_csum_limit : 9 * 1024;
infer_hw_params(msp); infer_hw_params(msp);
platform_set_drvdata(pdev, msp); platform_set_drvdata(pdev, msp);
......
...@@ -19,6 +19,11 @@ struct mv643xx_eth_shared_platform_data { ...@@ -19,6 +19,11 @@ struct mv643xx_eth_shared_platform_data {
struct mbus_dram_target_info *dram; struct mbus_dram_target_info *dram;
struct platform_device *shared_smi; struct platform_device *shared_smi;
unsigned int t_clk; unsigned int t_clk;
/*
* Max packet size for Tx IP/Layer 4 checksum, when set to 0, default
* limit of 9KiB will be used.
*/
int tx_csum_limit;
}; };
#define MV643XX_ETH_PHY_ADDR_DEFAULT 0 #define MV643XX_ETH_PHY_ADDR_DEFAULT 0
......
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