Patch "IB/hfi1: Move iowait_init() to priv allocate" has been added to the 4.8-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
IB/hfi1: Move iowait_init() to priv allocate
to the 4.8-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ib-hfi1-move-iowait_init-to-priv-allocate.patch
and it can be found in the queue-4.8 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
5a648dfad033bf5f945795c4e56ee7577f24f3e9Mon Sep 17 00:00:00 2001
From: Mike Marciniszyn <[email protected]>
Date: Tue, 6 Sep 2016 04:36:53 -0700
Subject: IB/hfi1: Move iowait_init() to priv allocate
From: Mike Marciniszyn <[email protected]>
commit 5a648dfad033bf5f945795c4e56ee7577f24f3e9 upstream.
The call is misplaced in the reset calldown function and causes issues with lockdep assertions that are to be added.
--- drivers/infiniband/hw/hfi1/qp.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/infiniband/hw/hfi1/qp.c +7 -7
@@ -808,6 +808,13 @@ void *qp_priv_alloc(struct rvt_dev_infokfree (priv);return ERR_PTR (-ENOMEM ); } +iowait_init ( + &priv->s_iowait, +1 , + _hfi1_do_send, + iowait_sleep, + iowait_wakeup, + iowait_sdma_drained);setup_timer (&priv->s_rnr_timer, hfi1_rc_rnr_retry, (unsigned long )qp); qp->s_timer.function = hfi1_rc_timeout;return priv;
@@ -873,13 +880,6 @@ void notify_qp_reset(struct rvt_qp *qp) {struct hfi1_qp_priv *priv = qp->priv; -iowait_init ( - &priv->s_iowait, -1 , - _hfi1_do_send, - iowait_sleep, - iowait_wakeup, - iowait_sdma_drained); priv->r_adefered =0 ;clear_ahg (qp); }
Patches currently in stable-queue which might be from [email protected] are
queue-4.8/ib-rdmavt-correct-sparse-annotation.patch queue-4.8/ib-qib-remove-qpt_mask-global.patch queue-4.8/ib-hfi1-move-iowait_init-to-priv-allocate.patch