iwlwifi: uCode Alive notification with timeout

Wait for REPLY_ALIVE notification from init and runtime uCode.
based on the type of REPLY_ALIVE, different status bit will be set to
wake up the queue:
STATUS_INIT_UCODE_ALIVE for init uCode
STATUS_RT_UCODE_ALIVE for runtime uCode.

If timeout, attempt to download the failing uCode image again. This can
only be done for the init ucode images of all iwlagn devices and the
runtime ucode image of the 5000 series and up. If there is a problem
with the 4965 runtime ucode coming up we restart the interface and thus
trigger a new download of the init ucode also.

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 25 insertions, 1 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index f4eb683aa2d5..272409c80619 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -146,7 +146,7 @@ static int iwl4965_load_bsm(struct iwl_priv *priv)
 
         IWL_DEBUG_INFO(priv, "Begin load bsm\n");
 
-        priv->ucode_type = UCODE_RT;
+        priv->ucode_type = UCODE_INIT;
 
         /* make sure bootstrap program is no larger than BSM's SRAM size */
         if (len > IWL49_MAX_BSM_SIZE)
@@ -256,6 +256,8 @@ static int iwl4965_set_ucode_ptrs(struct iwl_priv *priv)
 */
 static void iwl4965_init_alive_start(struct iwl_priv *priv)
 {
+        int ret;
+
         /* Check alive response for "valid" sign from uCode */
         if (priv->card_alive_init.is_valid != UCODE_VALID_OK) {
                 /* We had an error bringing up the hardware, so take it
@@ -287,6 +289,28 @@ static void iwl4965_init_alive_start(struct iwl_priv *priv)
                 IWL_DEBUG_INFO(priv, "Couldn't set up uCode pointers.\n");
                 goto restart;
         }
+        priv->ucode_type = UCODE_RT;
+        if (test_bit(STATUS_RT_UCODE_ALIVE, &priv->status)) {
+                IWL_WARN(priv, "Runtime uCode already alive? "
+                        "Waiting for alive anyway\n");
+                clear_bit(STATUS_RT_UCODE_ALIVE, &priv->status);
+        }
+        ret = wait_event_interruptible_timeout(
+                        priv->wait_command_queue,
+                        test_bit(STATUS_RT_UCODE_ALIVE, &priv->status),
+                        UCODE_ALIVE_TIMEOUT);
+        if (!ret) {
+                /* FIXME: if STATUS_RT_UCODE_ALIVE timeout
+                 * go back to restart the download Init uCode again
+                 * this might cause to trap in the restart loop
+                 */
+                priv->ucode_type = UCODE_NONE;
+                if (!test_bit(STATUS_RT_UCODE_ALIVE, &priv->status)) {
+                        IWL_ERR(priv, "Runtime timeout after %dms\n",
+                                jiffies_to_msecs(UCODE_ALIVE_TIMEOUT));
+                        goto restart;
+                }
+        }
         return;
 
 restart: