Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b8227c4 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

[BNX2]: Add indirect spinlock. 



The indirect register access method will be used by more than one
caller in BH context (NAPI poll and timer), so a spinlock is required.

Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 27a005b8

drivers/net/bnx2.c

+11 −1
Original line number Diff line number Diff line
@@ -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);

drivers/net/bnx2.h

+1 −0
Original line number Diff line number Diff line
@@ -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