iwlwifi: mvm: make NVM access actually fail on failures

On any failure, including if we crash the firmware or get garbage
data, we currently ignore this and pretend the OTP was empty.
Clearly, this isn't typically the case.

In cases other than the firmware saying it can't read the requested
section, or the section having ended, make the access actually fail
and trickle the error up through the layers to fail init.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
index 6fc5cc1f2b5b3e1cf7e46c9b46e01da266325d2e..f08934b03cf34d15af1c93898a317c5697d434e7 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
@@ -179,7 +179,7 @@ static int iwl_nvm_read_chunk(struct iwl_mvm *mvm, u16 section,
                        IWL_DEBUG_EEPROM(mvm->trans->dev,
                                         "NVM access command failed with status %d (device: %s)\n",
                                         ret, mvm->cfg->name);
-                       ret = -EIO;
+                       ret = -ENODATA;
                }
                goto exit;
        }
@@ -380,8 +380,12 @@ int iwl_nvm_init(struct iwl_mvm *mvm)
                /* we override the constness for initial read */
                ret = iwl_nvm_read_section(mvm, section, nvm_buffer,
                                           size_read);
-               if (ret < 0)
+               if (ret == -ENODATA) {
+                       ret = 0;
                        continue;
+               }
+               if (ret < 0)
+                       break;
                size_read += ret;
                temp = kmemdup(nvm_buffer, ret, GFP_KERNEL);
                if (!temp) {
@@ -454,7 +458,7 @@ int iwl_nvm_init(struct iwl_mvm *mvm)
        IWL_DEBUG_EEPROM(mvm->trans->dev, "nvm version = %x\n",
                         mvm->nvm_data->nvm_version);
 
-       return 0;
+       return ret < 0 ? ret : 0;
 }
 
 struct iwl_mcc_update_resp *