Commit dab531b4 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller

net: systemport: pad packets to a minimum of 68 bytes

Packets need to be at least 64 bytes to enter the switch port logic,
including the FCS, otherwise they will be discarded as RUNT packets.

With packets having Broadcom tags, the 4-bytes tag is first stripped
off the packet, and the packet length is then checked, so we need to
make sure that the packet length with FCS is at least 64 bytes.
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d5e32cc7
...@@ -821,6 +821,7 @@ static netdev_tx_t bcm_sysport_xmit(struct sk_buff *skb, ...@@ -821,6 +821,7 @@ static netdev_tx_t bcm_sysport_xmit(struct sk_buff *skb,
struct bcm_sysport_cb *cb; struct bcm_sysport_cb *cb;
struct netdev_queue *txq; struct netdev_queue *txq;
struct dma_desc *desc; struct dma_desc *desc;
unsigned int skb_len;
dma_addr_t mapping; dma_addr_t mapping;
u32 len_status; u32 len_status;
u16 queue; u16 queue;
...@@ -848,10 +849,25 @@ static netdev_tx_t bcm_sysport_xmit(struct sk_buff *skb, ...@@ -848,10 +849,25 @@ static netdev_tx_t bcm_sysport_xmit(struct sk_buff *skb,
} }
} }
mapping = dma_map_single(kdev, skb->data, skb->len, DMA_TO_DEVICE); /* The Ethernet switch we are interfaced with needs packets to be at
* least 64 bytes (including FCS) otherwise they will be discarded when
* they enter the switch port logic. When Broadcom tags are enabled, we
* need to make sure that packets are at least 68 bytes
* (including FCS and tag) because the length verification is done after
* the Broadcom tag is stripped off the ingress packet.
*/
if (skb_padto(skb, ETH_ZLEN + ENET_BRCM_TAG_LEN)) {
ret = NETDEV_TX_OK;
goto out;
}
skb_len = skb->len < ETH_ZLEN + ENET_BRCM_TAG_LEN ?
ETH_ZLEN + ENET_BRCM_TAG_LEN : skb->len;
mapping = dma_map_single(kdev, skb->data, skb_len, DMA_TO_DEVICE);
if (dma_mapping_error(kdev, mapping)) { if (dma_mapping_error(kdev, mapping)) {
netif_err(priv, tx_err, dev, "DMA map failed at %p (len=%d)\n", netif_err(priv, tx_err, dev, "DMA map failed at %p (len=%d)\n",
skb->data, skb->len); skb->data, skb_len);
ret = NETDEV_TX_OK; ret = NETDEV_TX_OK;
goto out; goto out;
} }
...@@ -860,14 +876,14 @@ static netdev_tx_t bcm_sysport_xmit(struct sk_buff *skb, ...@@ -860,14 +876,14 @@ static netdev_tx_t bcm_sysport_xmit(struct sk_buff *skb,
cb = &ring->cbs[ring->curr_desc]; cb = &ring->cbs[ring->curr_desc];
cb->skb = skb; cb->skb = skb;
dma_unmap_addr_set(cb, dma_addr, mapping); dma_unmap_addr_set(cb, dma_addr, mapping);
dma_unmap_len_set(cb, dma_len, skb->len); dma_unmap_len_set(cb, dma_len, skb_len);
/* Fetch a descriptor entry from our pool */ /* Fetch a descriptor entry from our pool */
desc = ring->desc_cpu; desc = ring->desc_cpu;
desc->addr_lo = lower_32_bits(mapping); desc->addr_lo = lower_32_bits(mapping);
len_status = upper_32_bits(mapping) & DESC_ADDR_HI_MASK; len_status = upper_32_bits(mapping) & DESC_ADDR_HI_MASK;
len_status |= (skb->len << DESC_LEN_SHIFT); len_status |= (skb_len << DESC_LEN_SHIFT);
len_status |= (DESC_SOP | DESC_EOP | TX_STATUS_APP_CRC) << len_status |= (DESC_SOP | DESC_EOP | TX_STATUS_APP_CRC) <<
DESC_STATUS_SHIFT; DESC_STATUS_SHIFT;
if (skb->ip_summed == CHECKSUM_PARTIAL) if (skb->ip_summed == CHECKSUM_PARTIAL)
......
...@@ -29,11 +29,11 @@ ...@@ -29,11 +29,11 @@
/* Default RX buffer allocation size */ /* Default RX buffer allocation size */
#define RX_BUF_LENGTH 2048 #define RX_BUF_LENGTH 2048
/* Body(1500) + EH_SIZE(14) + VLANTAG(4) + BRCMTAG(6) + FCS(4) = 1528. /* Body(1500) + EH_SIZE(14) + VLANTAG(4) + BRCMTAG(4) + FCS(4) = 1526.
* 1536 is multiple of 256 bytes * 1536 is multiple of 256 bytes
*/ */
#define ENET_BRCM_TAG_LEN 6 #define ENET_BRCM_TAG_LEN 4
#define ENET_PAD 8 #define ENET_PAD 10
#define UMAC_MAX_MTU_SIZE (ETH_DATA_LEN + ETH_HLEN + VLAN_HLEN + \ #define UMAC_MAX_MTU_SIZE (ETH_DATA_LEN + ETH_HLEN + VLAN_HLEN + \
ENET_BRCM_TAG_LEN + ETH_FCS_LEN + ENET_PAD) ENET_BRCM_TAG_LEN + ETH_FCS_LEN + ENET_PAD)
......
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