bnx2x: determine queue sizes sooner

The VF needs to determine the queues sizes before .dev_infos_get
so that it can hint to the upper layer the proper sizes.  Move
bnx2x_vf_get_resources() to .eth_dev_init and probe with the guesses
from bnx2x_init_rte().

Signed-off-by: Chas Williams <3chas3@gmail.com>
Acked-by: Rasesh Mody <rasesh.mody@qlogic.com>

diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c
index 256df12..6edb2f9 100644 (file)
--- a/drivers/net/bnx2x/bnx2x.c
+++ b/drivers/net/bnx2x/bnx2x.c
@@ -9569,8 +9569,13 @@ static int bnx2x_pci_get_caps(struct bnx2x_softc *sc)
 
 static void bnx2x_init_rte(struct bnx2x_softc *sc)
 {
-       sc->max_tx_queues = 128;
-       sc->max_rx_queues = 128;
+       if (IS_VF(sc)) {
+               sc->max_tx_queues = BNX2X_VF_MAX_QUEUES_PER_VF;
+               sc->max_rx_queues = BNX2X_VF_MAX_QUEUES_PER_VF;
+       } else {
+               sc->max_tx_queues = 128;
+               sc->max_rx_queues = 128;
+       }
 }
 
 #define FW_HEADER_LEN 104

diff --git a/drivers/net/bnx2x/bnx2x_ethdev.c b/drivers/net/bnx2x/bnx2x_ethdev.c
index 69df02e..fe8cfd0 100644 (file)
--- a/drivers/net/bnx2x/bnx2x_ethdev.c
+++ b/drivers/net/bnx2x/bnx2x_ethdev.c
@@ -87,7 +87,6 @@ bnx2x_dev_configure(struct rte_eth_dev *dev)
 {
        struct bnx2x_softc *sc = dev->data->dev_private;
        int mp_ncpus = sysconf(_SC_NPROCESSORS_CONF);
-       int ret;
 
        PMD_INIT_FUNC_TRACE();
 
@@ -121,25 +120,6 @@ bnx2x_dev_configure(struct rte_eth_dev *dev)
                return -ENXIO;
        }
 
-       if (IS_VF(sc)) {
-               if (bnx2x_dma_alloc(sc, sizeof(struct bnx2x_vf_mbx_msg),
-                                 &sc->vf2pf_mbox_mapping, "vf2pf_mbox",
-                                 RTE_CACHE_LINE_SIZE) != 0)
-                       return -ENOMEM;
-
-               sc->vf2pf_mbox = (struct bnx2x_vf_mbx_msg *)sc->vf2pf_mbox_mapping.vaddr;
-               if (bnx2x_dma_alloc(sc, sizeof(struct bnx2x_vf_bulletin),
-                                 &sc->pf2vf_bulletin_mapping, "vf2pf_bull",
-                                 RTE_CACHE_LINE_SIZE) != 0)
-                       return -ENOMEM;
-
-               sc->pf2vf_bulletin = (struct bnx2x_vf_bulletin *)sc->pf2vf_bulletin_mapping.vaddr;
-
-               ret = bnx2x_vf_get_resources(sc, sc->num_queues, sc->num_queues);
-               if (ret)
-                       return ret;
-       }
-
        return 0;
 }
 
@@ -466,6 +446,7 @@ bnx2x_common_dev_init(struct rte_eth_dev *eth_dev, int is_vf)
        ret = bnx2x_attach(sc);
        if (ret) {
                PMD_DRV_LOG(ERR, "bnx2x_attach failed (%d)", ret);
+               return ret;
        }
 
        eth_dev->data->mac_addrs = (struct ether_addr *)sc->link_params.mac_addr;
@@ -479,7 +460,30 @@ bnx2x_common_dev_init(struct rte_eth_dev *eth_dev, int is_vf)
        PMD_DRV_LOG(INFO, "portID=%d vendorID=0x%x deviceID=0x%x",
                        eth_dev->data->port_id, pci_dev->id.vendor_id, pci_dev->id.device_id);
 
-       return ret;
+       if (IS_VF(sc)) {
+               if (bnx2x_dma_alloc(sc, sizeof(struct bnx2x_vf_mbx_msg),
+                                   &sc->vf2pf_mbox_mapping, "vf2pf_mbox",
+                                   RTE_CACHE_LINE_SIZE) != 0)
+                       return -ENOMEM;
+
+               sc->vf2pf_mbox = (struct bnx2x_vf_mbx_msg *)
+                                        sc->vf2pf_mbox_mapping.vaddr;
+
+               if (bnx2x_dma_alloc(sc, sizeof(struct bnx2x_vf_bulletin),
+                                   &sc->pf2vf_bulletin_mapping, "vf2pf_bull",
+                                   RTE_CACHE_LINE_SIZE) != 0)
+                       return -ENOMEM;
+
+               sc->pf2vf_bulletin = (struct bnx2x_vf_bulletin *)
+                                            sc->pf2vf_bulletin_mapping.vaddr;
+
+               ret = bnx2x_vf_get_resources(sc, sc->max_tx_queues,
+                                            sc->max_rx_queues);
+               if (ret)
+                       return ret;
+       }
+
+       return 0;
 }
 
 static int

diff --git a/drivers/net/bnx2x/bnx2x_vfpf.c b/drivers/net/bnx2x/bnx2x_vfpf.c
index bed349a..14b1d10 100644 (file)
--- a/drivers/net/bnx2x/bnx2x_vfpf.c
+++ b/drivers/net/bnx2x/bnx2x_vfpf.c
@@ -282,6 +282,8 @@ int bnx2x_vf_get_resources(struct bnx2x_softc *sc, uint8_t tx_count, uint8_t rx_
        sc->igu_sb_cnt  = sc_resp.resc.num_sbs;
        sc->igu_base_sb = sc_resp.resc.hw_sbs[0] & 0xFF;
        sc->igu_dsb_id  = -1;
+       sc->max_tx_queues = sc_resp.resc.num_txqs;
+       sc->max_rx_queues = sc_resp.resc.num_rxqs;
 
        sc->link_params.chip_id = sc->devinfo.chip_id;
        sc->doorbell_size = sc_resp.db_size;