UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

fs_enet: Align receive buffers. 

At least some hardware driven by this driver needs receive buffers
to be aligned on a 16-byte boundary.  This usually happens by chance,
but it breaks if slab debugging is enabled.

Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Scott Wood 2007-10-01 14:20:52 -05:00 committed by David S. Miller
parent c6565331b7
commit 0d0d9c150c
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/net/fs_enet/fs_enet-main.c
View File

@ -70,6 +70,14 @@ static void fs_set_multicast_list(struct net_device *dev)
(*fep->ops->set_multicast_list)(dev); (*fep->ops->set_multicast_list)(dev);
} }
static void skb_align(struct sk_buff *skb, int align)
{
int off = ((unsigned long)skb->data) & (align - 1);
if (off)
skb_reserve(skb, align - off);
}
/* NAPI receive function */ /* NAPI receive function */
static int fs_enet_rx_napi(struct napi_struct *napi, int budget) static int fs_enet_rx_napi(struct napi_struct *napi, int budget)
{ {
@ -159,9 +167,13 @@ static int fs_enet_rx_napi(struct napi_struct *napi, int budget)
skb = skbn; skb = skbn;
skbn = skbt; skbn = skbt;
} }
} else } else {
skbn = dev_alloc_skb(ENET_RX_FRSIZE); skbn = dev_alloc_skb(ENET_RX_FRSIZE);
if (skbn)
skb_align(skbn, ENET_RX_ALIGN);
}
if (skbn != NULL) { if (skbn != NULL) {
skb_put(skb, pkt_len); /* Make room */ skb_put(skb, pkt_len); /* Make room */
skb->protocol = eth_type_trans(skb, dev); skb->protocol = eth_type_trans(skb, dev);
@ -290,9 +302,13 @@ static int fs_enet_rx_non_napi(struct net_device *dev)
skb = skbn; skb = skbn;
skbn = skbt; skbn = skbt;
} }
} else } else {
skbn = dev_alloc_skb(ENET_RX_FRSIZE); skbn = dev_alloc_skb(ENET_RX_FRSIZE);
if (skbn)
skb_align(skbn, ENET_RX_ALIGN);
}
if (skbn != NULL) { if (skbn != NULL) {
skb_put(skb, pkt_len); /* Make room */ skb_put(skb, pkt_len); /* Make room */
skb->protocol = eth_type_trans(skb, dev); skb->protocol = eth_type_trans(skb, dev);
@ -502,6 +518,7 @@ void fs_init_bds(struct net_device *dev)
dev->name); dev->name);
break; break;
} }
skb_align(skb, ENET_RX_ALIGN);
fep->rx_skbuff[i] = skb; fep->rx_skbuff[i] = skb;
CBDW_BUFADDR(bdp, CBDW_BUFADDR(bdp,
dma_map_single(fep->dev, skb->data, dma_map_single(fep->dev, skb->data,

3
drivers/net/fs_enet/fs_enet.h
View File

@ -82,7 +82,8 @@ struct phy_info {
/* Must be a multiple of 32 (to cover both FEC & FCC) */ /* Must be a multiple of 32 (to cover both FEC & FCC) */
#define PKT_MAXBLR_SIZE ((PKT_MAXBUF_SIZE + 31) & ~31) #define PKT_MAXBLR_SIZE ((PKT_MAXBUF_SIZE + 31) & ~31)
/* This is needed so that invalidate_xxx wont invalidate too much */ /* This is needed so that invalidate_xxx wont invalidate too much */
#define ENET_RX_FRSIZE L1_CACHE_ALIGN(PKT_MAXBUF_SIZE) #define ENET_RX_ALIGN 16
#define ENET_RX_FRSIZE L1_CACHE_ALIGN(PKT_MAXBUF_SIZE + ENET_RX_ALIGN - 1)
struct fs_enet_mii_bus { struct fs_enet_mii_bus {
struct list_head list; struct list_head list;