From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Anjali Singhai Jain <anjali.singhai@intel.com>,
netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com,
Catherine Sullivan <catherine.sullivan@intel.com>,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next v2 06/12] i40e: Remove a FW workaround for Number of MSIX vectors
Date: Thu, 6 Mar 2014 18:59:18 -0800 [thread overview]
Message-ID: <1394161164-26645-7-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1394161164-26645-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Anjali Singhai Jain <anjali.singhai@intel.com>
The Number of MSIX vectors being reported is correct and hence
we need a check to do the right thing for FWs before and after.
Change-ID: I50902d1c848adcb960ea49ac73f7865ca871a1c3
Signed-off-by: Anjali Singhai Jain <anjali.singhai@intel.com>
Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com>
Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/i40e/i40e_main.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index fa296b8..46b3507 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -5093,6 +5093,12 @@ static int i40e_get_capabilities(struct i40e_pf *pf)
/* increment MSI-X count because current FW skips one */
pf->hw.func_caps.num_msix_vectors++;
+ if (((pf->hw.aq.fw_maj_ver == 2) && (pf->hw.aq.fw_min_ver < 22)) ||
+ (pf->hw.aq.fw_maj_ver < 2)) {
+ pf->hw.func_caps.num_msix_vectors++;
+ pf->hw.func_caps.num_msix_vectors_vf++;
+ }
+
if (pf->hw.debug_mask & I40E_DEBUG_USER)
dev_info(&pf->pdev->dev,
"pf=%d, num_vfs=%d, msix_pf=%d, msix_vf=%d, fd_g=%d, fd_b=%d, pf_max_q=%d num_vsi=%d\n",
--
1.8.3.1
next prev parent reply other threads:[~2014-03-07 2:59 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-07 2:59 [net-next v2 00/12][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2014-03-07 2:59 ` [net-next v2 01/12] i40evf: Enable the ndo_set_features netdev op Jeff Kirsher
2014-03-07 2:59 ` [net-next v2 02/12] i40e: Flow Director sideband accounting Jeff Kirsher
2014-03-07 2:59 ` [net-next v2 03/12] i40e: Prevent overflow due to kzalloc Jeff Kirsher
2014-03-07 2:59 ` [net-next v2 04/12] i40e/i40evf: i40e implementation for skb_set_hash Jeff Kirsher
2014-03-07 2:59 ` [net-next v2 05/12] i40e: clean up comment style Jeff Kirsher
2014-03-07 2:59 ` Jeff Kirsher [this message]
2014-03-07 2:59 ` [net-next v2 07/12] i40e: count timeout events Jeff Kirsher
2014-03-07 2:59 ` [net-next v2 08/12] i40e: Remove a redundant filter addition Jeff Kirsher
2014-03-07 2:59 ` [net-next v2 09/12] i40e: Fix static checker warning Jeff Kirsher
2014-03-07 2:59 ` [net-next v2 10/12] i40e: fix nvm version and remove firmware report Jeff Kirsher
2014-03-07 2:59 ` [net-next v2 11/12] i40e/i40evf: carefully fill tx ring Jeff Kirsher
2014-03-09 19:52 ` Ben Hutchings
2014-03-07 2:59 ` [net-next v2 12/12] i40e/i40evf: Bump pf&vf build versions Jeff Kirsher
2014-03-07 21:19 ` [net-next v2 00/12][pull request] Intel Wired LAN Driver Updates David Miller
2014-03-07 21:37 ` Jeff Kirsher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1394161164-26645-7-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=anjali.singhai@intel.com \
--cc=catherine.sullivan@intel.com \
--cc=davem@davemloft.net \
--cc=gospo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=sassmann@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).