From patchwork Wed Aug 30 14:19:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yishai Hadas X-Patchwork-Id: 9929757 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C7946603B4 for ; Wed, 30 Aug 2017 14:19:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B93342862A for ; Wed, 30 Aug 2017 14:19:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AE30B28688; Wed, 30 Aug 2017 14:19:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4B0D22862A for ; Wed, 30 Aug 2017 14:19:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751317AbdH3OTw (ORCPT ); Wed, 30 Aug 2017 10:19:52 -0400 Received: from mail-il-dmz.mellanox.com ([193.47.165.129]:50090 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751332AbdH3OTv (ORCPT ); Wed, 30 Aug 2017 10:19:51 -0400 Received: from Internal Mail-Server by MTLPINE1 (envelope-from yishaih@mellanox.com) with ESMTPS (AES256-SHA encrypted); 30 Aug 2017 17:19:49 +0300 Received: from vnc17.mtl.labs.mlnx (vnc17.mtl.labs.mlnx [10.7.2.17]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id v7UEJnmt021792; Wed, 30 Aug 2017 17:19:49 +0300 Received: from vnc17.mtl.labs.mlnx (vnc17.mtl.labs.mlnx [127.0.0.1]) by vnc17.mtl.labs.mlnx (8.13.8/8.13.8) with ESMTP id v7UEJn5T021725; Wed, 30 Aug 2017 17:19:49 +0300 Received: (from yishaih@localhost) by vnc17.mtl.labs.mlnx (8.13.8/8.13.8/Submit) id v7UEJnSM021723; Wed, 30 Aug 2017 17:19:49 +0300 From: Yishai Hadas To: linux-rdma@vger.kernel.org Cc: yishaih@mellanox.com, leonro@mellanox.com, majd@mellanox.com Subject: [PATCH rdma-core 1/2] mlx5: Rename arm_db pointer to be cq_uar to better describe the content Date: Wed, 30 Aug 2017 17:19:23 +0300 Message-Id: <1504102764-21638-2-git-send-email-yishaih@mellanox.com> X-Mailer: git-send-email 1.8.2.3 In-Reply-To: <1504102764-21638-1-git-send-email-yishaih@mellanox.com> References: <1504102764-21638-1-git-send-email-yishaih@mellanox.com> Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Leon Romanovsky The arm_db field which was renamed from uar in this rdma-core release is actually cq_uar. Change its name before the rdma-core library is released and update man page accordingly. Fixes: 9b713bd703e9 ("mlx5: Fix ABI break from revising the UAR pointer") Signed-off-by: Leon Romanovsky Reviewed-by: Yishai Hadas --- providers/mlx5/man/mlx5dv_init_obj.3 | 2 +- providers/mlx5/mlx5.c | 4 ++-- providers/mlx5/mlx5dv.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/providers/mlx5/man/mlx5dv_init_obj.3 b/providers/mlx5/man/mlx5dv_init_obj.3 index 2468407..60d224a 100644 --- a/providers/mlx5/man/mlx5dv_init_obj.3 +++ b/providers/mlx5/man/mlx5dv_init_obj.3 @@ -52,7 +52,7 @@ void *buf; uint32_t *dbrec; uint32_t cqe_cnt; uint32_t cqe_size; -void *uar; +void *cq_uar; uint32_t cqn; uint64_t comp_mask; .in -8 diff --git a/providers/mlx5/mlx5.c b/providers/mlx5/mlx5.c index c949c0f..19e2aef 100644 --- a/providers/mlx5/mlx5.c +++ b/providers/mlx5/mlx5.c @@ -680,7 +680,7 @@ static int mlx5dv_get_cq(struct ibv_cq *cq_in, cq_out->cqe_size = mcq->cqe_sz; cq_out->buf = mcq->active_buf->buf; cq_out->dbrec = mcq->dbrec; - cq_out->arm_db = mctx->uar[0]; + cq_out->cq_uar = mctx->uar[0]; mcq->flags |= MLX5_CQ_FLAGS_DV_OWNED; @@ -747,7 +747,7 @@ COMPAT_SYMVER_FUNC(mlx5dv_init_obj, 1_0, "MLX5_1.0", /* ABI version 1.0 returns the void ** in this memory * location */ - obj->cq.out->arm_db = to_mctx(obj->cq.in->context)->uar; + obj->cq.out->cq_uar = to_mctx(obj->cq.in->context)->uar; } return ret; } diff --git a/providers/mlx5/mlx5dv.h b/providers/mlx5/mlx5dv.h index 1a2e257..5d11625 100644 --- a/providers/mlx5/mlx5dv.h +++ b/providers/mlx5/mlx5dv.h @@ -129,7 +129,7 @@ struct mlx5dv_cq { __be32 *dbrec; uint32_t cqe_cnt; uint32_t cqe_size; - void *arm_db; + void *cq_uar; uint32_t cqn; uint64_t comp_mask; };