* Re: [PATCH 2/5] Fix TX Pause bug (reset_tx, intr_handler)
2006-10-02 18:24 [PATCH 2/5] Fix TX Pause bug (reset_tx, intr_handler) Jesse Huang
@ 2006-10-02 6:53 ` Andrew Morton
2006-10-02 9:54 ` Jesse Huang
0 siblings, 1 reply; 4+ messages in thread
From: Andrew Morton @ 2006-10-02 6:53 UTC (permalink / raw)
To: Jesse Huang; +Cc: linux-kernel, netdev, jgarzik
On Mon, 02 Oct 2006 14:24:36 -0400
Jesse Huang <jesse@icplus.com.tw> wrote:
> Fix TX Pause bug (reset_tx, intr_handler)
Please describe this bug more completely. How does this patch solve it?
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/5] Fix TX Pause bug (reset_tx, intr_handler)
2006-10-02 6:53 ` Andrew Morton
@ 2006-10-02 9:54 ` Jesse Huang
0 siblings, 0 replies; 4+ messages in thread
From: Jesse Huang @ 2006-10-02 9:54 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, netdev, jgarzik
When TxUnderrun happen, driver will re-enable tx. But during
this enable process, TxUnderrun maybe happen again. So driver
need to make sure Tx was actually enabled.
----- Original Message -----
From: "Andrew Morton" <akpm@osdl.org>
To: "Jesse Huang" <jesse@icplus.com.tw>
Cc: <linux-kernel@vger.kernel.org>; <netdev@vger.kernel.org>;
<jgarzik@pobox.com>
Sent: Monday, October 02, 2006 2:53 PM
Subject: Re: [PATCH 2/5] Fix TX Pause bug (reset_tx, intr_handler)
On Mon, 02 Oct 2006 14:24:36 -0400
Jesse Huang <jesse@icplus.com.tw> wrote:
> Fix TX Pause bug (reset_tx, intr_handler)
Please describe this bug more completely. How does this patch solve it?
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/5] Fix TX Pause bug (reset_tx, intr_handler)
@ 2006-10-02 18:24 Jesse Huang
2006-10-02 6:53 ` Andrew Morton
0 siblings, 1 reply; 4+ messages in thread
From: Jesse Huang @ 2006-10-02 18:24 UTC (permalink / raw)
To: linux-kernel, netdev, akpm, jgarzik, jesse
From: Jesse Huang <jesse@icplus.com.tw>
Change Logs:
Fix TX Pause bug (reset_tx, intr_handler)
Signed-off-by: Jesse Huang <jesse@icplus.com.tw>
---
drivers/net/sundance.c | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
e146d4c423de9c2e9d55fbf9c6b3abbee14ce9ac
diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c
index a5dd1c3..11ca31e 100755
--- a/drivers/net/sundance.c
+++ b/drivers/net/sundance.c
@@ -1079,6 +1079,8 @@ reset_tx (struct net_device *dev)
/* free all tx skbuff */
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,
@@ -1094,6 +1096,10 @@ reset_tx (struct net_device *dev)
}
np->cur_tx = np->dirty_tx = 0;
np->cur_task = 0;
+
+ np->last_tx = 0;
+ iowrite8(127, ioaddr + TxDMAPollPeriod);
+
iowrite16 (StatsEnable | RxEnable | TxEnable, ioaddr + MACCtrl1);
return 0;
}
@@ -1162,8 +1168,14 @@ static irqreturn_t intr_handler(int irq,
sundance_reset(dev, (NetworkReset|FIFOReset|TxReset) << 16);
/* No need to reset the Tx pointer here */
}
- /* Restart the Tx. */
- iowrite16 (TxEnable, ioaddr + MACCtrl1);
+ /* Restart the Tx. Need to make sure tx enabled */
+ i = 10;
+ do {
+ iowrite16(ioread16(ioaddr + MACCtrl1) | TxEnable, ioaddr + MACCtrl1);
+ if (ioread16(ioaddr + MACCtrl1) & TxEnabled)
+ break;
+ mdelay(1);
+ } while (--i);
}
/* Yup, this is a documentation bug. It cost me *hours*. */
iowrite16 (0, ioaddr + TxStatus);
--
1.3.GIT
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/5] Fix TX Pause bug (reset_tx, intr_handler)
@ 2006-10-14 19:55 Jesse Huang
0 siblings, 0 replies; 4+ messages in thread
From: Jesse Huang @ 2006-10-14 19:55 UTC (permalink / raw)
To: linux-kernel, netdev, akpm, jgarzik, jesse
From: Jesse Huang <jesse@icplus.com.tw>
Change Logs:
Fix TX Pause bug (reset_tx, intr_handler). When MaxCollisions occurred, need to
re-enable Tx. But just after re-enable, MaxCollisions maybe occurred again and
with TxStatusOverflow. This will cause driver can't check new MaxCollisions to
re-enable Tx again, because TxStatusOverflow. For this reason, after re-enable
Tx, we need to make sure Tx was actually enabled.
Signed-off-by: Jesse Huang <jesse@icplus.com.tw>
---
drivers/net/sundance.c | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
e146d4c423de9c2e9d55fbf9c6b3abbee14ce9ac
diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c
index a5dd1c3..11ca31e 100755
--- a/drivers/net/sundance.c
+++ b/drivers/net/sundance.c
@@ -1079,6 +1079,8 @@ reset_tx (struct net_device *dev)
/* free all tx skbuff */
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,
@@ -1094,6 +1096,10 @@ reset_tx (struct net_device *dev)
}
np->cur_tx = np->dirty_tx = 0;
np->cur_task = 0;
+
+ np->last_tx = 0;
+ iowrite8(127, ioaddr + TxDMAPollPeriod);
+
iowrite16 (StatsEnable | RxEnable | TxEnable, ioaddr + MACCtrl1);
return 0;
}
@@ -1162,8 +1168,14 @@ static irqreturn_t intr_handler(int irq,
sundance_reset(dev, (NetworkReset|FIFOReset|TxReset) << 16);
/* No need to reset the Tx pointer here */
}
- /* Restart the Tx. */
- iowrite16 (TxEnable, ioaddr + MACCtrl1);
+ /* Restart the Tx. Need to make sure tx enabled */
+ i = 10;
+ do {
+ iowrite16(ioread16(ioaddr + MACCtrl1) | TxEnable, ioaddr + MACCtrl1);
+ if (ioread16(ioaddr + MACCtrl1) & TxEnabled)
+ break;
+ mdelay(1);
+ } while (--i);
}
/* Yup, this is a documentation bug. It cost me *hours*. */
iowrite16 (0, ioaddr + TxStatus);
--
1.3.GIT
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2006-10-14 8:11 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-10-02 18:24 [PATCH 2/5] Fix TX Pause bug (reset_tx, intr_handler) Jesse Huang
2006-10-02 6:53 ` Andrew Morton
2006-10-02 9:54 ` Jesse Huang
-- strict thread matches above, loose matches on Subject: below --
2006-10-14 19:55 Jesse Huang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).