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

Commit 3c9d149b authored by Mike Marciniszyn's avatar Mike Marciniszyn Committed by Doug Ledford
Browse files

staging/rdma/hfi1: add unique rnr timer 



Add a new rnr timer to hfi1.

This allows for future optimizations having the
retry and rnr timers separate.

Reviewed-by: default avatarJubin John <jubin.john@intel.com>
Signed-off-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 633d2739

drivers/staging/rdma/hfi1/qp.c

+1 −1
Original line number Diff line number Diff line
@@ -607,7 +607,7 @@ void *qp_priv_alloc(struct rvt_dev_info *rdi, struct rvt_qp *qp, 
		kfree(priv);

		return ERR_PTR(-ENOMEM);

	}



	setup_timer(&priv->s_rnr_timer, hfi1_rc_rnr_retry, (unsigned long)qp);

	return priv;

}

drivers/staging/rdma/hfi1/rc.c

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ static inline int hfi1_stop_rnr_timer(struct rvt_qp *qp) 
 * hfi1_del_timers_sync - wait for any timeout routines to exit

 * @qp - the QP

 */

static inline void hfi1_del_timers_sync(struct rvt_qp *qp)

void hfi1_del_timers_sync(struct rvt_qp *qp)

{

	del_timer_sync(&qp->s_timer);

}

drivers/staging/rdma/hfi1/verbs.h

+2 −0
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ struct hfi1_qp_priv { 
	u8 s_sc;		     /* SC[0..4] for next packet */

	u8 r_adefered;               /* number of acks defered */

	struct iowait s_iowait;

	struct timer_list s_rnr_timer;

	struct rvt_qp *owner;

};
@@ -403,6 +404,7 @@ u8 ah_to_sc(struct ib_device *ibdev, struct ib_ah_attr *ah_attr); 
struct ib_ah *hfi1_create_qp0_ah(struct hfi1_ibport *ibp, u16 dlid);



void hfi1_rc_rnr_retry(unsigned long arg);

void hfi1_del_timers_sync(struct rvt_qp *qp);



void hfi1_rc_send_complete(struct rvt_qp *qp, struct hfi1_ib_header *hdr);