From: "Luis R. Rodriguez" <mcgrof@kernel.org>
To: johannes.berg@intel.com, luciano.coelho@intel.com,
emmanuel.grumbach@intel.com, tj@kernel.org,
arjan@linux.intel.com, ming.lei@canonical.com, zajec5@gmail.com
Cc: jeyu@redhat.com, rusty@rustcorp.com.au, pmladek@suse.com,
gregkh@linuxfoundation.org, linuxwifi@intel.com,
linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org,
"Luis R. Rodriguez" <mcgrof@kernel.org>
Subject: [RFC 4/5] iwlwifi: move opmode loading to shared routine
Date: Thu, 16 Feb 2017 18:09:02 -0800 [thread overview]
Message-ID: <20170217020903.6370-5-mcgrof@kernel.org> (raw)
In-Reply-To: <20170217020903.6370-1-mcgrof@kernel.org>
This helps us compartmentalize all last required opmode work
and declutter the async firmware callback.
Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
---
drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 33 +++++++++++++++-------------
1 file changed, 18 insertions(+), 15 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
index 4a1937c77f90..6cfbc3c6e0d6 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
@@ -139,6 +139,8 @@ static struct iwlwifi_opmode_table {
const char *name; /* name: iwldvm, iwlmvm, etc */
const struct iwl_op_mode_ops *ops; /* pointer to op_mode ops */
struct list_head drv; /* list of devices using this op_mode */
+ bool load_requested; /* Do we need to load a driver ? */
+ struct iwl_drv *drv_req; /* Device that set load_requested */
} iwlwifi_opmode_table[] = { /* ops set when driver is initialized */
[DVM_OP_MODE] = { .name = "iwldvm", .ops = NULL },
[MVM_OP_MODE] = { .name = "iwlmvm", .ops = NULL },
@@ -1233,27 +1235,32 @@ static void _iwl_op_mode_stop(struct iwl_drv *drv)
}
}
-static void iwlwifi_try_load_op(struct iwlwifi_opmode_table *op,
- struct iwl_drv *drv)
+/* We have to unlock and then lock for the caller */
+static void iwlwifi_try_load_op(struct iwlwifi_opmode_table *op)
{
int ret = 0;
+ mutex_unlock(&iwlwifi_opmode_table_mtx);
+
ret = request_module("%s", op->name);
- if (ret)
+ if (ret) {
+ mutex_lock(&iwlwifi_opmode_table_mtx);
goto out;
+ }
mutex_lock(&iwlwifi_opmode_table_mtx);
if (!op->ops)
ret = -ENOENT;
- mutex_unlock(&iwlwifi_opmode_table_mtx);
out:
#ifdef CONFIG_IWLWIFI_OPMODE_MODULAR
if (ret)
- IWL_ERR(drv,
+ IWL_ERR(op->drv_req,
"failed to load module %s (error %d), is dynamic loading enabled?\n",
op->name, ret);
#endif
+ op->load_requested = false;
+ op->drv_req = NULL;
}
static void iwlwifi_opmode_start_drv(struct iwlwifi_opmode_table *op,
@@ -1294,6 +1301,8 @@ static void iwlwifi_opmode_dowork(void)
op = &iwlwifi_opmode_table[i];
if (op->ops)
iwlwifi_opmode_start(op);
+ else if (op->load_requested)
+ iwlwifi_try_load_op(op);
}
mutex_unlock(&iwlwifi_opmode_table_mtx);
}
@@ -1317,7 +1326,6 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)
size_t trigger_tlv_sz[FW_DBG_TRIGGER_MAX];
u32 api_ver;
int i;
- bool load_module = false;
bool usniffer_images = false;
fw->ucode_capa.max_probe_length = IWL_DEFAULT_MAX_PROBE_LENGTH;
@@ -1515,18 +1523,13 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)
/* add this device to the list of devices using this op_mode */
list_add_tail(&drv->list, &op->drv);
- if (!op->ops)
- load_module = true;
+ if (!op->ops) {
+ op->load_requested = true;
+ op->drv_req = drv;
+ }
mutex_unlock(&iwlwifi_opmode_table_mtx);
- /*
- * Load the module last so we don't block anything
- * else from proceeding if the module fails to load
- * or hangs loading.
- */
- if (load_module)
- iwlwifi_try_load_op(op, drv);
iwlwifi_opmode_dowork();
goto free;
--
2.11.0
next prev parent reply other threads:[~2017-02-17 2:09 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-17 2:08 [RFC 0/5] iwlwifi: enhance final opmode work Luis R. Rodriguez
2017-02-17 2:08 ` [RFC 1/5] iwlwifi: fix drv cleanup on opmode registration failure Luis R. Rodriguez
2017-02-19 9:16 ` Grumbach, Emmanuel
2017-02-20 17:32 ` Luis R. Rodriguez
2017-02-17 2:09 ` [RFC 2/5] iwlwifi: fix request_module() use Luis R. Rodriguez
2017-02-19 9:47 ` Grumbach, Emmanuel
2017-02-21 2:23 ` Luis R. Rodriguez
2017-02-21 7:16 ` Grumbach, Emmanuel
2017-02-21 18:15 ` Luis R. Rodriguez
2017-02-21 20:17 ` Luis R. Rodriguez
2017-02-22 0:18 ` Luis R. Rodriguez
2017-02-22 2:09 ` [PATCH v2 0/2] iwlwifi: corner case fix and request module changes Luis R. Rodriguez
2017-02-22 2:09 ` [PATCH v2 1/2] iwlwifi: fix drv cleanup on opmode registration failure Luis R. Rodriguez
2017-02-22 2:09 ` [PATCH v2 2/2] iwlwifi: simplify requesting ops module Luis R. Rodriguez
2017-02-22 2:10 ` [PATCH v2 0/2] iwlwifi: share opmode start code Luis R. Rodriguez
2017-02-22 2:10 ` [PATCH v2 1/2] iwlwifi: share opmode start work code Luis R. Rodriguez
2017-02-22 2:10 ` [PATCH v2 2/2] iwlwifi: convert final opmode work into a workqueue Luis R. Rodriguez
2017-02-17 2:09 ` [RFC 3/5] iwlwifi: share opmode start work code Luis R. Rodriguez
2017-02-17 2:09 ` Luis R. Rodriguez [this message]
2017-02-17 2:09 ` [RFC 5/5] iwlwifi: convert final opmode work into a workqueue Luis R. Rodriguez
2017-03-01 7:12 ` [RFC 0/5] iwlwifi: enhance final opmode work Johannes Berg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170217020903.6370-5-mcgrof@kernel.org \
--to=mcgrof@kernel.org \
--cc=arjan@linux.intel.com \
--cc=emmanuel.grumbach@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=jeyu@redhat.com \
--cc=johannes.berg@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linuxwifi@intel.com \
--cc=luciano.coelho@intel.com \
--cc=ming.lei@canonical.com \
--cc=pmladek@suse.com \
--cc=rusty@rustcorp.com.au \
--cc=tj@kernel.org \
--cc=zajec5@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).