bcm53xx: update the ethernet core hacks
The PHY always says there is no link Instead of doing this dma sync a mdelay does the same trick and it is as unreliable. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 39202
This commit is contained in:
parent
5a55ace3b8
commit
2bc9700c0d
2 changed files with 30 additions and 53 deletions
|
@ -1,46 +0,0 @@
|
|||
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
|
||||
@@ -123,6 +123,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;
|
||||
|
||||
@@ -163,6 +164,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();
|
||||
@@ -313,6 +316,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)
|
||||
@@ -327,6 +332,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,
|
Loading…
Add table
Add a link
Reference in a new issue