60 lines
1.9 KiB
Diff
60 lines
1.9 KiB
Diff
|
From 071e3ef4a94a021b16a2912f3885c86f4ff36b49 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "David S. Miller" <davem@davemloft.net>
|
||
|
|
Date: Sun, 25 Nov 2012 15:52:09 -0500
|
||
|
|
Subject: [PATCH] Revert "8139cp: revert "set ring address before enabling
|
||
|
|
receiver""
|
||
|
|
|
||
|
|
This reverts commit b26623dab7eeb1e9f5898c7a49458789dd492f20.
|
||
|
|
|
||
|
|
This reverts the revert, in net-next we'll try another scheme
|
||
|
|
to fix this bug using patches from David Woodhouse.
|
||
|
|
|
||
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||
|
|
---
|
||
|
|
drivers/net/ethernet/realtek/8139cp.c | 22 +++++++++++-----------
|
||
|
|
1 files changed, 11 insertions(+), 11 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c
|
||
|
|
index b01f83a..1c81825 100644
|
||
|
|
--- a/drivers/net/ethernet/realtek/8139cp.c
|
||
|
|
+++ b/drivers/net/ethernet/realtek/8139cp.c
|
||
|
|
@@ -979,6 +979,17 @@ static void cp_init_hw (struct cp_private *cp)
|
||
|
|
cpw32_f (MAC0 + 0, le32_to_cpu (*(__le32 *) (dev->dev_addr + 0)));
|
||
|
|
cpw32_f (MAC0 + 4, le32_to_cpu (*(__le32 *) (dev->dev_addr + 4)));
|
||
|
|
|
||
|
|
+ cpw32_f(HiTxRingAddr, 0);
|
||
|
|
+ cpw32_f(HiTxRingAddr + 4, 0);
|
||
|
|
+
|
||
|
|
+ ring_dma = cp->ring_dma;
|
||
|
|
+ cpw32_f(RxRingAddr, ring_dma & 0xffffffff);
|
||
|
|
+ cpw32_f(RxRingAddr + 4, (ring_dma >> 16) >> 16);
|
||
|
|
+
|
||
|
|
+ ring_dma += sizeof(struct cp_desc) * CP_RX_RING_SIZE;
|
||
|
|
+ cpw32_f(TxRingAddr, ring_dma & 0xffffffff);
|
||
|
|
+ cpw32_f(TxRingAddr + 4, (ring_dma >> 16) >> 16);
|
||
|
|
+
|
||
|
|
cp_start_hw(cp);
|
||
|
|
cpw8(TxThresh, 0x06); /* XXX convert magic num to a constant */
|
||
|
|
|
||
|
|
@@ -992,17 +1003,6 @@ static void cp_init_hw (struct cp_private *cp)
|
||
|
|
|
||
|
|
cpw8(Config5, cpr8(Config5) & PMEStatus);
|
||
|
|
|
||
|
|
- cpw32_f(HiTxRingAddr, 0);
|
||
|
|
- cpw32_f(HiTxRingAddr + 4, 0);
|
||
|
|
-
|
||
|
|
- ring_dma = cp->ring_dma;
|
||
|
|
- cpw32_f(RxRingAddr, ring_dma & 0xffffffff);
|
||
|
|
- cpw32_f(RxRingAddr + 4, (ring_dma >> 16) >> 16);
|
||
|
|
-
|
||
|
|
- ring_dma += sizeof(struct cp_desc) * CP_RX_RING_SIZE;
|
||
|
|
- cpw32_f(TxRingAddr, ring_dma & 0xffffffff);
|
||
|
|
- cpw32_f(TxRingAddr + 4, (ring_dma >> 16) >> 16);
|
||
|
|
-
|
||
|
|
cpw16(MultiIntr, 0);
|
||
|
|
|
||
|
|
cpw8_f(Cfg9346, Cfg9346_Lock);
|
||
|
|
--
|
||
|
|
1.7.6.5
|
||
|
|
|