Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 832666c1 authored by Don Hiatt's avatar Don Hiatt Committed by Doug Ledford
Browse files

IB/hfi1, qib, rdmavt: Move AETH defines to rdma/ib_hdrs.h 



Rename RVT AETH defines and export in rdma/ib_hdrs.h

Reviewed-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarDon Hiatt <don.hiatt@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 881fccb8

drivers/infiniband/hw/hfi1/rc.c

+9 −9
Original line number Diff line number Diff line
@@ -211,9 +211,9 @@ static int make_rc_ack(struct hfi1_ibdev *dev, struct rvt_qp *qp, 
		ps->s_txreq->ss = NULL;

		if (qp->s_nak_state)

			ohdr->u.aeth =

				cpu_to_be32((qp->r_msn & RVT_MSN_MASK) |

				cpu_to_be32((qp->r_msn & IB_MSN_MASK) |

					    (qp->s_nak_state <<

					     RVT_AETH_CREDIT_SHIFT));

					     IB_AETH_CREDIT_SHIFT));

		else

			ohdr->u.aeth = rvt_compute_aeth(qp);

		hwords++;
@@ -758,9 +758,9 @@ void hfi1_send_rc_ack(struct hfi1_ctxtdata *rcd, struct rvt_qp *qp, 
	if (qp->s_mig_state == IB_MIG_MIGRATED)

		bth0 |= IB_BTH_MIG_REQ;

	if (qp->r_nak_state)

		ohdr->u.aeth = cpu_to_be32((qp->r_msn & RVT_MSN_MASK) |

		ohdr->u.aeth = cpu_to_be32((qp->r_msn & IB_MSN_MASK) |

					    (qp->r_nak_state <<

					     RVT_AETH_CREDIT_SHIFT));

					     IB_AETH_CREDIT_SHIFT));

	else

		ohdr->u.aeth = rvt_compute_aeth(qp);

	sc5 = ibp->sl_to_sc[qp->remote_ah_attr.sl];
@@ -1157,7 +1157,7 @@ static int do_rc_ack(struct rvt_qp *qp, u32 aeth, u32 psn, int opcode, 
	 * request but will include an ACK'ed request(s).

	 */

	ack_psn = psn;

	if (aeth >> RVT_AETH_NAK_SHIFT)

	if (aeth >> IB_AETH_NAK_SHIFT)

		ack_psn--;

	wqe = rvt_get_swqe_ptr(qp, qp->s_acked);

	ibp = rcd_to_iport(rcd);
@@ -1237,7 +1237,7 @@ static int do_rc_ack(struct rvt_qp *qp, u32 aeth, u32 psn, int opcode, 
			break;

	}



	switch (aeth >> RVT_AETH_NAK_SHIFT) {

	switch (aeth >> IB_AETH_NAK_SHIFT) {

	case 0:         /* ACK */

		this_cpu_inc(*ibp->rvp.rc_acks);

		if (qp->s_acked != qp->s_tail) {
@@ -1300,8 +1300,8 @@ static int do_rc_ack(struct rvt_qp *qp, u32 aeth, u32 psn, int opcode, 
			goto bail_stop;

		/* The last valid PSN is the previous PSN. */

		update_last_psn(qp, psn - 1);

		switch ((aeth >> RVT_AETH_CREDIT_SHIFT) &

			RVT_AETH_CREDIT_MASK) {

		switch ((aeth >> IB_AETH_CREDIT_SHIFT) &

			IB_AETH_CREDIT_MASK) {

		case 0: /* PSN sequence error */

			ibp->rvp.n_seq_naks++;

			/*
@@ -1431,7 +1431,7 @@ static void rc_rcv_resp(struct hfi1_ibport *ibp, 
		/* Update credits for "ghost" ACKs */

		if (diff == 0 && opcode == OP(ACKNOWLEDGE)) {

			aeth = be32_to_cpu(ohdr->u.aeth);

			if ((aeth >> RVT_AETH_NAK_SHIFT) == 0)

			if ((aeth >> IB_AETH_NAK_SHIFT) == 0)

				rvt_get_credit(qp, aeth);

		}

		goto ack_done;

drivers/infiniband/hw/hfi1/ruc.c

+1 −1
Original line number Diff line number Diff line
@@ -580,7 +580,7 @@ static void ruc_loopback(struct rvt_qp *sqp) 
	if (!(ib_rvt_state_ops[sqp->state] & RVT_PROCESS_RECV_OK))

		goto clr_busy;

	rvt_add_rnr_timer(sqp, qp->r_min_rnr_timer <<

				RVT_AETH_CREDIT_SHIFT);

				IB_AETH_CREDIT_SHIFT);

	goto clr_busy;



op_err:

drivers/infiniband/hw/hfi1/trace.c

+2 −2
Original line number Diff line number Diff line
@@ -130,14 +130,14 @@ const char *parse_everbs_hdrs( 
	case OP(RC, ACKNOWLEDGE):

		trace_seq_printf(p, AETH_PRN, be32_to_cpu(eh->aeth) >> 24,

				 parse_syndrome(be32_to_cpu(eh->aeth) >> 24),

				 be32_to_cpu(eh->aeth) & RVT_MSN_MASK);

				 be32_to_cpu(eh->aeth) & IB_MSN_MASK);

		break;

	/* aeth + atomicacketh */

	case OP(RC, ATOMIC_ACKNOWLEDGE):

		trace_seq_printf(p, AETH_PRN " " ATOMICACKETH_PRN,

				 be32_to_cpu(eh->at.aeth) >> 24,

				 parse_syndrome(be32_to_cpu(eh->at.aeth) >> 24),

				 be32_to_cpu(eh->at.aeth) & RVT_MSN_MASK,

				 be32_to_cpu(eh->at.aeth) & IB_MSN_MASK,

				 ib_u64_get(&eh->at.atomic_ack_eth));

		break;

	/* atomiceth */

drivers/infiniband/hw/qib/qib_rc.c

+9 −9
Original line number Diff line number Diff line
@@ -187,9 +187,9 @@ static int qib_make_rc_ack(struct qib_ibdev *dev, struct rvt_qp *qp, 
		qp->s_cur_sge = NULL;

		if (qp->s_nak_state)

			ohdr->u.aeth =

				cpu_to_be32((qp->r_msn & RVT_MSN_MASK) |

				cpu_to_be32((qp->r_msn & IB_MSN_MASK) |

					    (qp->s_nak_state <<

					     RVT_AETH_CREDIT_SHIFT));

					     IB_AETH_CREDIT_SHIFT));

		else

			ohdr->u.aeth = rvt_compute_aeth(qp);

		hwords++;
@@ -648,9 +648,9 @@ void qib_send_rc_ack(struct rvt_qp *qp) 
	if (qp->s_mig_state == IB_MIG_MIGRATED)

		bth0 |= IB_BTH_MIG_REQ;

	if (qp->r_nak_state)

		ohdr->u.aeth = cpu_to_be32((qp->r_msn & RVT_MSN_MASK) |

		ohdr->u.aeth = cpu_to_be32((qp->r_msn & IB_MSN_MASK) |

					    (qp->r_nak_state <<

					     RVT_AETH_CREDIT_SHIFT));

					     IB_AETH_CREDIT_SHIFT));

	else

		ohdr->u.aeth = rvt_compute_aeth(qp);

	lrh0 |= ibp->sl_to_vl[qp->remote_ah_attr.sl] << 12 |
@@ -1042,7 +1042,7 @@ static int do_rc_ack(struct rvt_qp *qp, u32 aeth, u32 psn, int opcode, 
	 * request but will include an ACK'ed request(s).

	 */

	ack_psn = psn;

	if (aeth >> RVT_AETH_NAK_SHIFT)

	if (aeth >> IB_AETH_NAK_SHIFT)

		ack_psn--;

	wqe = rvt_get_swqe_ptr(qp, qp->s_acked);

	ibp = to_iport(qp->ibqp.device, qp->port_num);
@@ -1122,7 +1122,7 @@ static int do_rc_ack(struct rvt_qp *qp, u32 aeth, u32 psn, int opcode, 
			break;

	}



	switch (aeth >> RVT_AETH_NAK_SHIFT) {

	switch (aeth >> IB_AETH_NAK_SHIFT) {

	case 0:         /* ACK */

		this_cpu_inc(*ibp->rvp.rc_acks);

		if (qp->s_acked != qp->s_tail) {
@@ -1185,8 +1185,8 @@ static int do_rc_ack(struct rvt_qp *qp, u32 aeth, u32 psn, int opcode, 
			goto bail;

		/* The last valid PSN is the previous PSN. */

		update_last_psn(qp, psn - 1);

		switch ((aeth >> RVT_AETH_CREDIT_SHIFT) &

			RVT_AETH_CREDIT_MASK) {

		switch ((aeth >> IB_AETH_CREDIT_SHIFT) &

			IB_AETH_CREDIT_MASK) {

		case 0: /* PSN sequence error */

			ibp->rvp.n_seq_naks++;

			/*
@@ -1341,7 +1341,7 @@ static void qib_rc_rcv_resp(struct qib_ibport *ibp, 
		/* Update credits for "ghost" ACKs */

		if (diff == 0 && opcode == OP(ACKNOWLEDGE)) {

			aeth = be32_to_cpu(ohdr->u.aeth);

			if ((aeth >> RVT_AETH_NAK_SHIFT) == 0)

			if ((aeth >> IB_AETH_NAK_SHIFT) == 0)

				rvt_get_credit(qp, aeth);

		}

		goto ack_done;

drivers/infiniband/hw/qib/qib_ruc.c

+1 −1
Original line number Diff line number Diff line
@@ -562,7 +562,7 @@ static void qib_ruc_loopback(struct rvt_qp *sqp) 
	if (!(ib_rvt_state_ops[sqp->state] & RVT_PROCESS_RECV_OK))

		goto clr_busy;

	rvt_add_rnr_timer(sqp, qp->r_min_rnr_timer <<

				RVT_AETH_CREDIT_SHIFT);

				IB_AETH_CREDIT_SHIFT);

	goto clr_busy;



op_err: