|
|
|
@ -146,7 +146,25 @@ Date: Wed Nov 21 10:27:19 2012 +0000 |
|
|
|
|
|
|
|
|
|
cp_reset_hw(cp);
|
|
|
|
|
|
|
|
|
|
@@ -1192,6 +1230,7 @@ static void cp_tx_timeout(struct net_dev
|
|
|
|
|
@@ -992,17 +1030,6 @@ static void cp_init_hw (struct cp_privat
|
|
|
|
|
|
|
|
|
|
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);
|
|
|
|
|
@@ -1192,6 +1219,7 @@ static void cp_tx_timeout(struct net_dev
|
|
|
|
|
cp_clean_rings(cp);
|
|
|
|
|
rc = cp_init_rings(cp);
|
|
|
|
|
cp_start_hw(cp);
|
|
|
|
|