bnxt_en: Add new VF resource allocation strategy mode.

The new mode is "minimal-static" to be used when resources are more
limited to support a large number of VFs, for example  The PF driver
will provision guaranteed minimum resources of 0.  Each VF has no
guranteed resources until it tries to reserve resources during device
open.

Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index fd936c5e8760bd329474f0234be4a1ff5718ac4a..e0e3b4b72c015de42440079d51e2b95d3f00034e 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -5162,7 +5162,7 @@ int bnxt_hwrm_func_resc_qcaps(struct bnxt *bp, bool all)
 
                pf->vf_resv_strategy =
                        le16_to_cpu(resp->vf_reservation_strategy);
-               if (pf->vf_resv_strategy > BNXT_VF_RESV_STRATEGY_MINIMAL)
+               if (pf->vf_resv_strategy > BNXT_VF_RESV_STRATEGY_MINIMAL_STATIC)
                        pf->vf_resv_strategy = BNXT_VF_RESV_STRATEGY_MAXIMAL;
        }
 hwrm_func_resc_qcaps_exit:

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index 47eec148e745e583425ea5dca2f3d5a96fa82a6a..b44a75874a2f51213657e441459cd784262484a7 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -862,6 +862,7 @@ struct bnxt_pf_info {
        u8      vf_resv_strategy;
 #define BNXT_VF_RESV_STRATEGY_MAXIMAL  0
 #define BNXT_VF_RESV_STRATEGY_MINIMAL  1
+#define BNXT_VF_RESV_STRATEGY_MINIMAL_STATIC   2
        void                    *hwrm_cmd_req_addr[4];
        dma_addr_t              hwrm_cmd_req_dma_addr[4];
        struct bnxt_vf_info     *vf;

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
index f560845c5a9ddb8126161d266590b81cd6101b59..b896a52ee8bec64579a48782c34d360bc419693b 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
@@ -447,7 +447,7 @@ static int bnxt_hwrm_func_vf_resc_cfg(struct bnxt *bp, int num_vfs)
        u16 vf_tx_rings, vf_rx_rings, vf_cp_rings;
        u16 vf_stat_ctx, vf_vnics, vf_ring_grps;
        struct bnxt_pf_info *pf = &bp->pf;
-       int i, rc = 0;
+       int i, rc = 0, min = 1;
 
        bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_FUNC_VF_RESOURCE_CFG, -1, -1);
 
@@ -464,14 +464,19 @@ static int bnxt_hwrm_func_vf_resc_cfg(struct bnxt *bp, int num_vfs)
 
        req.min_rsscos_ctx = cpu_to_le16(BNXT_VF_MIN_RSS_CTX);
        req.max_rsscos_ctx = cpu_to_le16(BNXT_VF_MAX_RSS_CTX);
-       if (pf->vf_resv_strategy == BNXT_VF_RESV_STRATEGY_MINIMAL) {
-               req.min_cmpl_rings = cpu_to_le16(1);
-               req.min_tx_rings = cpu_to_le16(1);
-               req.min_rx_rings = cpu_to_le16(1);
-               req.min_l2_ctxs = cpu_to_le16(BNXT_VF_MIN_L2_CTX);
-               req.min_vnics = cpu_to_le16(1);
-               req.min_stat_ctx = cpu_to_le16(1);
-               req.min_hw_ring_grps = cpu_to_le16(1);
+       if (pf->vf_resv_strategy == BNXT_VF_RESV_STRATEGY_MINIMAL_STATIC) {
+               min = 0;
+               req.min_rsscos_ctx = cpu_to_le16(min);
+       }
+       if (pf->vf_resv_strategy == BNXT_VF_RESV_STRATEGY_MINIMAL ||
+           pf->vf_resv_strategy == BNXT_VF_RESV_STRATEGY_MINIMAL_STATIC) {
+               req.min_cmpl_rings = cpu_to_le16(min);
+               req.min_tx_rings = cpu_to_le16(min);
+               req.min_rx_rings = cpu_to_le16(min);
+               req.min_l2_ctxs = cpu_to_le16(min);
+               req.min_vnics = cpu_to_le16(min);
+               req.min_stat_ctx = cpu_to_le16(min);
+               req.min_hw_ring_grps = cpu_to_le16(min);
        } else {
                vf_cp_rings /= num_vfs;
                vf_tx_rings /= num_vfs;