Commit 29e6573c authored by Ong Boon Leong's avatar Ong Boon Leong Committed by David S. Miller
Browse files

net: stmmac: make stmmac_interrupt() function more friendly to MSI 



Refactor stmmac_interrupt() by introducing stmmac_common_interrupt()
so that we prepare the ISR operation to be friendly to MSI later.

Signed-off-by: default avatarOng Boon Leong <boon.leong.ong@intel.com>
Signed-off-by: default avatarVoon Weifeng <weifeng.voon@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7e1c520c

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+31 −23
Original line number Diff line number Diff line
@@ -4382,21 +4382,8 @@ static void stmmac_fpe_event_status(struct stmmac_priv *priv, int status) 
	}

}



/**

 *  stmmac_interrupt - main ISR

 *  @irq: interrupt number.

 *  @dev_id: to pass the net device pointer (must be valid).

 *  Description: this is the main driver interrupt service routine.

 *  It can call:

 *  o DMA service routine (to manage incoming frame reception and transmission

 *    status)

 *  o Core interrupts to manage: remote wake-up, management counter, LPI

 *    interrupts.

 */

static irqreturn_t stmmac_interrupt(int irq, void *dev_id)

static void stmmac_common_interrupt(struct stmmac_priv *priv)

{

	struct net_device *dev = (struct net_device *)dev_id;

	struct stmmac_priv *priv = netdev_priv(dev);

	u32 rx_cnt = priv->plat->rx_queues_to_use;

	u32 tx_cnt = priv->plat->tx_queues_to_use;

	u32 queues_count;
@@ -4409,13 +4396,6 @@ static irqreturn_t stmmac_interrupt(int irq, void *dev_id) 
	if (priv->irq_wake)

		pm_wakeup_event(priv->device, 0);



	/* Check if adapter is up */

	if (test_bit(STMMAC_DOWN, &priv->state))

		return IRQ_HANDLED;

	/* Check if a fatal error happened */

	if (stmmac_safety_feat_interrupt(priv))

		return IRQ_HANDLED;



	if (priv->dma_cap.estsel)

		stmmac_est_irq_status(priv, priv->ioaddr, priv->dev,

				      &priv->xstats, tx_cnt);
@@ -4457,12 +4437,40 @@ static irqreturn_t stmmac_interrupt(int irq, void *dev_id) 
		/* PCS link status */

		if (priv->hw->pcs) {

			if (priv->xstats.pcs_link)

				netif_carrier_on(dev);

				netif_carrier_on(priv->dev);

			else

				netif_carrier_off(dev);

				netif_carrier_off(priv->dev);

		}

	}

}



/**

 *  stmmac_interrupt - main ISR

 *  @irq: interrupt number.

 *  @dev_id: to pass the net device pointer.

 *  Description: this is the main driver interrupt service routine.

 *  It can call:

 *  o DMA service routine (to manage incoming frame reception and transmission

 *    status)

 *  o Core interrupts to manage: remote wake-up, management counter, LPI

 *    interrupts.

 */

static irqreturn_t stmmac_interrupt(int irq, void *dev_id)

{

	struct net_device *dev = (struct net_device *)dev_id;

	struct stmmac_priv *priv = netdev_priv(dev);



	/* Check if adapter is up */

	if (test_bit(STMMAC_DOWN, &priv->state))

		return IRQ_HANDLED;



	/* Check if a fatal error happened */

	if (stmmac_safety_feat_interrupt(priv))

		return IRQ_HANDLED;



	/* To handle Common interrupts */

	stmmac_common_interrupt(priv);



	/* To handle DMA interrupts */

	stmmac_dma_interrupt(priv);