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_vfpf.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 '')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c index 76a4668c50fe..8e0a317b31f7 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c @@ -170,7 +170,9 @@ static int bnx2x_send_msg2pf(struct bnx2x *bp, u8 *done, dma_addr_t msg_mapping) wmb(); /* Trigger the PF FW */ - writeb(1, &zone_data->trigger.vf_pf_channel.addr_valid); + writeb_relaxed(1, &zone_data->trigger.vf_pf_channel.addr_valid); + + mmiowb(); /* Wait for PF to complete */ while ((tout >= 0) && (!*done)) { |