aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorDaniel Hellstrom <daniel@gaisler.com>2011-01-14 03:02:42 +0000
committerDavid S. Miller <davem@davemloft.net>2011-01-14 12:45:54 -0800
commit1ca23434dd0001bd2bfff31b8251436b34aa9066 (patch)
treeaa6696927db181540cfd9ec551e54d18dfc60e4a /drivers/net
parent2436af8ca7a6c4679cf7da7e3867f1d5cd8528b7 (diff)
downloadkernel_samsung_aries-1ca23434dd0001bd2bfff31b8251436b34aa9066.zip
kernel_samsung_aries-1ca23434dd0001bd2bfff31b8251436b34aa9066.tar.gz
kernel_samsung_aries-1ca23434dd0001bd2bfff31b8251436b34aa9066.tar.bz2
GRETH: handle frame error interrupts
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> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/greth.c9
-rw-r--r--drivers/net/greth.h2
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