diff options
| author | Sebastian Sanchez | 2017-03-21 01:25:55 +0100 |
|---|---|---|
| committer | Doug Ledford | 2017-04-05 20:45:09 +0200 |
| commit | 5f14e4e6674002f377ba164114eb9a67ba23d864 (patch) | |
| tree | aadd176faa006236909562f5ee0b9be654d93c1e /drivers/infiniband/sw/rdmavt/qp.c | |
| parent | IB/hfi1: Add a patch value to the firmware version string (diff) | |
| download | kernel-qcow2-linux-5f14e4e6674002f377ba164114eb9a67ba23d864.tar.gz kernel-qcow2-linux-5f14e4e6674002f377ba164114eb9a67ba23d864.tar.xz kernel-qcow2-linux-5f14e4e6674002f377ba164114eb9a67ba23d864.zip | |
IB/rdmavt, IB/hfi1: Fix timer migration regressions
RC timeout counter isn't getting incremented.
Increment counter and add the trace for it.
Fixes: 87c23b4ab018 ("IB/rdmavt: Adding timer logic to rdmavt")
Reviewed-by: Brian Welty <brian.welty@intel.com>
Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Sebastian Sanchez <sebastian.sanchez@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/sw/rdmavt/qp.c')
| -rw-r--r-- | drivers/infiniband/sw/rdmavt/qp.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/infiniband/sw/rdmavt/qp.c b/drivers/infiniband/sw/rdmavt/qp.c index 3c55a8b420fa..d7dabdfaab8d 100644 --- a/drivers/infiniband/sw/rdmavt/qp.c +++ b/drivers/infiniband/sw/rdmavt/qp.c @@ -1,5 +1,5 @@ /* - * Copyright(c) 2016 Intel Corporation. + * Copyright(c) 2016, 2017 Intel Corporation. * * This file is provided under a dual BSD/GPLv2 license. When using or * redistributing this file, you may do so under either license. @@ -2052,8 +2052,12 @@ static void rvt_rc_timeout(unsigned long arg) spin_lock_irqsave(&qp->r_lock, flags); spin_lock(&qp->s_lock); if (qp->s_flags & RVT_S_TIMER) { + struct rvt_ibport *rvp = rdi->ports[qp->port_num - 1]; + qp->s_flags &= ~RVT_S_TIMER; + rvp->n_rc_timeouts++; del_timer(&qp->s_timer); + trace_rvt_rc_timeout(qp, qp->s_last_psn + 1); if (rdi->driver_f.notify_restart_rc) rdi->driver_f.notify_restart_rc(qp, qp->s_last_psn + 1, |