iwlwifi: be more verbose about needed firmware

If the supported firmware versions are not found, we currently only
print "no suitable firmware found".  This is not very informative for
the user trying to find the correct version to use.  Improve this by
printing the exact firmware name(s) the driver supports and pointing
to the git repository where they can be found.

Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
index be466a074c1df8ad351c2b1ce9142a13955fae47..21c523a9cc7e7f3ba22823f417ba27985c956e5d 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
@@ -211,24 +211,39 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw,
 
 static int iwl_request_firmware(struct iwl_drv *drv, bool first)
 {
-       const char *name_pre = drv->trans->cfg->fw_name_pre;
+       const struct iwl_cfg *cfg = drv->trans->cfg;
        char tag[8];
 
        if (first) {
-               drv->fw_index = drv->trans->cfg->ucode_api_max;
+               drv->fw_index = cfg->ucode_api_max;
                sprintf(tag, "%d", drv->fw_index);
        } else {
                drv->fw_index--;
                sprintf(tag, "%d", drv->fw_index);
        }
 
-       if (drv->fw_index < drv->trans->cfg->ucode_api_min) {
+       if (drv->fw_index < cfg->ucode_api_min) {
                IWL_ERR(drv, "no suitable firmware found!\n");
+
+               if (cfg->ucode_api_min == cfg->ucode_api_max) {
+                       IWL_ERR(drv, "%s%d is required\n", cfg->fw_name_pre,
+                               cfg->ucode_api_max);
+               } else {
+                       IWL_ERR(drv, "minimum version required: %s%d\n",
+                               cfg->fw_name_pre,
+                               cfg->ucode_api_min);
+                       IWL_ERR(drv, "maximum version supported: %s%d\n",
+                               cfg->fw_name_pre,
+                               cfg->ucode_api_max);
+               }
+
+               IWL_ERR(drv,
+                       "check git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git\n");
                return -ENOENT;
        }
 
        snprintf(drv->firmware_name, sizeof(drv->firmware_name), "%s%s.ucode",
-                name_pre, tag);
+                cfg->fw_name_pre, tag);
 
        IWL_DEBUG_INFO(drv, "attempting to load firmware '%s'\n",
                       drv->firmware_name);