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

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
...@@ -607,7 +607,7 @@ void *qp_priv_alloc(struct rvt_dev_info *rdi, struct rvt_qp *qp, ...@@ -607,7 +607,7 @@ void *qp_priv_alloc(struct rvt_dev_info *rdi, struct rvt_qp *qp,
kfree(priv); kfree(priv);
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
} }
setup_timer(&priv->s_rnr_timer, hfi1_rc_rnr_retry, (unsigned long)qp);
return priv; return priv;
} }
......
...@@ -164,7 +164,7 @@ static inline int hfi1_stop_rnr_timer(struct rvt_qp *qp) ...@@ -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 * hfi1_del_timers_sync - wait for any timeout routines to exit
* @qp - the QP * @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); del_timer_sync(&qp->s_timer);
} }
......
...@@ -210,6 +210,7 @@ struct hfi1_qp_priv { ...@@ -210,6 +210,7 @@ struct hfi1_qp_priv {
u8 s_sc; /* SC[0..4] for next packet */ u8 s_sc; /* SC[0..4] for next packet */
u8 r_adefered; /* number of acks defered */ u8 r_adefered; /* number of acks defered */
struct iowait s_iowait; struct iowait s_iowait;
struct timer_list s_rnr_timer;
struct rvt_qp *owner; struct rvt_qp *owner;
}; };
...@@ -403,6 +404,7 @@ u8 ah_to_sc(struct ib_device *ibdev, struct ib_ah_attr *ah_attr); ...@@ -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); struct ib_ah *hfi1_create_qp0_ah(struct hfi1_ibport *ibp, u16 dlid);
void hfi1_rc_rnr_retry(unsigned long arg); 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); void hfi1_rc_send_complete(struct rvt_qp *qp, struct hfi1_ib_header *hdr);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment