net/cxgbe: grab available ports after firmware reset

Move code to get the available ports from the firmware after it had
been reset.  This ensures that driver uses the latest info on available
ports after firmware reset.

Signed-off-by: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>
Signed-off-by: Kumar Sanghvi <kumaras@chelsio.com>

diff --git a/drivers/net/cxgbe/cxgbe_main.c b/drivers/net/cxgbe/cxgbe_main.c
index 3617e28..21e731f 100644 (file)
--- a/drivers/net/cxgbe/cxgbe_main.c
+++ b/drivers/net/cxgbe/cxgbe_main.c
@@ -661,26 +661,6 @@ static int adap_init0(struct adapter *adap)
                goto bye;
        }
 
-       /*
-        * Find out what ports are available to us.  Note that we need to do
-        * this before calling adap_init0_no_config() since it needs nports
-        * and portvec ...
-        */
-       v = V_FW_PARAMS_MNEM(FW_PARAMS_MNEM_DEV) |
-           V_FW_PARAMS_PARAM_X(FW_PARAMS_PARAM_DEV_PORTVEC);
-       ret = t4_query_params(adap, adap->mbox, adap->pf, 0, 1, &v, &port_vec);
-       if (ret < 0) {
-               dev_err(adap, "%s: failure in t4_queury_params; error = %d\n",
-                       __func__, ret);
-               goto bye;
-       }
-
-       adap->params.nports = hweight32(port_vec);
-       adap->params.portvec = port_vec;
-
-       dev_debug(adap, "%s: adap->params.nports = %u\n", __func__,
-                 adap->params.nports);
-
        /*
         * If the firmware is initialized already (and we're not forcing a
         * master initialization), note that we're living with existing
@@ -705,6 +685,22 @@ static int adap_init0(struct adapter *adap)
                goto bye;
        }
 
+       /* Find out what ports are available to us. */
+       v = V_FW_PARAMS_MNEM(FW_PARAMS_MNEM_DEV) |
+           V_FW_PARAMS_PARAM_X(FW_PARAMS_PARAM_DEV_PORTVEC);
+       ret = t4_query_params(adap, adap->mbox, adap->pf, 0, 1, &v, &port_vec);
+       if (ret < 0) {
+               dev_err(adap, "%s: failure in t4_query_params; error = %d\n",
+                       __func__, ret);
+               goto bye;
+       }
+
+       adap->params.nports = hweight32(port_vec);
+       adap->params.portvec = port_vec;
+
+       dev_debug(adap, "%s: adap->params.nports = %u\n", __func__,
+                 adap->params.nports);
+
        /*
         * Give the SGE code a chance to pull in anything that it needs ...
         * Note that this must be called after we retrieve our VPD parameters