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

Commit 261a4351 authored by Mike Marciniszyn's avatar Mike Marciniszyn Committed by Doug Ledford
Browse files

IB/qib,IB/hfi: Use core common header file 



Use common header file structs, defines, and accessors
in the drivers.  The old declarations are removed.

The repositioning of the includes allows for the removal
of hfi1_message_header and replaces its use with ib_header.

Also corrected are two issues with set_armed_to_active():
- The "packet" parameter is now a pointer as it should have been
- The etype is validated to insure that the header is correct

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

drivers/infiniband/hw/hfi1/chip.c

+3 −3
Original line number Diff line number Diff line
@@ -9718,12 +9718,12 @@ void hfi1_clear_tids(struct hfi1_ctxtdata *rcd) 
		hfi1_put_tid(dd, i, PT_INVALID, 0, 0);

}



struct hfi1_message_header *hfi1_get_msgheader(

struct ib_header *hfi1_get_msgheader(

	struct hfi1_devdata *dd, __le32 *rhf_addr)

{

	u32 offset = rhf_hdrq_offset(rhf_to_cpu(rhf_addr));



	return (struct hfi1_message_header *)

	return (struct ib_header *)

		(rhf_addr - dd->rhf_offset + offset);

}

drivers/infiniband/hw/hfi1/chip.h

+1 −1
Original line number Diff line number Diff line
@@ -1336,7 +1336,7 @@ enum { 
u64 get_all_cpu_total(u64 __percpu *cntr);

void hfi1_start_cleanup(struct hfi1_devdata *dd);

void hfi1_clear_tids(struct hfi1_ctxtdata *rcd);

struct hfi1_message_header *hfi1_get_msgheader(

struct ib_header *hfi1_get_msgheader(

				struct hfi1_devdata *dd, __le32 *rhf_addr);

int hfi1_init_ctxt(struct send_context *sc);

void hfi1_put_tid(struct hfi1_devdata *dd, u32 index,

drivers/infiniband/hw/hfi1/common.h

+0 −8
Original line number Diff line number Diff line
@@ -320,14 +320,6 @@ struct diag_pkt { 
/* RHF receive type error - bypass packet errors */

#define RHF_RTE_BYPASS_NO_ERR		0x0



/*

 * This structure contains the first field common to all protocols

 * that employ this chip.

 */

struct hfi1_message_header {

	__be16 lrh[4];

};



/* IB - LRH header constants */

#define HFI1_LRH_GRH 0x0003      /* 1. word of IB LRH - next header: GRH */

#define HFI1_LRH_BTH 0x0002      /* 1. word of IB LRH - next header: BTH */

drivers/infiniband/hw/hfi1/driver.c

+17 −18
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ inline int hfi1_rcvbuf_validate(u32 size, u8 type, u16 *encoded) 
static void rcv_hdrerr(struct hfi1_ctxtdata *rcd, struct hfi1_pportdata *ppd,

		       struct hfi1_packet *packet)

{

	struct hfi1_message_header *rhdr = packet->hdr;

	struct ib_header *rhdr = packet->hdr;

	u32 rte = rhf_rcv_type_err(packet->rhf);

	int lnh = be16_to_cpu(rhdr->lrh[0]) & 3;

	struct hfi1_ibport *ibp = &ppd->ibport_data;
@@ -288,10 +288,9 @@ static void rcv_hdrerr(struct hfi1_ctxtdata *rcd, struct hfi1_pportdata *ppd, 


	if (packet->rhf & RHF_TID_ERR) {

		/* For TIDERR and RC QPs preemptively schedule a NAK */

		struct hfi1_ib_header *hdr = (struct hfi1_ib_header *)rhdr;

		struct hfi1_other_headers *ohdr = NULL;

		struct ib_other_headers *ohdr = NULL;

		u32 tlen = rhf_pkt_len(packet->rhf); /* in bytes */

		u16 lid  = be16_to_cpu(hdr->lrh[1]);

		u16 lid  = be16_to_cpu(rhdr->lrh[1]);

		u32 qp_num;

		u32 rcv_flags = 0;
@@ -301,14 +300,14 @@ static void rcv_hdrerr(struct hfi1_ctxtdata *rcd, struct hfi1_pportdata *ppd, 


		/* Check for GRH */

		if (lnh == HFI1_LRH_BTH) {

			ohdr = &hdr->u.oth;

			ohdr = &rhdr->u.oth;

		} else if (lnh == HFI1_LRH_GRH) {

			u32 vtf;



			ohdr = &hdr->u.l.oth;

			if (hdr->u.l.grh.next_hdr != IB_GRH_NEXT_HDR)

			ohdr = &rhdr->u.l.oth;

			if (rhdr->u.l.grh.next_hdr != IB_GRH_NEXT_HDR)

				goto drop;

			vtf = be32_to_cpu(hdr->u.l.grh.version_tclass_flow);

			vtf = be32_to_cpu(rhdr->u.l.grh.version_tclass_flow);

			if ((vtf >> IB_GRH_VERSION_SHIFT) != IB_GRH_VERSION)

				goto drop;

			rcv_flags |= HFI1_HAS_GRH;
@@ -344,7 +343,7 @@ static void rcv_hdrerr(struct hfi1_ctxtdata *rcd, struct hfi1_pportdata *ppd, 
			case IB_QPT_RC:

				hfi1_rc_hdrerr(

					rcd,

					hdr,

					rhdr,

					rcv_flags,

					qp);

				break;
@@ -452,8 +451,8 @@ void hfi1_process_ecn_slowpath(struct rvt_qp *qp, struct hfi1_packet *pkt, 
			       bool do_cnp)

{

	struct hfi1_ibport *ibp = to_iport(qp->ibqp.device, qp->port_num);

	struct hfi1_ib_header *hdr = pkt->hdr;

	struct hfi1_other_headers *ohdr = pkt->ohdr;

	struct ib_header *hdr = pkt->hdr;

	struct ib_other_headers *ohdr = pkt->ohdr;

	struct ib_grh *grh = NULL;

	u32 rqpn = 0, bth1;

	u16 rlid, dlid = be16_to_cpu(hdr->lrh[1]);
@@ -487,7 +486,7 @@ void hfi1_process_ecn_slowpath(struct rvt_qp *qp, struct hfi1_packet *pkt, 
		return;

	}



	sc = hdr2sc((struct hfi1_message_header *)hdr, pkt->rhf);

	sc = hdr2sc(hdr, pkt->rhf);



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

	if (do_cnp && (bth1 & HFI1_FECN_SMASK)) {
@@ -599,8 +598,8 @@ static void __prescan_rxq(struct hfi1_packet *packet) 
		__le32 *rhf_addr = (__le32 *)rcd->rcvhdrq + mdata.ps_head +

					 dd->rhf_offset;

		struct rvt_qp *qp;

		struct hfi1_ib_header *hdr;

		struct hfi1_other_headers *ohdr;

		struct ib_header *hdr;

		struct ib_other_headers *ohdr;

		struct rvt_dev_info *rdi = &dd->verbs_dev.rdi;

		u64 rhf = rhf_to_cpu(rhf_addr);

		u32 etype = rhf_rcv_type(rhf), qpn, bth1;
@@ -616,8 +615,8 @@ static void __prescan_rxq(struct hfi1_packet *packet) 
		if (etype != RHF_RCV_TYPE_IB)

			goto next;



		hdr = (struct hfi1_ib_header *)

			hfi1_get_msgheader(dd, rhf_addr);

		hdr = hfi1_get_msgheader(dd, rhf_addr);



		lnh = be16_to_cpu(hdr->lrh[0]) & 3;



		if (lnh == HFI1_LRH_BTH)
@@ -892,7 +891,7 @@ static inline int set_armed_to_active(struct hfi1_ctxtdata *rcd, 
				      struct hfi1_devdata *dd)

{

	struct work_struct *lsaw = &rcd->ppd->linkstate_active_work;

	struct hfi1_message_header *hdr = hfi1_get_msgheader(packet->rcd->dd,

	struct ib_header *hdr = hfi1_get_msgheader(packet->rcd->dd,

						   packet->rhf_addr);

	u8 etype = rhf_rcv_type(packet->rhf);

drivers/infiniband/hw/hfi1/hfi.h

+4 −3
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ 
#include <linux/kthread.h>

#include <linux/i2c.h>

#include <linux/i2c-algo-bit.h>

#include <rdma/ib_hdrs.h>

#include <rdma/rdma_vt.h>



#include "chip_registers.h"
@@ -350,7 +351,7 @@ struct hfi1_packet { 
	struct hfi1_ctxtdata *rcd;

	__le32 *rhf_addr;

	struct rvt_qp *qp;

	struct hfi1_other_headers *ohdr;

	struct ib_other_headers *ohdr;

	u64 rhf;

	u32 maxcnt;

	u32 rhqoff;
@@ -1268,7 +1269,7 @@ static inline u32 driver_lstate(struct hfi1_pportdata *ppd) 
void receive_interrupt_work(struct work_struct *work);



/* extract service channel from header and rhf */

static inline int hdr2sc(struct hfi1_message_header *hdr, u64 rhf)

static inline int hdr2sc(struct ib_header *hdr, u64 rhf)

{

	return ((be16_to_cpu(hdr->lrh[0]) >> 12) & 0xf) |

	       ((!!(rhf_dc_info(rhf))) << 4);
@@ -1603,7 +1604,7 @@ void hfi1_process_ecn_slowpath(struct rvt_qp *qp, struct hfi1_packet *pkt, 
static inline bool process_ecn(struct rvt_qp *qp, struct hfi1_packet *pkt,

			       bool do_cnp)

{

	struct hfi1_other_headers *ohdr = pkt->ohdr;

	struct ib_other_headers *ohdr = pkt->ohdr;

	u32 bth1;



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