2 files changed, 12 insertions, 1 deletions

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index ab589090d634..cb74f122138c 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -234,21 +234,29 @@ static inline u32 bnx2_tx_avail(struct bnx2 *bp)
 static u32
 bnx2_reg_rd_ind(struct bnx2 *bp, u32 offset)
 {
+        u32 val;
+
+        spin_lock_bh(&bp->indirect_lock);
         REG_WR(bp, BNX2_PCICFG_REG_WINDOW_ADDRESS, offset);
-        return (REG_RD(bp, BNX2_PCICFG_REG_WINDOW));
+        val = REG_RD(bp, BNX2_PCICFG_REG_WINDOW);
+        spin_unlock_bh(&bp->indirect_lock);
+        return val;
 }
 
 static void
 bnx2_reg_wr_ind(struct bnx2 *bp, u32 offset, u32 val)
 {
+        spin_lock_bh(&bp->indirect_lock);
         REG_WR(bp, BNX2_PCICFG_REG_WINDOW_ADDRESS, offset);
         REG_WR(bp, BNX2_PCICFG_REG_WINDOW, val);
+        spin_unlock_bh(&bp->indirect_lock);
 }
 
 static void
 bnx2_ctx_wr(struct bnx2 *bp, u32 cid_addr, u32 offset, u32 val)
 {
         offset += cid_addr;
+        spin_lock_bh(&bp->indirect_lock);
         if (CHIP_NUM(bp) == CHIP_NUM_5709) {
                 int i;
 
@@ -266,6 +274,7 @@ bnx2_ctx_wr(struct bnx2 *bp, u32 cid_addr, u32 offset, u32 val)
                 REG_WR(bp, BNX2_CTX_DATA_ADR, offset);
                 REG_WR(bp, BNX2_CTX_DATA, val);
         }
+        spin_unlock_bh(&bp->indirect_lock);
 }
 
 static int
@@ -6039,6 +6048,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
         bp->pdev = pdev;
 
         spin_lock_init(&bp->phy_lock);
+        spin_lock_init(&bp->indirect_lock);
         INIT_WORK(&bp->reset_task, bnx2_reset_task);
 
         dev->base_addr = dev->mem_start = pci_resource_start(pdev, 0);
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h
index 124bd03cff3e..ba175a800c8e 100644
--- a/drivers/net/bnx2.h
+++ b/drivers/net/bnx2.h
@@ -6522,6 +6522,7 @@ struct bnx2 {
 
         /* Used to synchronize phy accesses. */
         spinlock_t              phy_lock;
+        spinlock_t              indirect_lock;
 
         u32                     phy_flags;
 #define PHY_SERDES_FLAG                 1