From patchwork Tue Oct 6 21:27:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: clsoto@linux.vnet.ibm.com X-Patchwork-Id: 527003 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 5A938140D89 for ; Wed, 7 Oct 2015 08:27:38 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752756AbbJFV1e (ORCPT ); Tue, 6 Oct 2015 17:27:34 -0400 Received: from e24smtp02.br.ibm.com ([32.104.18.86]:58867 "EHLO e24smtp02.br.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751829AbbJFV1c (ORCPT ); Tue, 6 Oct 2015 17:27:32 -0400 Received: from /spool/local by e24smtp02.br.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 6 Oct 2015 18:27:30 -0300 Received: from d24dlp02.br.ibm.com (9.18.248.206) by e24smtp02.br.ibm.com (10.172.0.142) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 6 Oct 2015 18:27:29 -0300 X-Helo: d24dlp02.br.ibm.com X-MailFrom: clsoto@linux.vnet.ibm.com X-RcptTo: netdev@vger.kernel.org Received: from d24relay01.br.ibm.com (d24relay01.br.ibm.com [9.8.31.16]) by d24dlp02.br.ibm.com (Postfix) with ESMTP id 4092B1DC006F for ; Tue, 6 Oct 2015 17:26:25 -0400 (EDT) Received: from d24av02.br.ibm.com (d24av02.br.ibm.com [9.8.31.93]) by d24relay01.br.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t96LRt0E4333656 for ; Tue, 6 Oct 2015 18:27:55 -0300 Received: from d24av02.br.ibm.com (localhost [127.0.0.1]) by d24av02.br.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t96LRQcs017282 for ; Tue, 6 Oct 2015 18:27:27 -0300 Received: from everest-lp4.aus.stglabs.ibm.com (everest-lp4.aus.stglabs.ibm.com [9.40.195.92]) by d24av02.br.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t96LRPfF017243; Tue, 6 Oct 2015 18:27:25 -0300 From: clsoto@linux.vnet.ibm.com To: davem@davemloft.net Cc: netdev@vger.kernel.org, ogerlitz@mellanox.com, brking@linux.vnet.ibm.com, Carol L Soto Subject: [PATCH 1/2 net] net/mlx4_core: Test interrupts fail if not all comp vectors called request_irq Date: Tue, 6 Oct 2015 17:27:08 -0400 Message-Id: <1444166829-17638-1-git-send-email-clsoto@linux.vnet.ibm.com> X-Mailer: git-send-email 1.8.3.1 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15100621-0021-0000-0000-000003C6FCFA Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Carol L Soto Test interrupts fails if not all completion vectors called request_irq. This case can happen if only mlx4_en loads and we have more completion vectors than rx rings. Fixes: c66fa19c405a ('net/mlx4: Add EQ pool') Acked-by: Matan Barak Signed-off-by: Carol L Soto --- drivers/net/ethernet/mellanox/mlx4/eq.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlx4/eq.c b/drivers/net/ethernet/mellanox/mlx4/eq.c index 8e81e53..c344884 100644 --- a/drivers/net/ethernet/mellanox/mlx4/eq.c +++ b/drivers/net/ethernet/mellanox/mlx4/eq.c @@ -1364,6 +1364,10 @@ int mlx4_test_interrupts(struct mlx4_dev *dev) * and performing a NOP command */ for(i = 0; !err && (i < dev->caps.num_comp_vectors); ++i) { + /* Make sure request_irq was called */ + if (!priv->eq_table.eq[i].have_irq) + continue; + /* Temporary use polling for command completions */ mlx4_cmd_use_polling(dev);