From patchwork Wed Jun 22 12:52:20 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anirban Chakraborty X-Patchwork-Id: 101481 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 E376BB6FC8 for ; Thu, 23 Jun 2011 00:13:53 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758032Ab1FVONp (ORCPT ); Wed, 22 Jun 2011 10:13:45 -0400 Received: from hera.kernel.org ([140.211.167.34]:36207 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753924Ab1FVONp (ORCPT ); Wed, 22 Jun 2011 10:13:45 -0400 Received: from mx.mv.qlogic.com (vpn.pathscale.com [198.186.3.75] (may be forged)) by hera.kernel.org (8.14.4/8.14.3) with SMTP id p5MEDXad019770 for ; Wed, 22 Jun 2011 14:13:33 GMT X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.97 at hera.kernel.org Received: from lnxdev-sm-001.mv.qlogic.com (dut6217.mv.qlogic.com [172.29.56.217]) by mx.mv.qlogic.com (Postfix) with ESMTP id 5ADEF2D258; Wed, 22 Jun 2011 06:00:19 -0700 (PDT) Received: by lnxdev-sm-001.mv.qlogic.com (Postfix, from userid 0) id 91B9814AE91; Wed, 22 Jun 2011 05:52:24 -0700 (PDT) From: Anirban Chakraborty To: netdev@vger.kernel.org Cc: David Miller , Sucheta Chakraborty Subject: [PATCH 4/7] qlcnic: fix initial number of msix entries in adapter. Date: Wed, 22 Jun 2011 05:52:20 -0700 Message-Id: <1308747144-23785-4-git-send-email-anirban.chakraborty@qlogic.com> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1308747144-23785-1-git-send-email-anirban.chakraborty@qlogic.com> References: <1308747144-23785-1-git-send-email-anirban.chakraborty@qlogic.com> X-Spam-Status: No, score=-0.8 required=5.0 tests=BAYES_00,MAY_BE_FORGED, SPF_NEUTRAL autolearn=no version=3.3.2-r929478 X-Spam-Checker-Version: SpamAssassin 3.3.2-r929478 (2010-03-31) on hera.kernel.org X-Greylist: Delayed for 01:03:10 by milter-greylist-4.2.3 (hera.kernel.org [140.211.167.34]); Wed, 22 Jun 2011 14:13:44 +0000 (UTC) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Sucheta Chakraborty Calculation of number of MSI-X vectors was wrong on uniprocessor systems. Signed-off-by: Sucheta Chakraborty Signed-off-by: Anirban Chakraborty --- drivers/net/qlcnic/qlcnic.h | 1 - drivers/net/qlcnic/qlcnic_main.c | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/net/qlcnic/qlcnic.h b/drivers/net/qlcnic/qlcnic.h index e5bb332..58d7616 100644 --- a/drivers/net/qlcnic/qlcnic.h +++ b/drivers/net/qlcnic/qlcnic.h @@ -900,7 +900,6 @@ struct qlcnic_ipaddr { ((adapter)->flags & (QLCNIC_MSI_ENABLED | QLCNIC_MSIX_ENABLED)) #define QLCNIC_DEF_NUM_STS_DESC_RINGS 4 -#define QLCNIC_MIN_NUM_RSS_RINGS 2 #define QLCNIC_MSIX_TBL_SPACE 8192 #define QLCNIC_PCI_REG_MSIX_TBL 0x44 #define QLCNIC_MSIX_TBL_PGSIZE 4096 diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c index a656a12..a050746 100644 --- a/drivers/net/qlcnic/qlcnic_main.c +++ b/drivers/net/qlcnic/qlcnic_main.c @@ -418,10 +418,8 @@ qlcnic_setup_intr(struct qlcnic_adapter *adapter) int num_msix; if (adapter->msix_supported) { - num_msix = (num_online_cpus() >= - QLCNIC_DEF_NUM_STS_DESC_RINGS) ? - QLCNIC_DEF_NUM_STS_DESC_RINGS : - QLCNIC_MIN_NUM_RSS_RINGS; + num_msix = rounddown_pow_of_two(min_t(int, num_online_cpus(), + QLCNIC_DEF_NUM_STS_DESC_RINGS)); } else num_msix = 1;