From: "Yuval Mintz" <yuvalmin@broadcom.com>
To: davem@davemloft.net, netdev@vger.kernel.org
Cc: ariele@broadcom.com, eilong@broadcom.com,
"Yuval Mintz" <yuvalmin@broadcom.com>
Subject: [PATCH net net 5/9] bnx2x: Fix config when SR-IOV and iSCSI are enabled
Date: Tue, 15 Oct 2013 16:28:51 +0200 [thread overview]
Message-ID: <1381847335-32662-6-git-send-email-yuvalmin@broadcom.com> (raw)
In-Reply-To: <1381847335-32662-1-git-send-email-yuvalmin@broadcom.com>
From: Ariel Elior <ariele@broadcom.com>
Starting with commit b9871bc "bnx2x: VF RSS support - PF side", if a PF will
have SR-IOV supported in its PCI configuration space, storage drivers will not
work for that interface.
This patch fixes the resource calculation to allow such a configuration to
properly work.
Signed-off-by: Ariel Elior <ariele@broadcom.com>
Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
---
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index 986edbf..275b126 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
@@ -1197,8 +1197,9 @@ union cdu_context {
/* TM (timers) host DB constants */
#define TM_ILT_PAGE_SZ_HW 0
#define TM_ILT_PAGE_SZ (4096 << TM_ILT_PAGE_SZ_HW) /* 4K */
-/* #define TM_CONN_NUM (CNIC_STARTING_CID+CNIC_ISCSI_CXT_MAX) */
-#define TM_CONN_NUM 1024
+#define TM_CONN_NUM (BNX2X_FIRST_VF_CID + \
+ BNX2X_VF_CIDS + \
+ CNIC_ISCSI_CID_MAX)
#define TM_ILT_SZ (8 * TM_CONN_NUM)
#define TM_ILT_LINES DIV_ROUND_UP(TM_ILT_SZ, TM_ILT_PAGE_SZ)
--
1.8.1.227.g44fe835
next prev parent reply other threads:[~2013-10-15 14:29 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-15 14:28 [PATCH net 0/9] bnx2x: Bug fixes patch series Yuval Mintz
2013-10-15 14:28 ` [PATCH net 1/9] bnx2x: Fix Maximum CoS estimation for VFs Yuval Mintz
2013-10-15 14:28 ` [PATCH net 2/9] bnx2x: Prevent an illegal pointer dereference during panic Yuval Mintz
2013-10-17 18:21 ` David Miller
2013-10-17 18:47 ` Eilon Greenstein
2013-10-17 20:15 ` David Miller
2013-10-15 14:28 ` [PATCH net 3/9] bnx2x: Unlock VF-PF channel on MAC/VLAN config error Yuval Mintz
2013-10-15 14:28 ` [PATCH net 4/9] bnx2x: Fix Coalescing configuration Yuval Mintz
2013-10-15 14:28 ` Yuval Mintz [this message]
2013-10-15 14:28 ` [PATCH net 6/9] bnx2x: Prevent null pointer dereference on error flow Yuval Mintz
2013-10-15 14:28 ` [PATCH net 7/9] bnx2x: Lock DMAE when used by statistic flow Yuval Mintz
2013-10-15 14:28 ` [PATCH net 8/9] bnx2x: Don't pretend during register dump Yuval Mintz
2013-10-15 14:28 ` [PATCH net 9/9] bnx2x: Set NETIF_F_HIGHDMA unconditionally Yuval Mintz
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=1381847335-32662-6-git-send-email-yuvalmin@broadcom.com \
--to=yuvalmin@broadcom.com \
--cc=ariele@broadcom.com \
--cc=davem@davemloft.net \
--cc=eilong@broadcom.com \
--cc=netdev@vger.kernel.org \
/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).