The patch titled
subdance: solve host error problem in low performance embedded system when continune down and up
has been added to the -mm tree. Its filename is
sundance-solve-host-error-problem-in-low-performance-embedded.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: subdance: solve host error problem in low performance embedded system when continune down and up
From: Jesse Huang <jesse@xxxxxxxxxxxxx>
Solve host error problem in low performance embedded system when continune
down and up.
Signed-off-by: Jesse Huang <jesse@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/sundance.c | 26 +++++++++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff -puN drivers/net/sundance.c~sundance-solve-host-error-problem-in-low-performance-embedded drivers/net/sundance.c
--- a/drivers/net/sundance.c~sundance-solve-host-error-problem-in-low-performance-embedded
+++ a/drivers/net/sundance.c
@@ -1643,6 +1643,14 @@ static int netdev_close(struct net_devic
struct sk_buff *skb;
int i;
+ /* Wait and kill tasklet */
+ tasklet_kill(&np->rx_tasklet);
+ tasklet_kill(&np->tx_tasklet);
+ np->cur_tx = 0;
+ np->dirty_tx = 0;
+ np->cur_task = 0;
+ np->last_tx = 0;
+
netif_stop_queue(dev);
if (netif_msg_ifdown(np)) {
@@ -1663,9 +1671,20 @@ static int netdev_close(struct net_devic
/* Stop the chip's Tx and Rx processes. */
iowrite16(TxDisable | RxDisable | StatsDisable, ioaddr + MACCtrl1);
- /* Wait and kill tasklet */
- tasklet_kill(&np->rx_tasklet);
- tasklet_kill(&np->tx_tasklet);
+ for (i = 2000; i > 0; i--) {
+ if ((ioread32(ioaddr + DMACtrl) &0xC000) == 0)
+ break;
+ mdelay(1);
+ }
+
+ iowrite16(GlobalReset | DMAReset | FIFOReset | NetworkReset, ioaddr +ASICCtrl + 2);
+
+ for (i = 2000; i > 0; i--)
+ {
+ if ((ioread16(ioaddr + ASICCtrl +2) &ResetBusy) == 0)
+ break;
+ mdelay(1);
+ }
#ifdef __i386__
if (netif_msg_hw(np)) {
@@ -1703,6 +1722,7 @@ static int netdev_close(struct net_devic
}
}
for (i = 0; i < TX_RING_SIZE; i++) {
+ np->tx_ring[i].next_desc = 0;
skb = np->tx_skbuff[i];
if (skb) {
pci_unmap_single(np->pci_dev,
_
Patches currently in -mm which might be from jesse@xxxxxxxxxxxxx are
sundance-remove-txstartthresh-and-rxearlythresh.patch
sundance-fix-tx-pause-bug-reset_tx-intr_handler.patch
sundance-change-phy-address-search-from-phy=1-to-phy=0.patch
sundance-correct-initial-and-close-hardware-step.patch
sundance-solve-host-error-problem-in-low-performance-embedded.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
