Home » Mailing list archives » linux-netdev » 2009 » April » 16

[PATCH 1/2] macb: Handle Retry Limit Exceeded errors

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Haavard Skinnemoen
Subject: [PATCH 1/2] macb: Handle Retry Limit Exceeded errors
Date: Thursday, April 16, 2009 - 2:32 am

From: Erik Waling <erik.waling@konftel.se>

When transfering large amounts of data we sometimes experienced that the
Retry Limit Exceeded (RLE) bit got set in TSR during transmission
attempts. When this happened the driver would stall in a state that
prevented any more data from being sent.

Signed-off-by: Erik Waling <erik.waling@konftel.com>
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
---
 drivers/net/macb.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index f505010..22a595c 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -316,10 +316,11 @@ static void macb_tx(struct macb *bp)
 	dev_dbg(&bp->pdev->dev, "macb_tx status = %02lx\n",
 		(unsigned long)status);
 
-	if (status & MACB_BIT(UND)) {
+	if (status & (MACB_BIT(UND) | MACB_BIT(TSR_RLE))) {
 		int i;
-		printk(KERN_ERR "%s: TX underrun, resetting buffers\n",
-			bp->dev->name);
+		printk(KERN_ERR "%s: TX %s, resetting buffers\n",
+			bp->dev->name, status & MACB_BIT(UND) ?
+			"underrun" : "retry limit exceeded");
 
 		/* Transfer ongoing, disable transmitter, to avoid confusion */
 		if (status & MACB_BIT(TGO))
@@ -590,7 +591,8 @@ static irqreturn_t macb_interrupt(int irq, void *dev_id)
 			}
 		}
 
-		if (status & (MACB_BIT(TCOMP) | MACB_BIT(ISR_TUND)))
+		if (status & (MACB_BIT(TCOMP) | MACB_BIT(ISR_TUND) |
+			    MACB_BIT(ISR_RLE)))
 			macb_tx(bp);
 
 		/*
-- 
1.6.0.4

--
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
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 1/2] macb: Handle Retry Limit Exceeded errors, Haavard Skinnemoen, (Thu Apr 16, 2:32 am)
[PATCH 2/2] macb: process the RX ring regardless of interr ..., Haavard Skinnemoen, (Thu Apr 16, 2:32 am)
RE: [PATCH 2/2] macb: process the RX ring regardless of in ..., Gerard Kam, (Thu Apr 16, 11:41 am)
Re: [PATCH 1/2] macb: Handle Retry Limit Exceeded errors, David Miller, (Fri Apr 17, 1:30 am)
Re: [PATCH 2/2] macb: process the RX ring regardless of in ..., David Miller, (Fri Apr 17, 1:31 am)