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 AFB61CA9EAF for ; Sun, 27 Oct 2019 07:07:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 84C7A20873 for ; Sun, 27 Oct 2019 07:07:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572160027; bh=M+HI2SDS6L+iUuIQnfHiL+UY8p79ekSXfhV+Phyqu0k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Ne4BhfEE0w9MmLefyw07XFTqWVXbmODnGmNC1DOjy1BsAFoPVTyeaLxXOOUFvQNF5 S57EEIjVpkLMOZakg5B6sTCNmDB1Q3QhcnI0zYO4Hg50j3ph8PDcE6jnOUXhgzvaii tjU8xWVFM2qd1i/WI41ICtoWlE4KvGferyEru17w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726316AbfJ0HHH (ORCPT ); Sun, 27 Oct 2019 03:07:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:34900 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725965AbfJ0HHG (ORCPT ); Sun, 27 Oct 2019 03:07:06 -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 6C5F120578; Sun, 27 Oct 2019 07:07:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572160026; bh=M+HI2SDS6L+iUuIQnfHiL+UY8p79ekSXfhV+Phyqu0k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=y28mG/RKUd6LWcgAsryAU+sA+SDji4ShacuONdMOSo/GNprV1UVldCPFlrbYN6Zc9 l3bTNstmLzzER3EhWJsz6206ONoLI8AE9fWJ+kNEidIfExieW/+K7OvMoGx9uzGky0 QgMtJ0kOoed9nTDa7Z+tM5F7yDoKbTI+KZo479vE= From: Leon Romanovsky To: Doug Ledford , Jason Gunthorpe Cc: Leon Romanovsky , RDMA mailing list Subject: [PATCH rdma-next 06/43] RDMA/cm: Ready To Use (RTU) definitions Date: Sun, 27 Oct 2019 09:05:44 +0200 Message-Id: <20191027070621.11711-7-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 Add RTU message definitions as it is written in IBTA release 1.3 volume 1. Signed-off-by: Leon Romanovsky --- drivers/infiniband/core/cm.c | 4 ++-- drivers/infiniband/core/cm_msgs.h | 9 ++++++++- include/rdma/ib_cm.h | 1 - 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c index 85836f8e5c67..41cf2a0de051 100644 --- a/drivers/infiniband/core/cm.c +++ b/drivers/infiniband/core/cm.c @@ -2132,7 +2132,7 @@ int ib_send_cm_rtu(struct ib_cm_id *cm_id, void *data; int ret; - if (private_data && private_data_len > IB_CM_RTU_PRIVATE_DATA_SIZE) + if (private_data && private_data_len > CM_RTU_PRIVATE_DATA_SIZE) return -EINVAL; data = cm_copy_private_data(private_data, private_data_len); @@ -2397,7 +2397,7 @@ static int cm_rtu_handler(struct cm_work *work) return -EINVAL; work->cm_event.private_data = &rtu_msg->private_data; - work->cm_event.private_data_len = IB_CM_RTU_PRIVATE_DATA_SIZE; + work->cm_event.private_data_len = CM_RTU_PRIVATE_DATA_SIZE; spin_lock_irq(&cm_id_priv->lock); if (cm_id_priv->id.state != IB_CM_REP_SENT && diff --git a/drivers/infiniband/core/cm_msgs.h b/drivers/infiniband/core/cm_msgs.h index 39fcd1231378..6917e007c573 100644 --- a/drivers/infiniband/core/cm_msgs.h +++ b/drivers/infiniband/core/cm_msgs.h @@ -244,6 +244,13 @@ #define CM_REP_PRIVATE_DATA_OFFSET 36 #define CM_REP_PRIVATE_DATA_SIZE 196 +#define CM_RTU_LOCAL_COMM_ID_OFFSET 0 +#define CM_RTU_LOCAL_COMM_ID_MASK GENMASK(31, 0) +#define CM_RTU_REMOTE_COMM_ID_OFFSET 4 +#define CM_RTU_REMOTE_COMM_ID_MASK GENMASK(31, 0) +#define CM_RTU_PRIVATE_DATA_OFFSET 8 +#define CM_RTU_PRIVATE_DATA_SIZE 224 + struct cm_req_msg { struct ib_mad_hdr hdr; @@ -812,7 +819,7 @@ struct cm_rtu_msg { __be32 local_comm_id; __be32 remote_comm_id; - u8 private_data[IB_CM_RTU_PRIVATE_DATA_SIZE]; + u8 private_data[CM_RTU_PRIVATE_DATA_SIZE]; } __packed; diff --git a/include/rdma/ib_cm.h b/include/rdma/ib_cm.h index ebfbf63388de..34dc12b30399 100644 --- a/include/rdma/ib_cm.h +++ b/include/rdma/ib_cm.h @@ -65,7 +65,6 @@ enum ib_cm_event_type { }; enum ib_cm_data_size { - IB_CM_RTU_PRIVATE_DATA_SIZE = 224, IB_CM_DREQ_PRIVATE_DATA_SIZE = 220, IB_CM_DREP_PRIVATE_DATA_SIZE = 224, IB_CM_LAP_PRIVATE_DATA_SIZE = 168, -- 2.20.1