From patchwork Thu Dec 30 08:56:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Yang X-Patchwork-Id: 12701342 X-Patchwork-Delegate: leon@leon.nu Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6039C433F5 for ; Thu, 30 Dec 2021 08:57:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237798AbhL3I5R (ORCPT ); Thu, 30 Dec 2021 03:57:17 -0500 Received: from mail.cn.fujitsu.com ([183.91.158.132]:16059 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S229567AbhL3I5O (ORCPT ); Thu, 30 Dec 2021 03:57:14 -0500 IronPort-Data: A9a23:GNB4laggxJz2r97AmfCpfkzIX161sxIKZh0ujC45NGQNrF6WrkUDnGRMUD+FPKuJN2T9Kop0OoTn9R5VupaAnd9iTlM+pXw8FHgiRejtX4rAdhiqV8+xwmwvdGo+toNGLICowPkcFhcwnT/wdOixxZVA/fvQHOOlUrWcYnkZqTJME0/NtzoywobVvaY42bBVMyvV0T/Di5W31G2NglaYAUpIg063ky6Didyp0N8uUvPSUtgQ1LPWvyF94JvyvshdJVOgKmVfNrbSq+ouUNiEEm3lExcFUrtJk57wdAsEX7zTIROTzHFRXsBOgDAb/mprjPl9b6FaNC+7iB3Q9zx14MREs5OgDwU4FqPRmuUBSAQeGCZ7VUFD0OaecCfj7ZHDniUqdFOpmZ2CFnoeJ5UV8/xsBmdO7fEwJzUEbxTFjOWzqJqqQ+9um8JlPsn2FIcevGxwiz3UE54OQ5/Ma6PU5NNZ1XE7gcUmNfLfYdcJLCBjaR3ofRJCIBEUBYg4kePugWPwGwC0Anr9SbEfujCVlVIuluO2doe9RzBDfu0N9m7wm44M1z2R7skmCeGi IronPort-HdrOrdr: A9a23:ATQ5UKoEiqzK06VZA8+X1twaV5oXeYIsimQD101hICG9E/bo8/xG+c536faaslgssQ4b8+xoVJPgfZq+z+8R3WByB8bAYOCOggLBQ72KhrGSoQEIdRefysdtkY9kc4VbTOb7FEVGi6/BizWQIpINx8am/cmT6dvj8w== X-IronPort-AV: E=Sophos;i="5.88,247,1635177600"; d="scan'208";a="119744589" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 30 Dec 2021 16:57:12 +0800 Received: from G08CNEXMBPEKD04.g08.fujitsu.local (unknown [10.167.33.201]) by cn.fujitsu.com (Postfix) with ESMTP id 78F784D146FB; Thu, 30 Dec 2021 16:57:06 +0800 (CST) Received: from G08CNEXCHPEKD09.g08.fujitsu.local (10.167.33.85) by G08CNEXMBPEKD04.g08.fujitsu.local (10.167.33.201) with Microsoft SMTP Server (TLS) id 15.0.1497.23; Thu, 30 Dec 2021 16:57:07 +0800 Received: from Fedora-31.g08.fujitsu.local (10.167.220.99) by G08CNEXCHPEKD09.g08.fujitsu.local (10.167.33.209) with Microsoft SMTP Server id 15.0.1497.23 via Frontend Transport; Thu, 30 Dec 2021 16:57:04 +0800 From: Xiao Yang To: CC: , , , "Xiao Yang" Subject: [PATCH] RDMA/rxe: Remove duplicate WR_ATOMIC_OR_READ_MASK Date: Thu, 30 Dec 2021 16:56:10 +0800 Message-ID: <20211230085610.1915014-1-yangx.jy@fujitsu.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-yoursite-MailScanner-ID: 78F784D146FB.A9591 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: yangx.jy@fujitsu.com Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org Signed-off-by: Xiao Yang --- drivers/infiniband/sw/rxe/rxe_comp.c | 4 ++-- drivers/infiniband/sw/rxe/rxe_opcode.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/infiniband/sw/rxe/rxe_comp.c b/drivers/infiniband/sw/rxe/rxe_comp.c index d771ba8449a1..4afd572b84bd 100644 --- a/drivers/infiniband/sw/rxe/rxe_comp.c +++ b/drivers/infiniband/sw/rxe/rxe_comp.c @@ -180,7 +180,7 @@ static inline enum comp_state check_psn(struct rxe_qp *qp, diff = psn_compare(pkt->psn, wqe->last_psn); if (diff > 0) { if (wqe->state == wqe_state_pending) { - if (wqe->mask & WR_ATOMIC_OR_READ_MASK) + if (wqe->mask & WR_READ_OR_WRITE_MASK) return COMPST_ERROR_RETRY; reset_retry_counters(qp); @@ -200,7 +200,7 @@ static inline enum comp_state check_psn(struct rxe_qp *qp, return COMPST_COMP_ACK; else return COMPST_DONE; - } else if ((diff > 0) && (wqe->mask & WR_ATOMIC_OR_READ_MASK)) { + } else if ((diff > 0) && (wqe->mask & WR_READ_OR_WRITE_MASK)) { return COMPST_DONE; } else { return COMPST_CHECK_ACK; diff --git a/drivers/infiniband/sw/rxe/rxe_opcode.h b/drivers/infiniband/sw/rxe/rxe_opcode.h index 8f9aaaf260f2..06f3cbb0c49f 100644 --- a/drivers/infiniband/sw/rxe/rxe_opcode.h +++ b/drivers/infiniband/sw/rxe/rxe_opcode.h @@ -23,7 +23,6 @@ enum rxe_wr_mask { WR_READ_OR_WRITE_MASK = WR_READ_MASK | WR_WRITE_MASK, WR_WRITE_OR_SEND_MASK = WR_WRITE_MASK | WR_SEND_MASK, - WR_ATOMIC_OR_READ_MASK = WR_ATOMIC_MASK | WR_READ_MASK, }; #define WR_MAX_QPT (8)