IB/hfi1: Use hdr2sc function to calculate 5-bit SC (b736a469) · Commits · 戴 / test

drivers/infiniband/hw/hfi1/driver.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -392,9 +392,7 @@ static void rcv_hdrerr(struct hfi1_ctxtdata rcd, struct hfi1_pportdata ppd,
		u16 rlid;
		u8 svc_type, sl, sc5;

		sc5 = (be16_to_cpu(rhdr->lrh[0]) >> 12) & 0xf;
		if (rhf_dc_info(packet->rhf))
		sc5 \|= 0x10;
		sc5 = hdr2sc(rhdr, packet->rhf);
		sl = ibp->sc_to_sl[sc5];

		lqpn = be32_to_cpu(bth[1]) & RVT_QPN_MASK;

+1 −6

Original line number	Diff line number	Diff line
		@@ -368,11 +368,6 @@ struct hfi1_packet {
		u8 etype;
		};

		static inline bool has_sc4_bit(struct hfi1_packet *p)
		{
		return !!rhf_dc_info(p->rhf);
		}

		/*
		* Private data for snoop/capture support.
		*/
		@@ -1273,7 +1268,7 @@ void receive_interrupt_work(struct work_struct *work);
		static inline int hdr2sc(struct hfi1_message_header *hdr, u64 rhf)
		{
		return ((be16_to_cpu(hdr->lrh[0]) >> 12) & 0xf) \|
		((!!(rhf & RHF_DC_INFO_SMASK)) << 4);
		((!!(rhf_dc_info(rhf))) << 4);
		}

		static inline u16 generate_jkey(kuid_t uid)

+2 −5

Original line number	Diff line number	Diff line
		@@ -1743,8 +1743,7 @@ void hfi1_cnp_rcv(struct hfi1_packet *packet)
		struct rvt_qp *qp = packet->qp;
		u32 lqpn, rqpn = 0;
		u16 rlid = 0;
		u8 sl, sc5, sc4_bit, svc_type;
		bool sc4_set = has_sc4_bit(packet);
		u8 sl, sc5, svc_type;

		switch (packet->qp->ibqp.qp_type) {
		case IB_QPT_UC:
		@@ -1767,9 +1766,7 @@ void hfi1_cnp_rcv(struct hfi1_packet *packet)
		return;
		}

		sc4_bit = sc4_set << 4;
		sc5 = (be16_to_cpu(hdr->lrh[0]) >> 12) & 0xf;
		sc5 \|= sc4_bit;
		sc5 = hdr2sc((struct hfi1_message_header *)hdr, packet->rhf);
		sl = ibp->sc_to_sl[sc5];
		lqpn = qp->ibqp.qp_num;