From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC93DCA9EAF for ; Sun, 27 Oct 2019 07:07:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 920EF21726 for ; Sun, 27 Oct 2019 07:07:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572160066; bh=mv94RiCGAQj6xJE0UmRdHNjY+oI4hIqYVSpn3Bf60LE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Me9kGBwiGv4oWeH3Bj4rqnOb7z/buJAYhw/XB2vvJ1VtBsWl1mQKD48IsYauNPOy7 drus9I970Qaj+CtD8iAXEahTLAw9u9G0RQShbaB8Ye6w20/GpXB1/VTr/SA4lPvQez eTZqCbAIOqYpLZabPNcWXwgXHAf/isPNzvSGbexI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726536AbfJ0HHq (ORCPT ); Sun, 27 Oct 2019 03:07:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:35146 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725965AbfJ0HHq (ORCPT ); Sun, 27 Oct 2019 03:07:46 -0400 Received: from localhost (unknown [77.137.89.37]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DA77320578; Sun, 27 Oct 2019 07:07:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572160065; bh=mv94RiCGAQj6xJE0UmRdHNjY+oI4hIqYVSpn3Bf60LE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xE72sqAI9wsPYsXeA0mYsuGOvAOndLhwiBRiPUmWGflDAJh6tzR6XQixuS3c91Epq 1hTTWfxsPaBzrBOOVqtyOZ6MAv7UMZ9rQOmAC8DnZjrV6+cBarQq8rRO0g7djnwnKN h67elQpt6PKfGvOdpu0ZGysmdeCxnpjl5DeIBPBo= From: Leon Romanovsky To: Doug Ledford , Jason Gunthorpe Cc: Leon Romanovsky , RDMA mailing list Subject: [PATCH rdma-next 23/43] RDMA/cm: Convert REQ RNR retry timeout counter Date: Sun, 27 Oct 2019 09:06:01 +0200 Message-Id: <20191027070621.11711-24-leon@kernel.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191027070621.11711-1-leon@kernel.org> References: <20191027070621.11711-1-leon@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org From: Leon Romanovsky Convert REQ RNR retry timeout counter to new scheme. Signed-off-by: Leon Romanovsky --- drivers/infiniband/core/cm.c | 6 +++--- drivers/infiniband/core/cm_msgs.h | 12 ------------ 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c index 442fb4dee55b..64b416e7f183 100644 --- a/drivers/infiniband/core/cm.c +++ b/drivers/infiniband/core/cm.c @@ -1296,7 +1296,7 @@ static void cm_format_req(struct cm_req_msg *req_msg, CM_SET(REQ_RESPONDED_RESOURCES, req_msg, param->responder_resources); CM_SET(REQ_RETRY_COUNT, req_msg, param->retry_count); - cm_req_set_rnr_retry_count(req_msg, param->rnr_retry_count); + CM_SET(REQ_RNR_RETRY_COUNT, req_msg, param->rnr_retry_count); cm_req_set_srq(req_msg, param->srq); } @@ -1703,7 +1703,7 @@ static void cm_format_req_event(struct cm_work *work, param->remote_cm_response_timeout = CM_GET(REQ_LOCAL_CM_RESPONSE_TIMEOUT, req_msg); param->retry_count = CM_GET(REQ_RETRY_COUNT, req_msg); - param->rnr_retry_count = cm_req_get_rnr_retry_count(req_msg); + param->rnr_retry_count = CM_GET(REQ_RNR_RETRY_COUNT, req_msg); param->srq = cm_req_get_srq(req_msg); param->ppath_sgid_attr = cm_id_priv->av.ah_attr.grh.sgid_attr; work->cm_event.private_data = &req_msg->private_data; @@ -2036,7 +2036,7 @@ static int cm_req_handler(struct cm_work *work) cm_id_priv->pkey = req_msg->pkey; cm_id_priv->sq_psn = CM_GET(REQ_STARTING_PSN, req_msg); cm_id_priv->retry_count = CM_GET(REQ_RETRY_COUNT, req_msg); - cm_id_priv->rnr_retry_count = cm_req_get_rnr_retry_count(req_msg); + cm_id_priv->rnr_retry_count = CM_GET(REQ_RNR_RETRY_COUNT, req_msg); cm_id_priv->qp_type = cm_req_get_qp_type(req_msg); cm_format_req_event(work, cm_id_priv, &listen_cm_id_priv->id); diff --git a/drivers/infiniband/core/cm_msgs.h b/drivers/infiniband/core/cm_msgs.h index 485bfc523c64..37e9bf512940 100644 --- a/drivers/infiniband/core/cm_msgs.h +++ b/drivers/infiniband/core/cm_msgs.h @@ -400,18 +400,6 @@ struct cm_req_msg { } __packed; -static inline u8 cm_req_get_rnr_retry_count(struct cm_req_msg *req_msg) -{ - return req_msg->offset50 & 0x7; -} - -static inline void cm_req_set_rnr_retry_count(struct cm_req_msg *req_msg, - u8 rnr_retry_count) -{ - req_msg->offset50 = (u8) ((req_msg->offset50 & 0xF8) | - (rnr_retry_count & 0x7)); -} - static inline u8 cm_req_get_max_cm_retries(struct cm_req_msg *req_msg) { return req_msg->offset51 >> 4; -- 2.20.1