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

Commit 3d591099 authored by Don Hiatt's avatar Don Hiatt Committed by Doug Ledford
Browse files

IB/hfi1: Use defines from common headers 



Move FECN and BECN related defines to common header files

Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDon Hiatt <don.hiatt@intel.com>
Signed-off-by: default avatarDasaratharaman Chandramouli <dasaratharaman.chandramouli@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent cb427057

drivers/infiniband/hw/hfi1/common.h

+0 −6
Original line number Diff line number Diff line
@@ -331,12 +331,6 @@ struct diag_pkt { 
#define FULL_MGMT_P_KEY      0xFFFF



#define DEFAULT_P_KEY LIM_MGMT_P_KEY

#define HFI1_FECN_SHIFT 31

#define HFI1_FECN_MASK 1

#define HFI1_FECN_SMASK BIT(HFI1_FECN_SHIFT)

#define HFI1_BECN_SHIFT 30

#define HFI1_BECN_MASK 1

#define HFI1_BECN_SMASK BIT(HFI1_BECN_SHIFT)



/**

 * 0xF8 - 4 bits of multicast range and 1 bit for collective range

drivers/infiniband/hw/hfi1/driver.c

+4 −4
Original line number Diff line number Diff line
@@ -496,13 +496,13 @@ void hfi1_process_ecn_slowpath(struct rvt_qp *qp, struct hfi1_packet *pkt, 
	sc = hfi1_9B_get_sc5(hdr, pkt->rhf);



	bth1 = be32_to_cpu(ohdr->bth[1]);

	if (do_cnp && (bth1 & HFI1_FECN_SMASK)) {

	if (do_cnp && (bth1 & IB_FECN_SMASK)) {

		u16 pkey = (u16)be32_to_cpu(ohdr->bth[0]);



		return_cnp(ibp, qp, rqpn, pkey, dlid, rlid, sc, grh);

	}



	if (!is_mcast && (bth1 & HFI1_BECN_SMASK)) {

	if (!is_mcast && (bth1 & IB_BECN_SMASK)) {

		struct hfi1_pportdata *ppd = ppd_from_ibp(ibp);

		u32 lqpn = bth1 & RVT_QPN_MASK;

		u8 sl = ibp->sc_to_sl[sc];
@@ -635,7 +635,7 @@ static void __prescan_rxq(struct hfi1_packet *packet) 
		}



		bth1 = be32_to_cpu(packet->ohdr->bth[1]);

		is_ecn = !!(bth1 & (HFI1_FECN_SMASK | HFI1_BECN_SMASK));

		is_ecn = !!(bth1 & (IB_FECN_SMASK | IB_BECN_SMASK));



		if (!is_ecn)

			goto next;
@@ -653,7 +653,7 @@ static void __prescan_rxq(struct hfi1_packet *packet) 
		rcu_read_unlock();



		/* turn off BECN, FECN */

		bth1 &= ~(HFI1_FECN_SMASK | HFI1_BECN_SMASK);

		bth1 &= ~(IB_FECN_SMASK | IB_BECN_SMASK);

		packet->ohdr->bth[1] = cpu_to_be32(bth1);

next:

		update_ps_mdata(&mdata, rcd);

drivers/infiniband/hw/hfi1/hfi.h

+2 −2
Original line number Diff line number Diff line
@@ -1648,9 +1648,9 @@ static inline bool process_ecn(struct rvt_qp *qp, struct hfi1_packet *pkt, 
	u32 bth1;



	bth1 = be32_to_cpu(ohdr->bth[1]);

	if (unlikely(bth1 & (HFI1_BECN_SMASK | HFI1_FECN_SMASK))) {

	if (unlikely(bth1 & (IB_BECN_SMASK | IB_FECN_SMASK))) {

		hfi1_process_ecn_slowpath(qp, pkt, do_cnp);

		return bth1 & HFI1_FECN_SMASK;

		return bth1 & IB_FECN_SMASK;

	}

	return false;

}

drivers/infiniband/hw/hfi1/rc.c

+1 −1
Original line number Diff line number Diff line
@@ -773,7 +773,7 @@ void hfi1_send_rc_ack(struct hfi1_ctxtdata *rcd, struct rvt_qp *qp, 
	hdr.lrh[3] = cpu_to_be16(ppd->lid | qp->remote_ah_attr.src_path_bits);

	ohdr->bth[0] = cpu_to_be32(bth0);

	ohdr->bth[1] = cpu_to_be32(qp->remote_qpn);

	ohdr->bth[1] |= cpu_to_be32((!!is_fecn) << HFI1_BECN_SHIFT);

	ohdr->bth[1] |= cpu_to_be32((!!is_fecn) << IB_BECN_SHIFT);

	ohdr->bth[2] = cpu_to_be32(mask_psn(qp->r_ack_psn));



	/* Don't try to send ACKs if the link isn't ACTIVE */

drivers/infiniband/hw/hfi1/ruc.c

+1 −1
Original line number Diff line number Diff line
@@ -775,7 +775,7 @@ void hfi1_make_ruc_header(struct rvt_qp *qp, struct ib_other_headers *ohdr, 
	if (qp->s_flags & RVT_S_ECN) {

		qp->s_flags &= ~RVT_S_ECN;

		/* we recently received a FECN, so return a BECN */

		bth1 |= (HFI1_BECN_MASK << HFI1_BECN_SHIFT);

		bth1 |= (IB_BECN_MASK << IB_BECN_SHIFT);

	}

	ohdr->bth[1] = cpu_to_be32(bth1);

	ohdr->bth[2] = cpu_to_be32(bth2);