From patchwork Thu Dec 12 09:38:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Romanovsky X-Patchwork-Id: 11287771 X-Patchwork-Delegate: jgg@ziepe.ca Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 842EF6C1 for ; Thu, 12 Dec 2019 09:40:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 634FA22527 for ; Thu, 12 Dec 2019 09:40:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576143649; bh=dOmbbPy5eqEY8uq+xCGP7R8L5pYgsNAXl3fTRVuICks=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0YYhsQhWx1j0pCs24XXpgfy30GJSqg+ecuGTqQm2X1yiDblP/PM5fq9sv5q0/mfv9 073fBRrGOs1z9vyR4RfjS2yATBjGYrecTH1MYdAQUBaUPbRMB86Cjq8Ra0XjqAuvbO XE7tymAud/583zKfDjlMmFWeTcBd9xxP31aNHcCM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728468AbfLLJks (ORCPT ); Thu, 12 Dec 2019 04:40:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:41686 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728465AbfLLJks (ORCPT ); Thu, 12 Dec 2019 04:40:48 -0500 Received: from localhost (unknown [193.47.165.251]) (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 515FA24654; Thu, 12 Dec 2019 09:40:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576143647; bh=dOmbbPy5eqEY8uq+xCGP7R8L5pYgsNAXl3fTRVuICks=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vnpNdOmS1Ax0/McLZi3Z4uzDs6WTC7S7Ou9fL8NFGWl9XRqo8Zd/08+4rOeERkv+T M0JYD+SMZjXXysXqp8KbhncG6XZBrVBclSIodO6q966C81KV7O7XZ2Htqk3K8EUm2O 5FmsKrBDzQjjTT6LcuN+gHSbP/V+dCHqbhjd51bE= From: Leon Romanovsky To: Doug Ledford , Jason Gunthorpe Cc: Leon Romanovsky , RDMA mailing list , Bart Van Assche , Sean Hefty Subject: [PATCH rdma-rc v2 41/48] RDMA/cm: Convert REP SRQ field Date: Thu, 12 Dec 2019 11:38:23 +0200 Message-Id: <20191212093830.316934-42-leon@kernel.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191212093830.316934-1-leon@kernel.org> References: <20191212093830.316934-1-leon@kernel.org> MIME-Version: 1.0 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org From: Leon Romanovsky Convert REP SRQ field. Signed-off-by: Leon Romanovsky --- drivers/infiniband/core/cm.c | 6 +++--- drivers/infiniband/core/cm_msgs.h | 11 ----------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c index 77199078d276..454650f3ec7d 100644 --- a/drivers/infiniband/core/cm.c +++ b/drivers/infiniband/core/cm.c @@ -2077,10 +2077,10 @@ static void cm_format_rep(struct cm_rep_msg *rep_msg, rep_msg->initiator_depth = param->initiator_depth; IBA_SET(CM_REP_END_TO_END_FLOW_CONTROL, rep_msg, param->flow_control); - cm_rep_set_srq(rep_msg, param->srq); + IBA_SET(CM_REP_SRQ, rep_msg, param->srq); IBA_SET(CM_REP_LOCAL_QPN, rep_msg, param->qp_num); } else { - cm_rep_set_srq(rep_msg, 1); + IBA_SET(CM_REP_SRQ, rep_msg, 1); IBA_SET(CM_REP_LOCAL_EE_CONTEXT_NUMBER, rep_msg, param->qp_num); } @@ -2230,7 +2230,7 @@ static void cm_format_rep_event(struct cm_work *work, enum ib_qp_type qp_type) param->failover_accepted = IBA_GET(CM_REP_FAILOVER_ACCEPTED, rep_msg); param->flow_control = IBA_GET(CM_REP_END_TO_END_FLOW_CONTROL, rep_msg); param->rnr_retry_count = IBA_GET(CM_REP_RNR_RETRY_COUNT, rep_msg); - param->srq = cm_rep_get_srq(rep_msg); + param->srq = IBA_GET(CM_REP_SRQ, rep_msg); work->cm_event.private_data = &rep_msg->private_data; work->cm_event.private_data_len = CM_REP_PRIVATE_DATA_SIZE; } diff --git a/drivers/infiniband/core/cm_msgs.h b/drivers/infiniband/core/cm_msgs.h index 209e19197693..cdd7e96e6355 100644 --- a/drivers/infiniband/core/cm_msgs.h +++ b/drivers/infiniband/core/cm_msgs.h @@ -132,17 +132,6 @@ struct cm_rep_msg { } __packed; -static inline u8 cm_rep_get_srq(struct cm_rep_msg *rep_msg) -{ - return (u8) ((rep_msg->offset27 >> 4) & 0x1); -} - -static inline void cm_rep_set_srq(struct cm_rep_msg *rep_msg, u8 srq) -{ - rep_msg->offset27 = (u8) ((rep_msg->offset27 & 0xEF) | - ((srq & 0x1) << 4)); -} - struct cm_rtu_msg { struct ib_mad_hdr hdr;