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 D3AB6CA9EAF for ; Sun, 27 Oct 2019 07:07:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A6DDF21850 for ; Sun, 27 Oct 2019 07:07:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572160038; bh=2MOlGUn9MVHSBmfYrRhji3TiOI1tVBqmYTxDzXD+6nI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=I4EiWz+0ffLxIDs0uWAVeBKCAiWE+8dUlUdWXeVZWgsuDCZsPSxB5lWgXOSeu5v7c JGDPEnVOMrKw0or0IC0ZxOVdw1sDR0TuvZSZ5K+KpZ7QCXdeXR2AWiEDnzUJcqD3Qr Vs0rxl1cQUbM6T+jNaeuxaZd3GalEOVZBLfRHVmY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726370AbfJ0HHS (ORCPT ); Sun, 27 Oct 2019 03:07:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:34966 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725965AbfJ0HHS (ORCPT ); Sun, 27 Oct 2019 03:07:18 -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 1FC6121726; Sun, 27 Oct 2019 07:07:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572160036; bh=2MOlGUn9MVHSBmfYrRhji3TiOI1tVBqmYTxDzXD+6nI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EkgHs/aSc35W3uNTvpnYYWZ0SC3Yg4MnDACxQfb5HRxSO41kGbsZ24K5+573AV4Gg LPQRfq189lXIMzivgPpOVoyIY8dOCldQelLSJVIW4XJg7z0OMPsekNRAKW7clGXmeq T1ukM9lYsqFYqxk7mtYw9t17waQteL0DuDfsn+dw= From: Leon Romanovsky To: Doug Ledford , Jason Gunthorpe Cc: Leon Romanovsky , RDMA mailing list Subject: [PATCH rdma-next 15/43] RDMA/cm: Convert REQ initiator depth to the new scheme Date: Sun, 27 Oct 2019 09:05:53 +0200 Message-Id: <20191027070621.11711-16-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 Adapt REQ initiator depth to new get/set macros. Signed-off-by: Leon Romanovsky --- drivers/infiniband/core/cm.c | 6 +++--- drivers/infiniband/core/cm_msgs.h | 13 ------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c index 25cbc0860bd4..519a025773ff 100644 --- a/drivers/infiniband/core/cm.c +++ b/drivers/infiniband/core/cm.c @@ -1266,7 +1266,7 @@ static void cm_format_req(struct cm_req_msg *req_msg, req_msg->service_id = param->service_id; req_msg->local_ca_guid = cm_id_priv->id.device->node_guid; CM_SET(REQ_LOCAL_QPN, req_msg, param->qp_num); - cm_req_set_init_depth(req_msg, param->initiator_depth); + CM_SET(REQ_INITIATOR_DEPTH, req_msg, param->initiator_depth); cm_req_set_remote_resp_timeout(req_msg, param->remote_cm_response_timeout); cm_req_set_qp_type(req_msg, param->qp_type); @@ -1670,7 +1670,7 @@ static void cm_format_req_event(struct cm_work *work, param->remote_qpn = CM_GET(REP_LOCAL_QPN, req_msg); param->qp_type = cm_req_get_qp_type(req_msg); param->starting_psn = be32_to_cpu(cm_req_get_starting_psn(req_msg)); - param->responder_resources = cm_req_get_init_depth(req_msg); + param->responder_resources = CM_GET(REQ_INITIATOR_DEPTH, req_msg); param->initiator_depth = CM_GET(REQ_RESPONDED_RESOURCES, req_msg); param->local_cm_response_timeout = cm_req_get_remote_resp_timeout(req_msg); @@ -2006,7 +2006,7 @@ static int cm_req_handler(struct cm_work *work) cm_id_priv->max_cm_retries = cm_req_get_max_cm_retries(req_msg); cm_id_priv->remote_qpn = CM_GET(REQ_LOCAL_QPN, req_msg); cm_id_priv->initiator_depth = CM_GET(REQ_RESPONDED_RESOURCES, req_msg); - cm_id_priv->responder_resources = cm_req_get_init_depth(req_msg); + cm_id_priv->responder_resources = CM_GET(REQ_INITIATOR_DEPTH, req_msg); cm_id_priv->path_mtu = cm_req_get_path_mtu(req_msg); cm_id_priv->pkey = req_msg->pkey; cm_id_priv->sq_psn = cm_req_get_starting_psn(req_msg); diff --git a/drivers/infiniband/core/cm_msgs.h b/drivers/infiniband/core/cm_msgs.h index ab32f8cd98d0..4f4531d38535 100644 --- a/drivers/infiniband/core/cm_msgs.h +++ b/drivers/infiniband/core/cm_msgs.h @@ -400,19 +400,6 @@ struct cm_req_msg { } __packed; -static inline u8 cm_req_get_init_depth(struct cm_req_msg *req_msg) -{ - return (u8) be32_to_cpu(req_msg->offset36); -} - -static inline void cm_req_set_init_depth(struct cm_req_msg *req_msg, - u8 init_depth) -{ - req_msg->offset36 = cpu_to_be32(init_depth | - (be32_to_cpu(req_msg->offset36) & - 0xFFFFFF00)); -} - static inline u8 cm_req_get_remote_resp_timeout(struct cm_req_msg *req_msg) { return (u8) ((be32_to_cpu(req_msg->offset40) & 0xF8) >> 3); -- 2.20.1