forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-13 9d77db3c730780c8ef5ccd4b66403ff5675cfe4e
kernel/drivers/infiniband/hw/qib/qib_uc.c
....@@ -68,7 +68,7 @@
6868 goto bail;
6969 }
7070 wqe = rvt_get_swqe_ptr(qp, qp->s_last);
71
- qib_send_complete(qp, wqe, IB_WC_WR_FLUSH_ERR);
71
+ rvt_send_complete(qp, wqe, IB_WC_WR_FLUSH_ERR);
7272 goto done;
7373 }
7474
....@@ -161,7 +161,7 @@
161161
162162 case OP(SEND_FIRST):
163163 qp->s_state = OP(SEND_MIDDLE);
164
- /* FALLTHROUGH */
164
+ fallthrough;
165165 case OP(SEND_MIDDLE):
166166 len = qp->s_len;
167167 if (len > pmtu) {
....@@ -185,7 +185,7 @@
185185
186186 case OP(RDMA_WRITE_FIRST):
187187 qp->s_state = OP(RDMA_WRITE_MIDDLE);
188
- /* FALLTHROUGH */
188
+ fallthrough;
189189 case OP(RDMA_WRITE_MIDDLE):
190190 len = qp->s_len;
191191 if (len > pmtu) {
....@@ -351,7 +351,7 @@
351351 goto no_immediate_data;
352352 else if (opcode == OP(SEND_ONLY_WITH_IMMEDIATE))
353353 goto send_last_imm;
354
- /* FALLTHROUGH */
354
+ fallthrough;
355355 case OP(SEND_MIDDLE):
356356 /* Check for invalid length PMTU or posted rwqe len. */
357357 if (unlikely(tlen != (hdrsize + pmtu + 4)))
....@@ -359,7 +359,7 @@
359359 qp->r_rcv_len += pmtu;
360360 if (unlikely(qp->r_rcv_len > qp->r_len))
361361 goto rewind;
362
- qib_copy_sge(&qp->r_sge, data, pmtu, 0);
362
+ rvt_copy_sge(qp, &qp->r_sge, data, pmtu, false, false);
363363 break;
364364
365365 case OP(SEND_LAST_WITH_IMMEDIATE):
....@@ -385,7 +385,7 @@
385385 if (unlikely(wc.byte_len > qp->r_len))
386386 goto rewind;
387387 wc.opcode = IB_WC_RECV;
388
- qib_copy_sge(&qp->r_sge, data, tlen, 0);
388
+ rvt_copy_sge(qp, &qp->r_sge, data, tlen, false, false);
389389 rvt_put_ss(&qp->s_rdma_read_sge);
390390 last_imm:
391391 wc.wr_id = qp->r_wr_id;
....@@ -400,8 +400,7 @@
400400 wc.dlid_path_bits = 0;
401401 wc.port_num = 0;
402402 /* Signal completion event if the solicited bit is set. */
403
- rvt_cq_enter(ibcq_to_rvtcq(qp->ibqp.recv_cq), &wc,
404
- ib_bth_is_solicited(ohdr));
403
+ rvt_recv_cq(qp, &wc, ib_bth_is_solicited(ohdr));
405404 break;
406405
407406 case OP(RDMA_WRITE_FIRST):
....@@ -441,7 +440,7 @@
441440 wc.ex.imm_data = ohdr->u.rc.imm_data;
442441 goto rdma_last_imm;
443442 }
444
- /* FALLTHROUGH */
443
+ fallthrough;
445444 case OP(RDMA_WRITE_MIDDLE):
446445 /* Check for invalid length PMTU or posted rwqe len. */
447446 if (unlikely(tlen != (hdrsize + pmtu + 4)))
....@@ -449,7 +448,7 @@
449448 qp->r_rcv_len += pmtu;
450449 if (unlikely(qp->r_rcv_len > qp->r_len))
451450 goto drop;
452
- qib_copy_sge(&qp->r_sge, data, pmtu, 1);
451
+ rvt_copy_sge(qp, &qp->r_sge, data, pmtu, true, false);
453452 break;
454453
455454 case OP(RDMA_WRITE_LAST_WITH_IMMEDIATE):
....@@ -479,7 +478,7 @@
479478 }
480479 wc.byte_len = qp->r_len;
481480 wc.opcode = IB_WC_RECV_RDMA_WITH_IMM;
482
- qib_copy_sge(&qp->r_sge, data, tlen, 1);
481
+ rvt_copy_sge(qp, &qp->r_sge, data, tlen, true, false);
483482 rvt_put_ss(&qp->r_sge);
484483 goto last_imm;
485484
....@@ -495,7 +494,7 @@
495494 tlen -= (hdrsize + pad + 4);
496495 if (unlikely(tlen + qp->r_rcv_len != qp->r_len))
497496 goto drop;
498
- qib_copy_sge(&qp->r_sge, data, tlen, 1);
497
+ rvt_copy_sge(qp, &qp->r_sge, data, tlen, true, false);
499498 rvt_put_ss(&qp->r_sge);
500499 break;
501500