mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
net: macb: Handle the RXUBR interrupt on all devices
The same hardware issue the at91 must work around applies to at least the Zynq ethernet, and possibly more devices. The driver also needs to handle the RXUBR interrupt since it turns it on with MACB_RX_INT_FLAGS anyway. Signed-off-by: Nathan Sullivan <nathan.sullivan@ni.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
d3196a2468
commit
bfbb92c446
1 changed files with 10 additions and 1 deletions
|
@ -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,15 @@ static irqreturn_t macb_interrupt(int irq, void *dev_id)
|
|||
* add that if/when we get our hands on a full-blown MII PHY.
|
||||
*/
|
||||
|
||||
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))
|
||||
|
|
Loading…
Reference in a new issue