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 1321DCA9EAF for ; Sun, 27 Oct 2019 07:07:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D746220578 for ; Sun, 27 Oct 2019 07:07:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572160063; bh=IV/KpezSKygDVo+fHhQjcWGREr1vVi14YCO/Ft1YcVg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=TgUh2Y1qHldPxFy2i83h3/q/8zOpeKyqwHQM8AhrKU/XGP4/jUGt685xpawMmCEfY L0dwKQRUpUhCwpRDof2NxNrn810UABPnBOilZQ93qy8q+NivyAlpdUr7Am5HYYGSZc 2HeHbqWLDpqn+oIqZTrtnCY58xF7tW4aG6tz8RNg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726534AbfJ0HHn (ORCPT ); Sun, 27 Oct 2019 03:07:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:35124 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725965AbfJ0HHn (ORCPT ); Sun, 27 Oct 2019 03:07:43 -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 5C93E21726; Sun, 27 Oct 2019 07:07:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572160062; bh=IV/KpezSKygDVo+fHhQjcWGREr1vVi14YCO/Ft1YcVg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DKclsQ2AzVDicNFKgegy+6ZoGKn5ZlE/K5AJ4t+wAzbffPC99dJFJtg2Hc7T/jUCr rozWeMwkt/YpNxM5rHBcxAz4TPfuhke9Pl5TC1m4SeNRuUnp3htBHWS6yRlhdovmzq Z5Co4iG8DIySKRXCDSbraHgkm0p9fZQ2sAvtJ/z8= From: Leon Romanovsky To: Doug Ledford , Jason Gunthorpe Cc: Leon Romanovsky , RDMA mailing list Subject: [PATCH rdma-next 22/43] RDMA/cm: Update REQ path MTU field Date: Sun, 27 Oct 2019 09:06:00 +0200 Message-Id: <20191027070621.11711-23-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 path MTU field to use CM_GET/CM_SET macros. Signed-off-by: Leon Romanovsky --- drivers/infiniband/core/cm.c | 8 ++++---- drivers/infiniband/core/cm_msgs.h | 10 ---------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c index ea3540cf9deb..442fb4dee55b 100644 --- a/drivers/infiniband/core/cm.c +++ b/drivers/infiniband/core/cm.c @@ -1289,7 +1289,7 @@ static void cm_format_req(struct cm_req_msg *req_msg, CM_SET(REQ_LOCAL_CM_RESPONSE_TIMEOUT, req_msg, param->local_cm_response_timeout); req_msg->pkey = param->primary_path->pkey; - cm_req_set_path_mtu(req_msg, param->primary_path->mtu); + CM_SET(REQ_PATH_PACKET_PAYLOAD_MTU, req_msg, param->primary_path->mtu); cm_req_set_max_cm_retries(req_msg, param->max_cm_retries); if (param->qp_type != IB_QPT_XRC_INI) { @@ -1576,7 +1576,7 @@ static void cm_format_paths_from_req(struct cm_req_msg *req_msg, primary_path->pkey = req_msg->pkey; primary_path->sl = cm_req_get_primary_sl(req_msg); primary_path->mtu_selector = IB_SA_EQ; - primary_path->mtu = cm_req_get_path_mtu(req_msg); + primary_path->mtu = CM_GET(REQ_PATH_PACKET_PAYLOAD_MTU, req_msg); primary_path->rate_selector = IB_SA_EQ; primary_path->rate = cm_req_get_primary_packet_rate(req_msg); primary_path->packet_life_time_selector = IB_SA_EQ; @@ -1597,7 +1597,7 @@ static void cm_format_paths_from_req(struct cm_req_msg *req_msg, alt_path->pkey = req_msg->pkey; alt_path->sl = cm_req_get_alt_sl(req_msg); alt_path->mtu_selector = IB_SA_EQ; - alt_path->mtu = cm_req_get_path_mtu(req_msg); + alt_path->mtu = CM_GET(REQ_PATH_PACKET_PAYLOAD_MTU, req_msg); alt_path->rate_selector = IB_SA_EQ; alt_path->rate = cm_req_get_alt_packet_rate(req_msg); alt_path->packet_life_time_selector = IB_SA_EQ; @@ -2032,7 +2032,7 @@ static int cm_req_handler(struct cm_work *work) 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_GET(REQ_INITIATOR_DEPTH, req_msg); - cm_id_priv->path_mtu = cm_req_get_path_mtu(req_msg); + cm_id_priv->path_mtu = CM_GET(REQ_PATH_PACKET_PAYLOAD_MTU, req_msg); 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); diff --git a/drivers/infiniband/core/cm_msgs.h b/drivers/infiniband/core/cm_msgs.h index ff7d4e9da833..485bfc523c64 100644 --- a/drivers/infiniband/core/cm_msgs.h +++ b/drivers/infiniband/core/cm_msgs.h @@ -400,16 +400,6 @@ struct cm_req_msg { } __packed; -static inline u8 cm_req_get_path_mtu(struct cm_req_msg *req_msg) -{ - return req_msg->offset50 >> 4; -} - -static inline void cm_req_set_path_mtu(struct cm_req_msg *req_msg, u8 path_mtu) -{ - req_msg->offset50 = (u8) ((req_msg->offset50 & 0xF) | (path_mtu << 4)); -} - static inline u8 cm_req_get_rnr_retry_count(struct cm_req_msg *req_msg) { return req_msg->offset50 & 0x7; -- 2.20.1