Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-12 16:58:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[BNX2]: change irq locks to bh locks

Browse Source 
Change all locks from spin_lock_irqsave() to spin_lock_bh(). All
places that require spinlocks are in BH context.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Michael Chan 2005-08-25 15:38:39 -07:00 committed by David S. Miller
parent e89bbf1049
commit c770a65cee
1 changed files with 24 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
drivers/net/bnx2.c
View File

@ -1350,15 +1350,13 @@ bnx2_tx_int(struct bnx2 *bp)
bp->tx_cons = sw_cons; bp->tx_cons = sw_cons;
if (unlikely(netif_queue_stopped(bp->dev))) { if (unlikely(netif_queue_stopped(bp->dev))) {
unsigned long flags; spin_lock(&bp->tx_lock);
spin_lock_irqsave(&bp->tx_lock, flags);
if ((netif_queue_stopped(bp->dev)) && if ((netif_queue_stopped(bp->dev)) &&
(bnx2_tx_avail(bp) > MAX_SKB_FRAGS)) { (bnx2_tx_avail(bp) > MAX_SKB_FRAGS)) {
netif_wake_queue(bp->dev); netif_wake_queue(bp->dev);
} }
spin_unlock_irqrestore(&bp->tx_lock, flags); spin_unlock(&bp->tx_lock);
} }
} }
@ -1598,11 +1596,9 @@ bnx2_poll(struct net_device *dev, int *budget)
(bp->status_blk->status_attn_bits_ack & (bp->status_blk->status_attn_bits_ack &
STATUS_ATTN_BITS_LINK_STATE)) { STATUS_ATTN_BITS_LINK_STATE)) {
unsigned long flags; spin_lock(&bp->phy_lock);
spin_lock_irqsave(&bp->phy_lock, flags);
bnx2_phy_int(bp); bnx2_phy_int(bp);
spin_unlock_irqrestore(&bp->phy_lock, flags); spin_unlock(&bp->phy_lock);
} }
if (bp->status_blk->status_tx_quick_consumer_index0 != bp->tx_cons) { if (bp->status_blk->status_tx_quick_consumer_index0 != bp->tx_cons) {
@ -1645,9 +1641,8 @@ bnx2_set_rx_mode(struct net_device *dev)
struct bnx2 *bp = dev->priv; struct bnx2 *bp = dev->priv;
u32 rx_mode, sort_mode; u32 rx_mode, sort_mode;
int i; int i;
unsigned long flags;
spin_lock_irqsave(&bp->phy_lock, flags); spin_lock_bh(&bp->phy_lock);
rx_mode = bp->rx_mode & ~(BNX2_EMAC_RX_MODE_PROMISCUOUS | rx_mode = bp->rx_mode & ~(BNX2_EMAC_RX_MODE_PROMISCUOUS |
BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG); BNX2_EMAC_RX_MODE_KEEP_VLAN_TAG);
@ -1708,7 +1703,7 @@ bnx2_set_rx_mode(struct net_device *dev)
REG_WR(bp, BNX2_RPM_SORT_USER0, sort_mode); REG_WR(bp, BNX2_RPM_SORT_USER0, sort_mode);
REG_WR(bp, BNX2_RPM_SORT_USER0, sort_mode | BNX2_RPM_SORT_USER0_ENA); REG_WR(bp, BNX2_RPM_SORT_USER0, sort_mode | BNX2_RPM_SORT_USER0_ENA);
spin_unlock_irqrestore(&bp->phy_lock, flags); spin_unlock_bh(&bp->phy_lock);
} }
static void static void
@ -3768,10 +3763,10 @@ bnx2_test_link(struct bnx2 *bp)
{ {
u32 bmsr; u32 bmsr;
spin_lock_irq(&bp->phy_lock); spin_lock_bh(&bp->phy_lock);
bnx2_read_phy(bp, MII_BMSR, &bmsr); bnx2_read_phy(bp, MII_BMSR, &bmsr);
bnx2_read_phy(bp, MII_BMSR, &bmsr); bnx2_read_phy(bp, MII_BMSR, &bmsr);
spin_unlock_irq(&bp->phy_lock); spin_unlock_bh(&bp->phy_lock);
if (bmsr & BMSR_LSTATUS) { if (bmsr & BMSR_LSTATUS) {
return 0; return 0;
@ -3828,9 +3823,8 @@ bnx2_timer(unsigned long data)
if ((bp->phy_flags & PHY_SERDES_FLAG) && if ((bp->phy_flags & PHY_SERDES_FLAG) &&
(CHIP_NUM(bp) == CHIP_NUM_5706)) { (CHIP_NUM(bp) == CHIP_NUM_5706)) {
unsigned long flags;
spin_lock_irqsave(&bp->phy_lock, flags); spin_lock(&bp->phy_lock);
if (bp->serdes_an_pending) { if (bp->serdes_an_pending) {
bp->serdes_an_pending--; bp->serdes_an_pending--;
} }
@ -3884,7 +3878,7 @@ bnx2_timer(unsigned long data)
else else
bp->current_interval = bp->timer_interval; bp->current_interval = bp->timer_interval;
spin_unlock_irqrestore(&bp->phy_lock, flags); spin_unlock(&bp->phy_lock);
} }
bnx2_restart_timer: bnx2_restart_timer:
@ -4168,14 +4162,12 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev)
dev->trans_start = jiffies; dev->trans_start = jiffies;
if (unlikely(bnx2_tx_avail(bp) <= MAX_SKB_FRAGS)) { if (unlikely(bnx2_tx_avail(bp) <= MAX_SKB_FRAGS)) {
unsigned long flags; spin_lock(&bp->tx_lock);
spin_lock_irqsave(&bp->tx_lock, flags);
netif_stop_queue(dev); netif_stop_queue(dev);
if (bnx2_tx_avail(bp) > MAX_SKB_FRAGS) if (bnx2_tx_avail(bp) > MAX_SKB_FRAGS)
netif_wake_queue(dev); netif_wake_queue(dev);
spin_unlock_irqrestore(&bp->tx_lock, flags); spin_unlock(&bp->tx_lock);
} }
return NETDEV_TX_OK; return NETDEV_TX_OK;
@ -4411,11 +4403,11 @@ bnx2_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
bp->req_line_speed = req_line_speed; bp->req_line_speed = req_line_speed;
bp->req_duplex = req_duplex; bp->req_duplex = req_duplex;
spin_lock_irq(&bp->phy_lock); spin_lock_bh(&bp->phy_lock);
bnx2_setup_phy(bp); bnx2_setup_phy(bp);
spin_unlock_irq(&bp->phy_lock); spin_unlock_bh(&bp->phy_lock);
return 0; return 0;
} }
@ -4485,16 +4477,16 @@ bnx2_nway_reset(struct net_device *dev)
return -EINVAL; return -EINVAL;
} }
spin_lock_irq(&bp->phy_lock); spin_lock_bh(&bp->phy_lock);
/* Force a link down visible on the other side */ /* Force a link down visible on the other side */
if (bp->phy_flags & PHY_SERDES_FLAG) { if (bp->phy_flags & PHY_SERDES_FLAG) {
bnx2_write_phy(bp, MII_BMCR, BMCR_LOOPBACK); bnx2_write_phy(bp, MII_BMCR, BMCR_LOOPBACK);
spin_unlock_irq(&bp->phy_lock); spin_unlock_bh(&bp->phy_lock);
msleep(20); msleep(20);
spin_lock_irq(&bp->phy_lock); spin_lock_bh(&bp->phy_lock);
if (CHIP_NUM(bp) == CHIP_NUM_5706) { if (CHIP_NUM(bp) == CHIP_NUM_5706) {
bp->current_interval = SERDES_AN_TIMEOUT; bp->current_interval = SERDES_AN_TIMEOUT;
bp->serdes_an_pending = 1; bp->serdes_an_pending = 1;
@ -4506,7 +4498,7 @@ bnx2_nway_reset(struct net_device *dev)
bmcr &= ~BMCR_LOOPBACK; bmcr &= ~BMCR_LOOPBACK;
bnx2_write_phy(bp, MII_BMCR, bmcr | BMCR_ANRESTART | BMCR_ANENABLE); bnx2_write_phy(bp, MII_BMCR, bmcr | BMCR_ANRESTART | BMCR_ANENABLE);
spin_unlock_irq(&bp->phy_lock); spin_unlock_bh(&bp->phy_lock);
return 0; return 0;
} }
@ -4692,11 +4684,11 @@ bnx2_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam *epause)
bp->autoneg &= ~AUTONEG_FLOW_CTRL; bp->autoneg &= ~AUTONEG_FLOW_CTRL;
} }
spin_lock_irq(&bp->phy_lock); spin_lock_bh(&bp->phy_lock);
bnx2_setup_phy(bp); bnx2_setup_phy(bp);
spin_unlock_irq(&bp->phy_lock); spin_unlock_bh(&bp->phy_lock);
return 0; return 0;
} }
@ -5046,9 +5038,9 @@ bnx2_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
case SIOCGMIIREG: { case SIOCGMIIREG: {
u32 mii_regval; u32 mii_regval;
spin_lock_irq(&bp->phy_lock); spin_lock_bh(&bp->phy_lock);
err = bnx2_read_phy(bp, data->reg_num & 0x1f, &mii_regval); err = bnx2_read_phy(bp, data->reg_num & 0x1f, &mii_regval);
spin_unlock_irq(&bp->phy_lock); spin_unlock_bh(&bp->phy_lock);
data->val_out = mii_regval; data->val_out = mii_regval;
@ -5059,9 +5051,9 @@ bnx2_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
if (!capable(CAP_NET_ADMIN)) if (!capable(CAP_NET_ADMIN))
return -EPERM; return -EPERM;
spin_lock_irq(&bp->phy_lock); spin_lock_bh(&bp->phy_lock);
err = bnx2_write_phy(bp, data->reg_num & 0x1f, data->val_in); err = bnx2_write_phy(bp, data->reg_num & 0x1f, data->val_in);
spin_unlock_irq(&bp->phy_lock); spin_unlock_bh(&bp->phy_lock);
return err; return err;