[PATCH] forcedeth fix: tx/rx reset

[PATCH] forcedeth fix: tx/rx reset

[Ayaz Abdulla]

[-- Attachment #1: Type: text/plain, Size: 231 bytes --]

This patch keeps the HW reset for tx/rx asserted until DMA is enabled.
This is to ensure that all tx/rx initialization (i.e ring setup) is
finished before de-asserting the reset.

Signed-off-by: Ayaz Abdulla <aabdulla@nvidia.com>


[-- Attachment #2: patch-forcedeth-reset --]
[-- Type: text/plain, Size: 1609 bytes --]

--- old/drivers/net/forcedeth.c	2008-08-25 13:02:17.000000000 -0400
+++ new/drivers/net/forcedeth.c	2008-08-25 13:02:20.000000000 -0400
@@ -233,7 +233,7 @@
 	NvRegTxRxControl = 0x144,
 #define NVREG_TXRXCTL_KICK	0x0001
 #define NVREG_TXRXCTL_BIT1	0x0002
-#define NVREG_TXRXCTL_BIT2	0x0004
+#define NVREG_TXRXCTL_DMA_DISABLE	0x0004
 #define NVREG_TXRXCTL_IDLE	0x0008
 #define NVREG_TXRXCTL_RESET	0x0010
 #define NVREG_TXRXCTL_RXCHECK	0x0400
@@ -1555,11 +1555,9 @@
 	u8 __iomem *base = get_hwbase(dev);
 
 	dprintk(KERN_DEBUG "%s: nv_txrx_reset\n", dev->name);
-	writel(NVREG_TXRXCTL_BIT2 | NVREG_TXRXCTL_RESET | np->txrxctl_bits, base + NvRegTxRxControl);
+	writel(NVREG_TXRXCTL_DMA_DISABLE | NVREG_TXRXCTL_RESET | np->txrxctl_bits, base + NvRegTxRxControl);
 	pci_push(base);
 	udelay(NV_TXRX_RESET_DELAY);
-	writel(NVREG_TXRXCTL_BIT2 | np->txrxctl_bits, base + NvRegTxRxControl);
-	pci_push(base);
 }
 
 static void nv_mac_reset(struct net_device *dev)
@@ -1570,7 +1568,7 @@
 
 	dprintk(KERN_DEBUG "%s: nv_mac_reset\n", dev->name);
 
-	writel(NVREG_TXRXCTL_BIT2 | NVREG_TXRXCTL_RESET | np->txrxctl_bits, base + NvRegTxRxControl);
+	writel(NVREG_TXRXCTL_DMA_DISABLE | NVREG_TXRXCTL_RESET | np->txrxctl_bits, base + NvRegTxRxControl);
 	pci_push(base);
 
 	/* save registers since they will be cleared on reset */
@@ -1589,9 +1587,6 @@
 	writel(temp1, base + NvRegMacAddrA);
 	writel(temp2, base + NvRegMacAddrB);
 	writel(temp3, base + NvRegTransmitPoll);
-
-	writel(NVREG_TXRXCTL_BIT2 | np->txrxctl_bits, base + NvRegTxRxControl);
-	pci_push(base);
 }
 
 static void nv_get_hw_stats(struct net_device *dev)

Re: [PATCH] forcedeth fix: tx/rx reset

[Ayaz Abdulla]

I am retracting this path for the time being because we believe there is 
other circumstances in play. Once the final root cause is found, I can 
send out the correct patch.

Ayaz


Ayaz Abdulla wrote:
> This patch keeps the HW reset for tx/rx asserted until DMA is enabled.
> This is to ensure that all tx/rx initialization (i.e ring setup) is
> finished before de-asserting the reset.
> 
> Signed-off-by: Ayaz Abdulla <aabdulla@nvidia.com>
> 
> 
> ------------------------------------------------------------------------
> 
> --- old/drivers/net/forcedeth.c	2008-08-25 13:02:17.000000000 -0400
> +++ new/drivers/net/forcedeth.c	2008-08-25 13:02:20.000000000 -0400
> @@ -233,7 +233,7 @@
>  	NvRegTxRxControl = 0x144,
>  #define NVREG_TXRXCTL_KICK	0x0001
>  #define NVREG_TXRXCTL_BIT1	0x0002
> -#define NVREG_TXRXCTL_BIT2	0x0004
> +#define NVREG_TXRXCTL_DMA_DISABLE	0x0004
>  #define NVREG_TXRXCTL_IDLE	0x0008
>  #define NVREG_TXRXCTL_RESET	0x0010
>  #define NVREG_TXRXCTL_RXCHECK	0x0400
> @@ -1555,11 +1555,9 @@
>  	u8 __iomem *base = get_hwbase(dev);
>  
>  	dprintk(KERN_DEBUG "%s: nv_txrx_reset\n", dev->name);
> -	writel(NVREG_TXRXCTL_BIT2 | NVREG_TXRXCTL_RESET | np->txrxctl_bits, base + NvRegTxRxControl);
> +	writel(NVREG_TXRXCTL_DMA_DISABLE | NVREG_TXRXCTL_RESET | np->txrxctl_bits, base + NvRegTxRxControl);
>  	pci_push(base);
>  	udelay(NV_TXRX_RESET_DELAY);
> -	writel(NVREG_TXRXCTL_BIT2 | np->txrxctl_bits, base + NvRegTxRxControl);
> -	pci_push(base);
>  }
>  
>  static void nv_mac_reset(struct net_device *dev)
> @@ -1570,7 +1568,7 @@
>  
>  	dprintk(KERN_DEBUG "%s: nv_mac_reset\n", dev->name);
>  
> -	writel(NVREG_TXRXCTL_BIT2 | NVREG_TXRXCTL_RESET | np->txrxctl_bits, base + NvRegTxRxControl);
> +	writel(NVREG_TXRXCTL_DMA_DISABLE | NVREG_TXRXCTL_RESET | np->txrxctl_bits, base + NvRegTxRxControl);
>  	pci_push(base);
>  
>  	/* save registers since they will be cleared on reset */
> @@ -1589,9 +1587,6 @@
>  	writel(temp1, base + NvRegMacAddrA);
>  	writel(temp2, base + NvRegMacAddrB);
>  	writel(temp3, base + NvRegTransmitPoll);
> -
> -	writel(NVREG_TXRXCTL_BIT2 | np->txrxctl_bits, base + NvRegTxRxControl);
> -	pci_push(base);
>  }
>  
>  static void nv_get_hw_stats(struct net_device *dev)
>