aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/fec_mpc52xx.c23
1 files changed, 13 insertions, 10 deletions
diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c
index e5e6352556fa..d21b7ab64bd1 100644
--- a/drivers/net/fec_mpc52xx.c
+++ b/drivers/net/fec_mpc52xx.c
@@ -491,20 +491,23 @@ static irqreturn_t mpc52xx_fec_interrupt(int irq, void *dev_id)
491 491
492 out_be32(&fec->ievent, ievent); /* clear pending events */ 492 out_be32(&fec->ievent, ievent); /* clear pending events */
493 493
494 if (ievent & ~(FEC_IEVENT_RFIFO_ERROR | FEC_IEVENT_XFIFO_ERROR)) { 494 /* on fifo error, soft-reset fec */
495 if (ievent & ~FEC_IEVENT_TFINT) 495 if (ievent & (FEC_IEVENT_RFIFO_ERROR | FEC_IEVENT_XFIFO_ERROR)) {
496 dev_dbg(&dev->dev, "ievent: %08x\n", ievent); 496
497 if (net_ratelimit() && (ievent & FEC_IEVENT_RFIFO_ERROR))
498 dev_warn(&dev->dev, "FEC_IEVENT_RFIFO_ERROR\n");
499 if (net_ratelimit() && (ievent & FEC_IEVENT_XFIFO_ERROR))
500 dev_warn(&dev->dev, "FEC_IEVENT_XFIFO_ERROR\n");
501
502 mpc52xx_fec_reset(dev);
503
504 netif_wake_queue(dev);
497 return IRQ_HANDLED; 505 return IRQ_HANDLED;
498 } 506 }
499 507
500 if (net_ratelimit() && (ievent & FEC_IEVENT_RFIFO_ERROR)) 508 if (ievent & ~FEC_IEVENT_TFINT)
501 dev_warn(&dev->dev, "FEC_IEVENT_RFIFO_ERROR\n"); 509 dev_dbg(&dev->dev, "ievent: %08x\n", ievent);
502 if (net_ratelimit() && (ievent & FEC_IEVENT_XFIFO_ERROR))
503 dev_warn(&dev->dev, "FEC_IEVENT_XFIFO_ERROR\n");
504 510
505 mpc52xx_fec_reset(dev);
506
507 netif_wake_queue(dev);
508 return IRQ_HANDLED; 511 return IRQ_HANDLED;
509} 512}
510 513