From 8ea28f13bbac05999d6136548e8b8a07d7b387c9 Mon Sep 17 00:00:00 2001

From: Johannes Berg <johannes.berg@intel.com>

Date: Fri, 4 Feb 2022 12:25:06 +0200

Subject: [PATCH] iwlwifi: drv: load tlv debug data earlier

Git-commit: 8ea28f13bbac05999d6136548e8b8a07d7b387c9

Patch-mainline: v5.18-rc1

References: bsc#1202131

There's no good reason to pick the opmode first and load this

under the mutex, so just load it before continuing. This will

let us load it asynchronously more easily later.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

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

Link: https://lore.kernel.org/r/iwlwifi.20220204122220.a28df852f70d.Icaf6556d81bc137a459aabf0511d46c3861b0413@changeid

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c

index 5a9e644a791c..ab52136cffb4 100644

--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c

+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c

@@ -1647,6 +1647,8 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)

 	/* We have our copies now, allow OS release its copies */

 	release_firmware(ucode_raw);

+	iwl_dbg_tlv_load_bin(drv->trans->dev, drv->trans);

+

 	mutex_lock(&iwlwifi_opmode_table_mtx);

 	switch (fw->type) {

 	case IWL_FW_DVM:

@@ -1663,8 +1665,6 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)

 	IWL_INFO(drv, "loaded firmware version %s op_mode %s\n",

 		 drv->fw.fw_version, op->name);

-	iwl_dbg_tlv_load_bin(drv->trans->dev, drv->trans);

-

 	/* add this device to the list of devices using this op_mode */

 	list_add_tail(&drv->list, &op->drv);

-- 

2.35.3