diff mbox

[net] amd-xgbe: Fix IRQ processing when running in single IRQ mode

Message ID 20170104210716.8401.99717.stgit@tlendack-t1.amdoffice.net
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Tom Lendacky Jan. 4, 2017, 9:07 p.m. UTC 
When running in single IRQ mode, the additional IRQ routines were being
skipped because only the XGMAC interrupt status was being checked.
Update the code so that the additional IRQ routines are checked whenever
an interrupt is received.

Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
---
 drivers/net/ethernet/amd/xgbe/xgbe-drv.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

David Miller Jan. 6, 2017, 8:34 p.m. UTC | #1 
From: Tom Lendacky <thomas.lendacky@amd.com>
Date: Wed, 4 Jan 2017 15:07:16 -0600

> When running in single IRQ mode, the additional IRQ routines were being
> skipped because only the XGMAC interrupt status was being checked.
> Update the code so that the additional IRQ routines are checked whenever
> an interrupt is received.
> 
> Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>

Applied.
diff mbox

Patch

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
index 155190d..9943629 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
@@ -539,6 +539,7 @@  static irqreturn_t xgbe_isr(int irq, void *data)
 		}
 	}
 
+isr_done:
 	/* If there is not a separate AN irq, handle it here */
 	if (pdata->dev_irq == pdata->an_irq)
 		pdata->phy_if.an_isr(irq, pdata);
@@ -551,7 +552,6 @@  static irqreturn_t xgbe_isr(int irq, void *data)
 	if (pdata->vdata->i2c_support && (pdata->dev_irq == pdata->i2c_irq))
 		pdata->i2c_if.i2c_isr(irq, pdata);
 
-isr_done:
 	return IRQ_HANDLED;
 }