diff options
| author |   Jakub Kicinski <jakub.kicinski@netronome.com> | 2017-06-05 17:01:55 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-06-07 12:51:41 -0400 |
| commit | 2c7e41c0b2f103056f93dd5922c03d6e2021c76d (patch) | |
| tree | cd6bcbe33776d635825c16eb642fbf9ea85f5193 /drivers/net/ethernet/netronome/nfp/nfp_net_main.c | |
| parent | nfp: slice the netdev spawning function (diff) | |
| download | linux-dev-2c7e41c0b2f103056f93dd5922c03d6e2021c76d.tar.xz linux-dev-2c7e41c0b2f103056f93dd5922c03d6e2021c76d.zip | |
nfp: allow non-equal distribution of IRQs
Thus far the code assumed all vNICs will request similar number of IRQs.
This will be no longer true with control vNICs (where 1 IRQ will suffice).
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/netronome/nfp/nfp_net_main.c')
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c index 98a99b199674..362dca38223b 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c @@ -420,7 +420,8 @@ static int nfp_net_pf_alloc_irqs(struct nfp_pf *pf) list_for_each_entry(nn, &pf->vnics, vnic_list) { unsigned int n; - n = DIV_ROUND_UP(irqs_left, vnics_left); + n = min(NFP_NET_NON_Q_VECTORS + nn->dp.num_r_vecs, + DIV_ROUND_UP(irqs_left, vnics_left)); nfp_net_irqs_assign(nn, &pf->irq_entries[num_irqs - irqs_left], n); irqs_left -= n; |