[PATCH] RDMA/rxe: Remove duplicate WR_ATOMIC_OR_READ_MASK

[PATCH] RDMA/rxe: Remove duplicate WR_ATOMIC_OR_READ_MASK

[Xiao Yang]

Signed-off-by: Xiao Yang <yangx.jy@fujitsu.com>
---
 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)
-- 
2.25.1

Re: [PATCH] RDMA/rxe: Remove duplicate WR_ATOMIC_OR_READ_MASK

[Leon Romanovsky]

On Thu, Dec 30, 2021 at 04:56:10PM +0800, Xiao Yang wrote:
> Signed-off-by: Xiao Yang <yangx.jy@fujitsu.com>
> ---
>  drivers/infiniband/sw/rxe/rxe_comp.c   | 4 ++--
>  drivers/infiniband/sw/rxe/rxe_opcode.h | 1 -
>  2 files changed, 2 insertions(+), 3 deletions(-)

I see that you replaced WR_ATOMIC_MASK to be WR_WRITE_MASK.
What problem are you trying to fix?

Please describe it in use commit message.

Thanks

Re: [PATCH] RDMA/rxe: Remove duplicate WR_ATOMIC_OR_READ_MASK

[yangx.jy]

On 2022/1/3 19:45, Leon Romanovsky wrote:
> I see that you replaced WR_ATOMIC_MASK to be WR_WRITE_MASK.
> What problem are you trying to fix?
>
> Please describe it in use commit message.
Hi,

Sorry, this is a wrong patch. Please ignore it.

Best Regards,
Xiao Yang
> Thanks