netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Daniel Hellstrom <daniel@gaisler.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, kristoffer@gaisler.com
Subject: [PATCH 6/7 v2] GRETH: handle frame error interrupts
Date: Fri, 14 Jan 2011 14:02:42 +0100	[thread overview]
Message-ID: <1295010163-2585-6-git-send-email-daniel@gaisler.com> (raw)
In-Reply-To: <1295010163-2585-1-git-send-email-daniel@gaisler.com>

Frame error interrupts must also be handled since the RX flag only indicates
successful reception, it is unlikely but the old code may lead to dead lock
if 128 error frames are recieved in a row.

Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
---
 drivers/net/greth.c |    9 +++++----
 drivers/net/greth.h |    2 ++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/net/greth.c b/drivers/net/greth.c
index e48d182..b888abe 100644
--- a/drivers/net/greth.c
+++ b/drivers/net/greth.c
@@ -586,12 +586,13 @@ static irqreturn_t greth_interrupt(int irq, void *dev_id)
 	status = GRETH_REGLOAD(greth->regs->status);
 
 	/* Handle rx and tx interrupts through poll */
-	if (status & (GRETH_INT_RX | GRETH_INT_TX)) {
+	if (status & (GRETH_INT_RE | GRETH_INT_RX |
+		      GRETH_INT_TE | GRETH_INT_TX)) {
 
 		/* Clear interrupt status */
-		GRETH_REGORIN(greth->regs->status,
-			      status & (GRETH_INT_RX | GRETH_INT_TX));
-
+		GRETH_REGSAVE(greth->regs->status,
+			      status & (GRETH_INT_RE | GRETH_INT_RX |
+					GRETH_INT_TE | GRETH_INT_TX));
 		retval = IRQ_HANDLED;
 
 		/* Disable interrupts and schedule poll() */
diff --git a/drivers/net/greth.h b/drivers/net/greth.h
index 03ad903..be0f206 100644
--- a/drivers/net/greth.h
+++ b/drivers/net/greth.h
@@ -23,6 +23,7 @@
 #define GRETH_BD_LEN 0x7FF
 
 #define GRETH_TXEN 0x1
+#define GRETH_INT_TE 0x2
 #define GRETH_INT_TX 0x8
 #define GRETH_TXI 0x4
 #define GRETH_TXBD_STATUS 0x0001C000
@@ -35,6 +36,7 @@
 #define GRETH_TXBD_ERR_UE 0x4000
 #define GRETH_TXBD_ERR_AL 0x8000
 
+#define GRETH_INT_RE         0x1
 #define GRETH_INT_RX         0x4
 #define GRETH_RXEN           0x2
 #define GRETH_RXI            0x8
-- 
1.5.4


  parent reply	other threads:[~2011-01-14 13:02 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-14 13:02 [PATCH 1/7 v2] GRETH: added raw AMBA vendor/device number to match against Daniel Hellstrom
2011-01-14 13:02 ` [PATCH 2/7 v2] GRETH: fix opening/closing Daniel Hellstrom
2011-01-14 20:46   ` David Miller
2011-01-14 13:02 ` [PATCH 3/7 v2] GRETH: GBit transmit descriptor handling optimization Daniel Hellstrom
2011-01-14 20:46   ` David Miller
2011-01-14 13:02 ` [PATCH 4/7 v2] GRETH: fixed skb buffer memory leak on frame errors Daniel Hellstrom
2011-01-14 20:46   ` David Miller
2011-01-14 13:02 ` [PATCH 5/7 v2] GRETH: avoid writing bad speed/duplex when setting transfer mode Daniel Hellstrom
2011-01-14 20:46   ` David Miller
2011-01-14 13:02 ` Daniel Hellstrom [this message]
2011-01-14 20:46   ` [PATCH 6/7 v2] GRETH: handle frame error interrupts David Miller
2011-01-14 13:02 ` [PATCH 7/7 v2] GRETH: resolve SMP issues and other problems Daniel Hellstrom
2011-01-14 20:47   ` David Miller
2011-01-14 20:46 ` [PATCH 1/7 v2] GRETH: added raw AMBA vendor/device number to match against David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1295010163-2585-6-git-send-email-daniel@gaisler.com \
    --to=daniel@gaisler.com \
    --cc=davem@davemloft.net \
    --cc=kristoffer@gaisler.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).