aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSinan Kaya <okaya@codeaurora.org>2018-03-13 23:20:24 -0400
committerJason Gunthorpe <jgg@mellanox.com>2018-03-15 15:35:44 -0600
commit561e5d48968be22fc71af6a0e13af6edae595dbe (patch)
tree7ea473cab206bf1ffbeadcb7de929e1ae58f8eb4
parentRDMA/hns: Fix cqn type and init resp (diff)
downloadlinux-dev-561e5d48968be22fc71af6a0e13af6edae595dbe.tar.xz
linux-dev-561e5d48968be22fc71af6a0e13af6edae595dbe.zip
RDMA/qedr: eliminate duplicate barriers on weakly-ordered archs
Code includes wmb() followed by writel() in multiple places. 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: Jason Gunthorpe <jgg@mellanox.com>
-rw-r--r--drivers/infiniband/hw/qedr/verbs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/qedr/verbs.c b/drivers/infiniband/hw/qedr/verbs.c
index 875b17272d65..b61a395f89de 100644
--- a/drivers/infiniband/hw/qedr/verbs.c
+++ b/drivers/infiniband/hw/qedr/verbs.c
@@ -1870,7 +1870,7 @@ static int qedr_update_qp_state(struct qedr_dev *dev,
if (rdma_protocol_roce(&dev->ibdev, 1)) {
wmb();
- writel(qp->rq.db_data.raw, qp->rq.db);
+ writel_relaxed(qp->rq.db_data.raw, qp->rq.db);
/* Make sure write takes effect */
mmiowb();
}
@@ -3257,7 +3257,7 @@ int qedr_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
* redundant doorbell.
*/
wmb();
- writel(qp->sq.db_data.raw, qp->sq.db);
+ writel_relaxed(qp->sq.db_data.raw, qp->sq.db);
/* Make sure write sticks */
mmiowb();