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>

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c
index 98a99b1..362dca3 100644 (file)
--- 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;