Commit fd51cf19 authored Apr 23, 2013 by Sebastian Siewior Committed by David S. Miller Apr 25, 2013

net/cpsw: don't rely only on netif_running() to check which device is active



netif_running() reports false before the ->ndo_stop() callback is
called. That means if one executes "ifconfig down" and the system
receives an interrupt before the interrupt source has been disabled we
hang for always for two reasons:
- we never disable the interrupt source because devices claim to be
  already inactive and don't feel responsible.
- since the ISR always reports IRQ_HANDLED the line is never deactivated
  because it looks like the ISR feels responsible.

This patch changes the logic in the ISR a little:
- If none of the status registers reports an active source (RX or TX,
  misc is ignored because it is not actived) we leave with IRQ_NONE.
- the interrupt is deactivated
- The first active network device is taken and napi is scheduled. If
  none are active (a small race window between ndo_down() and the
  interrupt the) then we leave and should not come back because the
  source is off.
  There is no need to schedule the second NAPI because both share the
  same dma queue.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent aacebbf8

drivers/net/ethernet/ti/cpsw.c

+22 −11

Original line number	Diff line number	Diff line
		@@ -510,21 +510,32 @@ void cpsw_rx_handler(void *token, int len, int status)
		static irqreturn_t cpsw_interrupt(int irq, void *dev_id)
		{
		struct cpsw_priv *priv = dev_id;
		u32 rx, tx, rx_thresh;

		rx_thresh = __raw_readl(&priv->wr_regs->rx_thresh_stat);
		rx = __raw_readl(&priv->wr_regs->rx_stat);
		tx = __raw_readl(&priv->wr_regs->tx_stat);
		if (!rx_thresh && !rx && !tx)
		return IRQ_NONE;

		if (likely(netif_running(priv->ndev))) {
		cpsw_intr_disable(priv);
		cpsw_disable_irq(priv);

		if (netif_running(priv->ndev)) {
		napi_schedule(&priv->napi);
		} else {
		return IRQ_HANDLED;
		}

		priv = cpsw_get_slave_priv(priv, 1);
		if (likely(priv) && likely(netif_running(priv->ndev))) {
		cpsw_intr_disable(priv);
		cpsw_disable_irq(priv);
		if (!priv)
		return IRQ_NONE;

		if (netif_running(priv->ndev)) {
		napi_schedule(&priv->napi);
		}
		}
		return IRQ_HANDLED;
		}
		return IRQ_NONE;
		}

		static int cpsw_poll(struct napi_struct *napi, int budget)
		{

Admin message