[PATCH v2] net: macb: Handle the RXUBR interrupt on all devices
From: Nathan Sullivan <hidden>
Date: 2015-05-07 18:42:11
Also in:
lkml
Subsystem:
atmel macb ethernet driver, networking drivers, the rest · Maintainers:
Théo Lebrun, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
There is a hardware issue under heavy load where DMA can stop. This causes endless "used buffer descriptor read" interrupts, but it can be cleared by re-enabling RX. See the at91 manual section 41.3.1, or the Zynq manual section 16.7.4, for details. The at91 driver already works around this hardware issue, and the same workaround applies to at least the Zynq Ethernet (and possibly more devices), so apply it here as well. In addition, handle the RXUBR interrupt, since the driver turns it on with MACB_RX_INT_FLAGS anyway. Signed-off-by: Nathan Sullivan <redacted> Reviewied-by: Josh Cartwright [off-list ref] Reviewied-by: Ben Shelton [off-list ref] --- drivers/net/ethernet/cadence/macb.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index 4104d49..5f10dfc 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c@@ -981,7 +981,7 @@ static irqreturn_t macb_interrupt(int irq, void *dev_id) struct macb_queue *queue = dev_id; struct macb *bp = queue->bp; struct net_device *dev = bp->dev; - u32 status; + u32 status, ctrl; status = queue_readl(queue, ISR);
@@ -1037,6 +1037,21 @@ static irqreturn_t macb_interrupt(int irq, void *dev_id) * add that if/when we get our hands on a full-blown MII PHY. */ + /* There is a hardware issue under heavy load where DMA can + * stop, this causes endless "used buffer descriptor read" + * interrupts but it can be cleared by re-enabling RX. See + * the at91 manual, section 41.3.1 or the Zynq manual + * section 16.7.4 for details. + */ + if (status & MACB_BIT(RXUBR)) { + ctrl = macb_readl(bp, NCR); + macb_writel(bp, NCR, ctrl & ~MACB_BIT(RE)); + macb_writel(bp, NCR, ctrl | MACB_BIT(RE)); + + if (bp->caps & MACB_CAPS_ISR_CLEAR_ON_WRITE) + macb_writel(bp, ISR, MACB_BIT(RXUBR)); + } + if (status & MACB_BIT(ISR_ROVR)) { /* We missed at least one packet */ if (macb_is_gem(bp))
--
1.7.10.4