Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-18 01:51:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

netdev: bfin_mac: invalid data cache only once for each new rx skb buffer

Browse Source 
The skb buffer isn't actually used until we finish transferring and pass
it up to higher layers, so only invalidate the range once before we start
receiving actual data.  This also avoids the problem with data invalidating
on Blackfin systems -- there is no invalidate-only, just invalidate+flush.
So when running in writeback mode, there is the small (but not uncommon)
possibility of the flush overwriting valid DMA-ed data from the cache.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sonic Zhang 2010-05-10 05:39:08 +00:00 committed by David S. Miller
parent ec497b32c3
commit f6e1e4f3e5
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/bfin_mac.c
View File

@ -203,6 +203,11 @@ static int desc_list_init(void)
goto init_error; goto init_error;
} }
skb_reserve(new_skb, NET_IP_ALIGN); skb_reserve(new_skb, NET_IP_ALIGN);
/* Invidate the data cache of skb->data range when it is write back
* cache. It will prevent overwritting the new data from DMA
*/
blackfin_dcache_invalidate_range((unsigned long)new_skb->head,
(unsigned long)new_skb->end);
r->skb = new_skb; r->skb = new_skb;
/* /*
@ -1011,19 +1016,17 @@ static void bfin_mac_rx(struct net_device *dev)
} }
/* reserve 2 bytes for RXDWA padding */ /* reserve 2 bytes for RXDWA padding */
skb_reserve(new_skb, NET_IP_ALIGN); skb_reserve(new_skb, NET_IP_ALIGN);
current_rx_ptr->skb = new_skb;
current_rx_ptr->desc_a.start_addr = (unsigned long)new_skb->data - 2;
/* Invidate the data cache of skb->data range when it is write back /* Invidate the data cache of skb->data range when it is write back
* cache. It will prevent overwritting the new data from DMA * cache. It will prevent overwritting the new data from DMA
*/ */
blackfin_dcache_invalidate_range((unsigned long)new_skb->head, blackfin_dcache_invalidate_range((unsigned long)new_skb->head,
(unsigned long)new_skb->end); (unsigned long)new_skb->end);
current_rx_ptr->skb = new_skb;
current_rx_ptr->desc_a.start_addr = (unsigned long)new_skb->data - 2;
len = (unsigned short)((current_rx_ptr->status.status_word) & RX_FRLEN); len = (unsigned short)((current_rx_ptr->status.status_word) & RX_FRLEN);
skb_put(skb, len); skb_put(skb, len);
blackfin_dcache_invalidate_range((unsigned long)skb->head,
(unsigned long)skb->tail);
skb->protocol = eth_type_trans(skb, dev); skb->protocol = eth_type_trans(skb, dev);