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

Commit 7f883c77 authored by Sinan Kaya's avatar Sinan Kaya Committed by David S. Miller
Browse files

bnx2x: Eliminate duplicate barriers on weakly-ordered archs 



Code includes wmb() followed by writel(). writel() already has a
barrier on some architectures like arm64.

This ends up CPU observing two barriers back to back before executing
the register write.

Since code already has an explicit barrier call, changing writel() to
writel_relaxed().

Signed-off-by: default avatarSinan Kaya <okaya@codeaurora.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent edd87423

drivers/net/ethernet/broadcom/bnx2x/bnx2x.h

+8 −4
Original line number Diff line number Diff line
@@ -166,6 +166,12 @@ do { \ 
#define REG_RD8(bp, offset)		readb(REG_ADDR(bp, offset))

#define REG_RD16(bp, offset)		readw(REG_ADDR(bp, offset))



#define REG_WR_RELAXED(bp, offset, val)	\

	writel_relaxed((u32)val, REG_ADDR(bp, offset))



#define REG_WR16_RELAXED(bp, offset, val) \

	writew_relaxed((u16)val, REG_ADDR(bp, offset))



#define REG_WR(bp, offset, val)		writel((u32)val, REG_ADDR(bp, offset))

#define REG_WR8(bp, offset, val)	writeb((u8)val, REG_ADDR(bp, offset))

#define REG_WR16(bp, offset, val)	writew((u16)val, REG_ADDR(bp, offset))
@@ -758,10 +764,8 @@ struct bnx2x_fastpath { 
#if (BNX2X_DB_SHIFT < BNX2X_DB_MIN_SHIFT)

#error "Min DB doorbell stride is 8"

#endif

#define DOORBELL(bp, cid, val) \

	do { \

		writel((u32)(val), bp->doorbells + (bp->db_size * (cid))); \

	} while (0)

#define DOORBELL_RELAXED(bp, cid, val) \

	writel_relaxed((u32)(val), (bp)->doorbells + ((bp)->db_size * (cid)))



/* TX CSUM helpers */

#define SKB_CS_OFF(skb)		(offsetof(struct tcphdr, check) - \

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

+1 −1
Original line number Diff line number Diff line
@@ -4156,7 +4156,7 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	/* make sure descriptor update is observed by HW */

	wmb();



	DOORBELL(bp, txdata->cid, txdata->tx_db.raw);

	DOORBELL_RELAXED(bp, txdata->cid, txdata->tx_db.raw);



	mmiowb();

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h

+2 −2
Original line number Diff line number Diff line
@@ -522,7 +522,7 @@ static inline void bnx2x_update_rx_prod(struct bnx2x *bp, 
	wmb();



	for (i = 0; i < sizeof(rx_prods)/4; i++)

		REG_WR(bp, fp->ustorm_rx_prods_offset + i*4,

		REG_WR_RELAXED(bp, fp->ustorm_rx_prods_offset + i * 4,

			       ((u32 *)&rx_prods)[i]);



	mmiowb(); /* keep prod updates ordered */

drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c

+1 −1
Original line number Diff line number Diff line
@@ -2593,7 +2593,7 @@ static int bnx2x_run_loopback(struct bnx2x *bp, int loopback_mode) 
	txdata->tx_db.data.prod += 2;

	/* make sure descriptor update is observed by the HW */

	wmb();

	DOORBELL(bp, txdata->cid, txdata->tx_db.raw);

	DOORBELL_RELAXED(bp, txdata->cid, txdata->tx_db.raw);



	mmiowb();

	barrier();

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+2 −2
Original line number Diff line number Diff line
@@ -3817,7 +3817,7 @@ static void bnx2x_sp_prod_update(struct bnx2x *bp) 
	 */

	mb();



	REG_WR16(bp, BAR_XSTRORM_INTMEM + XSTORM_SPQ_PROD_OFFSET(func),

	REG_WR16_RELAXED(bp, BAR_XSTRORM_INTMEM + XSTORM_SPQ_PROD_OFFSET(func),

			 bp->spq_prod_idx);

	mmiowb();

}