summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorChristopher N Bednarz <christopher.n.bednarz@intel.com>2017-03-10 12:22:03 -0800
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2017-03-29 02:15:06 -0700
commit1fca3265be916f45bcdf4f0207bcc99d0f6c1b7d (patch)
treef7cb082f55d28c7438a04badd7b566112e784d47 /drivers
parent6030308ef8e5917da2f606abdbb893435d119b28 (diff)
downloadlinux-1fca3265be916f45bcdf4f0207bcc99d0f6c1b7d.tar.gz
linux-1fca3265be916f45bcdf4f0207bcc99d0f6c1b7d.tar.bz2
linux-1fca3265be916f45bcdf4f0207bcc99d0f6c1b7d.zip
i40e: Check for new arq elements before leaving the adminq subtask loop
Fix a case where we miss an arq element if a new one is added before we enable interrupts and exit the arq subtask loop. This occurs frequently with RDMA running on Windows VF and causes long delays that prevent SMB from establishing connections. Change-ID: I3e1c8b2b960c12857d9b8275bea2c1563674392e Signed-off-by: Christopher N Bednarz <christopher.n.bednarz@intel.com> Tested-by: Andrew Bowers <andrewx.bowers@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/intel/i40e/i40e_main.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 96bedb54701c..cdf36713f4d1 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -6519,9 +6519,11 @@ static void i40e_clean_adminq_subtask(struct i40e_pf *pf)
opcode);
break;
}
- } while (pending && (i++ < pf->adminq_work_limit));
+ } while (i++ < pf->adminq_work_limit);
+
+ if (i < pf->adminq_work_limit)
+ clear_bit(__I40E_ADMINQ_EVENT_PENDING, &pf->state);
- clear_bit(__I40E_ADMINQ_EVENT_PENDING, &pf->state);
/* re-enable Admin queue interrupt cause */
val = rd32(hw, I40E_PFINT_ICR0_ENA);
val |= I40E_PFINT_ICR0_ENA_ADMINQ_MASK;