Commit 4ebabfcb authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jeff Garzik

skge: mask irqs when device down

Wheen a port on the skge driver is not used, it should
mask off interrupts from theat port.
Signed-off-by: default avatarStephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent e3a1b99f
...@@ -105,7 +105,8 @@ static const int txqaddr[] = { Q_XA1, Q_XA2 }; ...@@ -105,7 +105,8 @@ static const int txqaddr[] = { Q_XA1, Q_XA2 };
static const int rxqaddr[] = { Q_R1, Q_R2 }; static const int rxqaddr[] = { Q_R1, Q_R2 };
static const u32 rxirqmask[] = { IS_R1_F, IS_R2_F }; static const u32 rxirqmask[] = { IS_R1_F, IS_R2_F };
static const u32 txirqmask[] = { IS_XA1_F, IS_XA2_F }; static const u32 txirqmask[] = { IS_XA1_F, IS_XA2_F };
static const u32 irqmask[] = { IS_R1_F|IS_XA1_F, IS_R2_F|IS_XA2_F }; static const u32 napimask[] = { IS_R1_F|IS_XA1_F, IS_R2_F|IS_XA2_F };
static const u32 portmask[] = { IS_PORT_1, IS_PORT_2 };
static int skge_get_regs_len(struct net_device *dev) static int skge_get_regs_len(struct net_device *dev)
{ {
...@@ -2504,6 +2505,11 @@ static int skge_up(struct net_device *dev) ...@@ -2504,6 +2505,11 @@ static int skge_up(struct net_device *dev)
skge_write8(hw, Q_ADDR(rxqaddr[port], Q_CSR), CSR_START | CSR_IRQ_CL_F); skge_write8(hw, Q_ADDR(rxqaddr[port], Q_CSR), CSR_START | CSR_IRQ_CL_F);
skge_led(skge, LED_MODE_ON); skge_led(skge, LED_MODE_ON);
spin_lock_irq(&hw->hw_lock);
hw->intr_mask |= portmask[port];
skge_write32(hw, B0_IMSK, hw->intr_mask);
spin_unlock_irq(&hw->hw_lock);
netif_poll_enable(dev); netif_poll_enable(dev);
return 0; return 0;
...@@ -2533,6 +2539,13 @@ static int skge_down(struct net_device *dev) ...@@ -2533,6 +2539,13 @@ static int skge_down(struct net_device *dev)
if (hw->chip_id == CHIP_ID_GENESIS && hw->phy_type == SK_PHY_XMAC) if (hw->chip_id == CHIP_ID_GENESIS && hw->phy_type == SK_PHY_XMAC)
cancel_delayed_work(&skge->link_thread); cancel_delayed_work(&skge->link_thread);
netif_poll_disable(dev);
spin_lock_irq(&hw->hw_lock);
hw->intr_mask &= ~portmask[port];
skge_write32(hw, B0_IMSK, hw->intr_mask);
spin_unlock_irq(&hw->hw_lock);
skge_write8(skge->hw, SK_REG(skge->port, LNK_LED_REG), LED_OFF); skge_write8(skge->hw, SK_REG(skge->port, LNK_LED_REG), LED_OFF);
if (hw->chip_id == CHIP_ID_GENESIS) if (hw->chip_id == CHIP_ID_GENESIS)
genesis_stop(skge); genesis_stop(skge);
...@@ -2575,8 +2588,6 @@ static int skge_down(struct net_device *dev) ...@@ -2575,8 +2588,6 @@ static int skge_down(struct net_device *dev)
skge_led(skge, LED_MODE_OFF); skge_led(skge, LED_MODE_OFF);
netif_poll_disable(dev);
netif_tx_lock_bh(dev); netif_tx_lock_bh(dev);
skge_tx_clean(dev); skge_tx_clean(dev);
netif_tx_unlock_bh(dev); netif_tx_unlock_bh(dev);
...@@ -3051,7 +3062,7 @@ static int skge_poll(struct net_device *dev, int *budget) ...@@ -3051,7 +3062,7 @@ static int skge_poll(struct net_device *dev, int *budget)
spin_lock_irqsave(&hw->hw_lock, flags); spin_lock_irqsave(&hw->hw_lock, flags);
__netif_rx_complete(dev); __netif_rx_complete(dev);
hw->intr_mask |= irqmask[skge->port]; hw->intr_mask |= napimask[skge->port];
skge_write32(hw, B0_IMSK, hw->intr_mask); skge_write32(hw, B0_IMSK, hw->intr_mask);
skge_read32(hw, B0_IMSK); skge_read32(hw, B0_IMSK);
spin_unlock_irqrestore(&hw->hw_lock, flags); spin_unlock_irqrestore(&hw->hw_lock, flags);
...@@ -3415,10 +3426,9 @@ static int skge_reset(struct skge_hw *hw) ...@@ -3415,10 +3426,9 @@ static int skge_reset(struct skge_hw *hw)
else else
hw->ram_size = t8 * 4096; hw->ram_size = t8 * 4096;
hw->intr_mask = IS_HW_ERR | IS_PORT_1; hw->intr_mask = IS_HW_ERR;
if (hw->ports > 1)
hw->intr_mask |= IS_PORT_2;
/* Use PHY IRQ for all but fiber based Genesis board */
if (!(hw->chip_id == CHIP_ID_GENESIS && hw->phy_type == SK_PHY_XMAC)) if (!(hw->chip_id == CHIP_ID_GENESIS && hw->phy_type == SK_PHY_XMAC))
hw->intr_mask |= IS_EXT_REG; hw->intr_mask |= IS_EXT_REG;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment