From: Jakub Kicinski <jakub.kicinski@netronome.com>
To: netdev@vger.kernel.org
Cc: Jakub Kicinski <jakub.kicinski@netronome.com>
Subject: [PATCH net-next 12/14] nfp: remove nfp_net_irqs_wanted()
Date: Mon, 31 Oct 2016 20:43:20 +0000 [thread overview]
Message-ID: <1477946602-19644-13-git-send-email-jakub.kicinski@netronome.com> (raw)
In-Reply-To: <1477946602-19644-1-git-send-email-jakub.kicinski@netronome.com>
nfp_net_irqs_wanted() doesn't really encapsulate much logic,
remove it and inline the calculations.
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
---
.../net/ethernet/netronome/nfp/nfp_net_common.c | 27 ++++------------------
1 file changed, 4 insertions(+), 23 deletions(-)
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
index 49a1f54e0787..f26c3927746f 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
@@ -308,28 +308,6 @@ static int nfp_net_msix_alloc(struct nfp_net *nn, int nr_vecs)
}
/**
- * nfp_net_irqs_wanted() - Work out how many interrupt vectors we want
- * @nn: NFP Network structure
- *
- * We want a vector per CPU (or ring), whatever is smaller plus
- * NFP_NET_NON_Q_VECTORS for LSC etc.
- *
- * Return: Number of interrupts wanted
- */
-static int nfp_net_irqs_wanted(struct nfp_net *nn)
-{
- unsigned int vecs;
- int ncpus;
-
- ncpus = num_online_cpus();
-
- vecs = max_t(int, nn->num_tx_rings, nn->num_rx_rings);
- vecs = min_t(int, vecs, ncpus);
-
- return vecs + NFP_NET_NON_Q_VECTORS;
-}
-
-/**
* nfp_net_irqs_alloc() - allocates MSI-X irqs
* @nn: NFP Network structure
*
@@ -339,7 +317,7 @@ int nfp_net_irqs_alloc(struct nfp_net *nn)
{
int wanted_irqs;
- wanted_irqs = nfp_net_irqs_wanted(nn);
+ wanted_irqs = nn->num_r_vecs + NFP_NET_NON_Q_VECTORS;
nn->num_irqs = nfp_net_msix_alloc(nn, wanted_irqs);
if (nn->num_irqs == 0) {
@@ -2726,6 +2704,9 @@ struct nfp_net *nfp_net_netdev_alloc(struct pci_dev *pdev,
nn->num_tx_rings = min_t(int, nqs, max_tx_rings);
nn->num_rx_rings = min_t(int, nqs, max_rx_rings);
+ nn->num_r_vecs = max(nn->num_tx_rings, nn->num_rx_rings);
+ nn->num_r_vecs = min_t(unsigned int, nn->num_r_vecs, num_online_cpus());
+
nn->txd_cnt = NFP_NET_TX_DESCS_DEFAULT;
nn->rxd_cnt = NFP_NET_RX_DESCS_DEFAULT;
--
1.9.1
next prev parent reply other threads:[~2016-10-31 20:44 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-31 20:43 [PATCH net-next 00/14] cleanups and RX path rewrite Jakub Kicinski
2016-10-31 20:43 ` [PATCH net-next 01/14] nfp: simplify nfp_net_poll() Jakub Kicinski
2016-10-31 20:43 ` [PATCH net-next 02/14] nfp: remove support for nfp3200 Jakub Kicinski
2016-10-31 20:43 ` [PATCH net-next 03/14] nfp: remove unnecessary call to ether_setup() Jakub Kicinski
2016-10-31 20:43 ` [PATCH net-next 04/14] nfp: remove inline attributes and dead code Jakub Kicinski
2016-10-31 20:43 ` [PATCH net-next 05/14] nfp: centralize the buffer size calculation Jakub Kicinski
2016-10-31 20:43 ` [PATCH net-next 06/14] nfp: add buffer drop/recycle helper for RX Jakub Kicinski
2016-10-31 20:43 ` [PATCH net-next 07/14] nfp: use alloc_frag() and build_skb() Jakub Kicinski
2016-10-31 20:43 ` [PATCH net-next 08/14] nfp: add separate buffer allocation function for napi Jakub Kicinski
2016-10-31 20:43 ` [PATCH net-next 09/14] nfp: use AND instead of modulo to get ring indexes Jakub Kicinski
2016-10-31 20:43 ` [PATCH net-next 10/14] nfp: create separate define for max number of vectors Jakub Kicinski
2016-10-31 20:43 ` [PATCH net-next 11/14] nfp: use unsigned int for vector/ring counts Jakub Kicinski
2016-10-31 20:43 ` Jakub Kicinski [this message]
2016-10-31 20:43 ` [PATCH net-next 13/14] nfp: replace num_irqs with max_r_vecs Jakub Kicinski
2016-10-31 20:43 ` [PATCH net-next 14/14] nfp: bring back support for different ring counts Jakub Kicinski
2016-11-01 15:05 ` [PATCH net-next 00/14] cleanups and RX path rewrite David Miller
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=1477946602-19644-13-git-send-email-jakub.kicinski@netronome.com \
--to=jakub.kicinski@netronome.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).