kernel: bgmac: update patches
[openwrt.git] / target / linux / generic / patches-3.10 / 776-bgmac-add-dma-sync.patch
1 From 88d0993dbe84a9b88212a4845fca28bf4c919ffb Mon Sep 17 00:00:00 2001
2 From: Hauke Mehrtens <hauke@hauke-m.de>
3 Date: Tue, 26 Nov 2013 23:59:32 +0100
4 Subject: [PATCH 14/16] bgmac: stuff
5
6 ---
7  drivers/net/ethernet/broadcom/bgmac.c |    7 +++++++
8  1 file changed, 7 insertions(+)
9
10 --- a/drivers/net/ethernet/broadcom/bgmac.c
11 +++ b/drivers/net/ethernet/broadcom/bgmac.c
12 @@ -120,6 +120,7 @@ static netdev_tx_t bgmac_dma_tx_add(stru
13         struct net_device *net_dev = bgmac->net_dev;
14         struct bgmac_dma_desc *dma_desc;
15         struct bgmac_slot_info *slot;
16 +       int size = ring->num_slots * sizeof(struct bgmac_dma_desc);
17         u32 ctl0, ctl1;
18         int free_slots;
19  
20 @@ -160,6 +161,8 @@ static netdev_tx_t bgmac_dma_tx_add(stru
21         dma_desc->ctl0 = cpu_to_le32(ctl0);
22         dma_desc->ctl1 = cpu_to_le32(ctl1);
23  
24 +       dma_sync_single_for_device(dma_dev, ring->dma_base, size, DMA_TO_DEVICE);
25 +
26         netdev_sent_queue(net_dev, skb->len);
27  
28         wmb();
29 @@ -311,6 +314,8 @@ static void bgmac_dma_rx_setup_desc(stru
30                                     struct bgmac_dma_ring *ring, int desc_idx)
31  {
32         struct bgmac_dma_desc *dma_desc = ring->cpu_base + desc_idx;
33 +       struct device *dma_dev = bgmac->core->dma_dev;
34 +       int size = ring->num_slots * sizeof(struct bgmac_dma_desc);
35         u32 ctl0 = 0, ctl1 = 0;
36  
37         if (desc_idx == ring->num_slots - 1)
38 @@ -325,6 +330,8 @@ static void bgmac_dma_rx_setup_desc(stru
39         dma_desc->addr_high = cpu_to_le32(upper_32_bits(ring->slots[desc_idx].dma_addr));
40         dma_desc->ctl0 = cpu_to_le32(ctl0);
41         dma_desc->ctl1 = cpu_to_le32(ctl1);
42 +
43 +       dma_sync_single_for_device(dma_dev, ring->dma_base, size, DMA_TO_DEVICE);
44  }
45  
46  static int bgmac_dma_rx_read(struct bgmac *bgmac, struct bgmac_dma_ring *ring,