Commit 31f817e9 authored by Jesse Huang's avatar Jesse Huang Committed by Jeff Garzik
Browse files

[PATCH] sundance: solve host error problem in low performance embedded system... 


[PATCH] sundance: solve host error problem in low performance embedded system when continune down and up

Solve host error problem in low performance embedded system when continune
down and up.  It will cause IP100A DMA TargetAbort.  So we need more safe
process to up and down IP100A with wait hardware completely stop and software
cur_tx/ dirty_tx/cur_task/last_tx be clear.

Signed-off-by: default avatarJesse Huang <jesse@icplus.com.tw>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent d0bb53e1

drivers/net/sundance.c

+23 −3
Original line number Diff line number Diff line
@@ -1642,6 +1642,14 @@ static int netdev_close(struct net_device *dev) 
	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)) {
@@ -1662,9 +1670,20 @@ static int netdev_close(struct net_device *dev) 
	/* 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)) {
@@ -1702,6 +1721,7 @@ static int netdev_close(struct net_device *dev) 
		}

	}

	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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE