hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nuport-mac: properly protect the phy interrupt handler 

SVN-Revision: 32951
lede-17.01
Florian Fainelli 2012-08-02 18:13:17 +00:00
parent f45132d1d4
commit 162e272b4b
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
target/linux/mcs814x/files-3.3/drivers/net/ethernet/mcs8140/nuport_mac.c
View File

@ -422,19 +422,25 @@ static irqreturn_t nuport_mac_link_interrupt(int irq, void *dev_id)
struct nuport_mac_priv *priv = netdev_priv(dev); struct nuport_mac_priv *priv = netdev_priv(dev);
u32 reg; u32 reg;
u8 phy_addr; u8 phy_addr;
unsigned long flags;
irqreturn_t ret = IRQ_HANDLED;
spin_lock_irqsave(&priv->lock, flags);
reg = nuport_mac_readl(LINK_INT_CSR); reg = nuport_mac_readl(LINK_INT_CSR);
phy_addr = (reg >> LINK_PHY_ADDR_SHIFT) & (PHY_MAX_ADDR - 1); phy_addr = (reg >> LINK_PHY_ADDR_SHIFT) & (PHY_MAX_ADDR - 1);
if (phy_addr != priv->phydev->addr) { if (phy_addr != priv->phydev->addr) {
netdev_err(dev, "spurious PHY irq (phy: %d)\n", phy_addr); netdev_err(dev, "spurious PHY irq (phy: %d)\n", phy_addr);
return IRQ_NONE; ret = IRQ_NONE;
goto out;
} }
priv->phydev->link = (reg & LINK_UP); priv->phydev->link = (reg & LINK_UP);
nuport_mac_adjust_link(dev); nuport_mac_adjust_link(dev);
return IRQ_HANDLED; out:
spin_unlock_irqrestore(&priv->lock, flags);
return ret;
} }
static irqreturn_t nuport_mac_tx_interrupt(int irq, void *dev_id) static irqreturn_t nuport_mac_tx_interrupt(int irq, void *dev_id)