netdev - [PATCH v2] net: macb: Handle the RXUBR interrupt on all devices

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <1431024112-11868-1-git-send-email-nathan.sullivan@ni.com>
Date:	Thu, 7 May 2015 13:41:52 -0500
From:	Nathan Sullivan <nathan.sullivan@...com>
To:	nicolas.ferre@...el.com
Cc:	netdev@...r.kernel.org, linux-kernel@...r.kernel.org,
	Nathan Sullivan <nathan.sullivan@...com>
Subject: [PATCH v2] net: macb: Handle the RXUBR interrupt on all devices

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 <nathan.sullivan@...com>
Reviewied-by: Josh Cartwright <joshc@...com>
Reviewied-by: Ben Shelton <ben.shelton@...com>
---
 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

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html