diff options
| author |   Sinan Kaya <okaya@codeaurora.org> | 2018-03-25 10:39:18 -0400 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-03-26 12:47:55 -0400 |
| commit | 7f883c774e1bad34d5474d8a74989336631ce178 (patch) | |
| tree | 5f7d9a0dba0a4879a03776e8f41890d4feb6bf23 /drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | |
| parent | bnx2x: Replace doorbell barrier() with wmb() (diff) | |
| download | linux-dev-7f883c774e1bad34d5474d8a74989336631ce178.tar.xz linux-dev-7f883c774e1bad34d5474d8a74989336631ce178.zip | |
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: Sinan Kaya <okaya@codeaurora.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index fd97250d6371..c766ae23bc74 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c @@ -3817,8 +3817,8 @@ static void bnx2x_sp_prod_update(struct bnx2x *bp) */ mb(); - REG_WR16(bp, BAR_XSTRORM_INTMEM + XSTORM_SPQ_PROD_OFFSET(func), - bp->spq_prod_idx); + REG_WR16_RELAXED(bp, BAR_XSTRORM_INTMEM + XSTORM_SPQ_PROD_OFFSET(func), + bp->spq_prod_idx); mmiowb(); } |