bnxt_en: Assign additional vnics to VFs.

Orabug: 25645429

Assign additional vnics to VFs whenever possible so that NTUPLE can be
supported on the VFs.

Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 8427af811a2fcbbf0c71a4b1f904f2442abdcf39)
Signed-off-by: Brian Maly <brian.maly@oracle.com>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
index 477e265280865de9457d81bb93a74654c322177a..578c6bb483c524be50bbad1802818fdd5f141d09 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
@@ -425,6 +425,8 @@ static int bnxt_hwrm_func_cfg(struct bnxt *bp, int num_vfs)
                vf_rx_rings = (pf->max_rx_rings - bp->rx_nr_rings) / num_vfs;
        vf_ring_grps = (bp->pf.max_hw_ring_grps - bp->rx_nr_rings) / num_vfs;
        vf_tx_rings = (pf->max_tx_rings - bp->tx_nr_rings) / num_vfs;
+       vf_vnics = (pf->max_vnics - bp->nr_vnics) / num_vfs;
+       vf_vnics = min_t(u16, vf_vnics, vf_rx_rings);
 
        req.enables = cpu_to_le32(FUNC_CFG_REQ_ENABLES_MTU |
                                  FUNC_CFG_REQ_ENABLES_MRU |
@@ -447,7 +449,6 @@ static int bnxt_hwrm_func_cfg(struct bnxt *bp, int num_vfs)
        req.num_rx_rings = cpu_to_le16(vf_rx_rings);
        req.num_hw_ring_grps = cpu_to_le16(vf_ring_grps);
        req.num_l2_ctxs = cpu_to_le16(4);
-       vf_vnics = 1;
 
        req.num_vnics = cpu_to_le16(vf_vnics);
        /* FIXME spec currently uses 1 bit for stats ctx */
@@ -502,6 +503,8 @@ static int bnxt_sriov_enable(struct bnxt *bp, int *num_vfs)
                            min_rx_rings)
                                rx_ok = 1;
                }
+               if (bp->pf.max_vnics - bp->nr_vnics < min_rx_rings)
+                       rx_ok = 0;
 
                if (bp->pf.max_tx_rings - bp->tx_nr_rings >= min_tx_rings)
                        tx_ok = 1;