diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-12-26 23:22:31 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-12-26 23:22:31 +0000 |
| commit | c93b7dd6dbc08e69557a7d93563de6289b5ea1b1 (patch) | |
| tree | bee4d94867e5e543c0dfdd933d746ae5e37ebbd0 /target/linux/generic/patches-3.10/776-bgmac-add-dma-sync.patch | |
| parent | 18a78fcc47e1a8df2abd10e568b0e77e811e3e71 (diff) | |
kernel: bgmac: update patches
This updates the bgmac backport patch to the current upstream version
and adds some more patches mostly for BCM4707.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39165 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.10/776-bgmac-add-dma-sync.patch')
| -rw-r--r-- | target/linux/generic/patches-3.10/776-bgmac-add-dma-sync.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.10/776-bgmac-add-dma-sync.patch b/target/linux/generic/patches-3.10/776-bgmac-add-dma-sync.patch new file mode 100644 index 0000000000..29fdd6b73d --- /dev/null +++ b/target/linux/generic/patches-3.10/776-bgmac-add-dma-sync.patch @@ -0,0 +1,46 @@ +From 88d0993dbe84a9b88212a4845fca28bf4c919ffb Mon Sep 17 00:00:00 2001 +From: Hauke Mehrtens <hauke@hauke-m.de> +Date: Tue, 26 Nov 2013 23:59:32 +0100 +Subject: [PATCH 14/16] bgmac: stuff + +--- + drivers/net/ethernet/broadcom/bgmac.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/drivers/net/ethernet/broadcom/bgmac.c ++++ b/drivers/net/ethernet/broadcom/bgmac.c +@@ -120,6 +120,7 @@ static netdev_tx_t bgmac_dma_tx_add(stru + struct net_device *net_dev = bgmac->net_dev; + struct bgmac_dma_desc *dma_desc; + struct bgmac_slot_info *slot; ++ int size = ring->num_slots * sizeof(struct bgmac_dma_desc); + u32 ctl0, ctl1; + int free_slots; + +@@ -160,6 +161,8 @@ static netdev_tx_t bgmac_dma_tx_add(stru + dma_desc->ctl0 = cpu_to_le32(ctl0); + dma_desc->ctl1 = cpu_to_le32(ctl1); + ++ dma_sync_single_for_device(dma_dev, ring->dma_base, size, DMA_TO_DEVICE); ++ + netdev_sent_queue(net_dev, skb->len); + + wmb(); +@@ -311,6 +314,8 @@ static void bgmac_dma_rx_setup_desc(stru + struct bgmac_dma_ring *ring, int desc_idx) + { + struct bgmac_dma_desc *dma_desc = ring->cpu_base + desc_idx; ++ struct device *dma_dev = bgmac->core->dma_dev; ++ int size = ring->num_slots * sizeof(struct bgmac_dma_desc); + u32 ctl0 = 0, ctl1 = 0; + + if (desc_idx == ring->num_slots - 1) +@@ -325,6 +330,8 @@ static void bgmac_dma_rx_setup_desc(stru + dma_desc->addr_high = cpu_to_le32(upper_32_bits(ring->slots[desc_idx].dma_addr)); + dma_desc->ctl0 = cpu_to_le32(ctl0); + dma_desc->ctl1 = cpu_to_le32(ctl1); ++ ++ dma_sync_single_for_device(dma_dev, ring->dma_base, size, DMA_TO_DEVICE); + } + + static int bgmac_dma_rx_read(struct bgmac *bgmac, struct bgmac_dma_ring *ring, |