leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iwlwifi: pnvm: don't skip everything when not reloading

Browse Source 
Even if we don't reload the file from disk, we still need to
trigger the PNVM load flow with the device; fix that.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Fixes: 6972592850 ("iwlwifi: read and parse PNVM file")
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/iwlwifi.20210115130252.85ef56c4ef8c.I3b853ce041a0755d45e448035bef1837995d191b@changeid
This commit is contained in:
Johannes Berg 2021-01-15 13:05:50 +02:00 committed by Kalle Valo
parent 34b9434cd0
commit 1c58bed4b7
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/net/wireless/intel/iwlwifi/fw/pnvm.c
View File

@ -224,40 +224,40 @@ static int iwl_pnvm_parse(struct iwl_trans *trans, const u8 *data,
int iwl_pnvm_load(struct iwl_trans *trans, int iwl_pnvm_load(struct iwl_trans *trans,
struct iwl_notif_wait_data *notif_wait) struct iwl_notif_wait_data *notif_wait)
{ {
const struct firmware *pnvm;
struct iwl_notification_wait pnvm_wait; struct iwl_notification_wait pnvm_wait;
static const u16 ntf_cmds[] = { WIDE_ID(REGULATORY_AND_NVM_GROUP, static const u16 ntf_cmds[] = { WIDE_ID(REGULATORY_AND_NVM_GROUP,
PNVM_INIT_COMPLETE_NTFY) }; PNVM_INIT_COMPLETE_NTFY) };
char pnvm_name[64];
int ret;
/* if the SKU_ID is empty, there's nothing to do */ /* if the SKU_ID is empty, there's nothing to do */
if (!trans->sku_id[0] && !trans->sku_id[1] && !trans->sku_id[2]) if (!trans->sku_id[0] && !trans->sku_id[1] && !trans->sku_id[2])
return 0; return 0;
/* if we already have it, nothing to do either */ /* load from disk only if we haven't done it before */
if (trans->pnvm_loaded) if (!trans->pnvm_loaded) {
return 0; const struct firmware *pnvm;
char pnvm_name[64];
int ret;
/* /*
* The prefix unfortunately includes a hyphen at the end, so * The prefix unfortunately includes a hyphen at the end, so
* don't add the dot here... * don't add the dot here...
*/ */
snprintf(pnvm_name, sizeof(pnvm_name), "%spnvm", snprintf(pnvm_name, sizeof(pnvm_name), "%spnvm",
trans->cfg->fw_name_pre); trans->cfg->fw_name_pre);
/* ...but replace the hyphen with the dot here. */ /* ...but replace the hyphen with the dot here. */
if (strlen(trans->cfg->fw_name_pre) < sizeof(pnvm_name)) if (strlen(trans->cfg->fw_name_pre) < sizeof(pnvm_name))
pnvm_name[strlen(trans->cfg->fw_name_pre) - 1] = '.'; pnvm_name[strlen(trans->cfg->fw_name_pre) - 1] = '.';
ret = firmware_request_nowarn(&pnvm, pnvm_name, trans->dev); ret = firmware_request_nowarn(&pnvm, pnvm_name, trans->dev);
if (ret) { if (ret) {
IWL_DEBUG_FW(trans, "PNVM file %s not found %d\n", IWL_DEBUG_FW(trans, "PNVM file %s not found %d\n",
pnvm_name, ret); pnvm_name, ret);
} else { } else {
iwl_pnvm_parse(trans, pnvm->data, pnvm->size); iwl_pnvm_parse(trans, pnvm->data, pnvm->size);
release_firmware(pnvm); release_firmware(pnvm);
}
} }
iwl_init_notification_wait(notif_wait, &pnvm_wait, iwl_init_notification_wait(notif_wait, &pnvm_wait,