wlcore: Make sure firmware is initialized in wl1271_op_add_interface()

We have wl12xx_boot() call wl12xx_enable_interrupts() and if we have
wl1271_op_add_interface() call pm_runtime_get_sync() before the interrupts
are enabled. And then we get the following error during boot:

wlcore: ERROR ELP wakeup timeout!

Let's fix this by first checking if we need to boot the firmware. And
only after that call pm_runtime_get_sync() when interrupts are enabled.
And only after that do the check for wl12xx_need_fw_change().

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index 7ae2c7508c4cbf122b4e6072186bf92b2c32ffa2..2ac8a12beb249fa77c81c9f4a9e2d0a33b00c805 100644 (file)
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -2537,11 +2537,6 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw,
        wl12xx_get_vif_count(hw, vif, &vif_count);
 
        mutex_lock(&wl->mutex);
-       ret = pm_runtime_get_sync(wl->dev);
-       if (ret < 0) {
-               pm_runtime_put_noidle(wl->dev);
-               goto out_unlock;
-       }
 
        /*
         * in some very corner case HW recovery scenarios its possible to
@@ -2570,14 +2565,6 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw,
        if (ret < 0)
                goto out;
 
-       if (wl12xx_need_fw_change(wl, vif_count, true)) {
-               wl12xx_force_active_psm(wl);
-               set_bit(WL1271_FLAG_INTENDED_FW_RECOVERY, &wl->flags);
-               mutex_unlock(&wl->mutex);
-               wl1271_recovery_work(&wl->recovery_work);
-               return 0;
-       }
-
        /*
         * TODO: after the nvs issue will be solved, move this block
         * to start(), and make sure here the driver is ON.
@@ -2594,6 +2581,24 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw,
                        goto out;
        }
 
+       /*
+        * Call runtime PM only after possible wl12xx_init_fw() above
+        * is done. Otherwise we do not have interrupts enabled.
+        */
+       ret = pm_runtime_get_sync(wl->dev);
+       if (ret < 0) {
+               pm_runtime_put_noidle(wl->dev);
+               goto out_unlock;
+       }
+
+       if (wl12xx_need_fw_change(wl, vif_count, true)) {
+               wl12xx_force_active_psm(wl);
+               set_bit(WL1271_FLAG_INTENDED_FW_RECOVERY, &wl->flags);
+               mutex_unlock(&wl->mutex);
+               wl1271_recovery_work(&wl->recovery_work);
+               return 0;
+       }
+
        if (!wlcore_is_p2p_mgmt(wlvif)) {
                ret = wl12xx_cmd_role_enable(wl, vif->addr,
                                             role_type, &wlvif->role_id);