diff mbox

[2.6.33] net: Fix ks8851 snl receive problem

Message ID 14385191E87B904DBD836449AA30269D021A44@MORGANITE.micrel.com
State Changes Requested, archived
Delegated to: David Miller
Headers show

Commit Message

Ha, Tristram Dec. 21, 2009, 9:29 p.m. UTC 
From: Tristram Ha <Tristram.Ha@micrel.com>

This fixes a receive problem of the ks8851 snl network driver.  Under heavy TCP traffic the device will stop operating correctly.  First the receive interrupt is not triggered anymore.  After then the driver cannot retrieve the correct packets from the device.  A workaround for this problem is to disable the transmit done interrupt.

Signed-off-by: Tristram Ha <Tristram.Ha@micrel.com>
---
This patch has some relations to two previous patches I submitted: "[PATH 2.6.32 2/3] net: Fix ks8851 snl transmit problem" and "[PATCH 2.6.32 3/3] net: Make ks8851 snl work under Beagle Zippy combo board."  Please see my replies regarding those patches.

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

stephen hemminger Dec. 22, 2009, 12:49 a.m. UTC | #1 
On Mon, 21 Dec 2009 13:29:42 -0800
"Ha, Tristram" <Tristram.Ha@Micrel.Com> wrote:

> From: Tristram Ha <Tristram.Ha@micrel.com>
> 
> This fixes a receive problem of the ks8851 snl network driver.  Under heavy TCP traffic the device will stop operating correctly.  First the receive interrupt is not triggered anymore.  After then the driver cannot retrieve the correct packets from the device.  A workaround for this problem is to disable the transmit done interrupt.
> 
> Signed-off-by: Tristram Ha <Tristram.Ha@micrel.com>
> ---
> This patch has some relations to two previous patches I submitted: "[PATH 2.6.32 2/3] net: Fix ks8851 snl transmit problem" and "[PATCH 2.6.32 3/3] net: Make ks8851 snl work under Beagle Zippy combo board."  Please see my replies regarding those patches.
> 
> --- linux-2.6.33-rc1.old/drivers/net/ks8851.c	2009-12-08 17:46:20.000000000 -0800
> +++ linux-2.6.33-rc1.new/drivers/net/ks8851.c	2009-12-21 10:43:43.000000000 -0800
> @@ -551,6 +551,13 @@ static void ks8851_irq_work(struct work_
>  
>  	mutex_lock(&ks->lock);
>  
> +	/*
> +	 * Turn off hardware interrupt during receive processing.  This fixes
> +	 * the receive problem under heavy TCP traffic while transmit done
> +	 * is enabled.
> +	 */
> +	ks8851_wrreg16(ks, KS_IER, 0);
> +
>  	status = ks8851_rdreg16(ks, KS_ISR);
>  
>  	if (netif_msg_intr(ks))
> @@ -621,6 +628,9 @@ static void ks8851_irq_work(struct work_
>  		ks8851_wrreg16(ks, KS_RXCR1, rxc->rxcr1);
>  	}
>  
> +	/* Re-enable hardware interrupt. */
> +	ks8851_wrreg16(ks, KS_IER, ks->rc_ier);
> +
>  	mutex_unlock(&ks->lock);
>  
>  	if (status & IRQ_TXI)

If you can turn off the receive interupt you can probably implement
NAPI, to do proper receive scheduling.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

--- linux-2.6.33-rc1.old/drivers/net/ks8851.c	2009-12-08 17:46:20.000000000 -0800
+++ linux-2.6.33-rc1.new/drivers/net/ks8851.c	2009-12-21 10:43:43.000000000 -0800
@@ -551,6 +551,13 @@  static void ks8851_irq_work(struct work_
 
 	mutex_lock(&ks->lock);
 
+	/*
+	 * Turn off hardware interrupt during receive processing.  This fixes
+	 * the receive problem under heavy TCP traffic while transmit done
+	 * is enabled.
+	 */
+	ks8851_wrreg16(ks, KS_IER, 0);
+
 	status = ks8851_rdreg16(ks, KS_ISR);
 
 	if (netif_msg_intr(ks))
@@ -621,6 +628,9 @@  static void ks8851_irq_work(struct work_
 		ks8851_wrreg16(ks, KS_RXCR1, rxc->rxcr1);
 	}
 
+	/* Re-enable hardware interrupt. */
+	ks8851_wrreg16(ks, KS_IER, ks->rc_ier);
+
 	mutex_unlock(&ks->lock);
 
 	if (status & IRQ_TXI)