The firmware async callback and the opmode registration share
some functionality -- to start the drv's opmode. Move this work
into a helper which is shared. This should help us share fixes
should these diverging code paths change.
Signed-off-by: Luis R. Rodriguez <mcg...@kernel.org>
---
drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 93 +++++++++++++++++++---------
1 file changed, 63 insertions(+), 30 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
index 6beb92d19ea7..4a1937c77f90 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
@@ -102,6 +102,7 @@ static struct dentry *iwl_dbgfs_root;
* @op_mode: the running op_mode
* @trans: transport layer
* @dev: for debug prints only
+ * @start_requested: start op has been requested and is pending on this device
* @fw_index: firmware revision to try loading
* @firmware_name: composite filename of ucode file to load
* @request_firmware_complete: the firmware has been obtained from user space
@@ -113,6 +114,7 @@ struct iwl_drv {
struct iwl_op_mode *op_mode;
struct iwl_trans *trans;
struct device *dev;
+ bool start_requested;
int fw_index; /* firmware we're trying to load */
char firmware_name[64]; /* name of firmware file to load */
@@ -1254,6 +1256,48 @@ static void iwlwifi_try_load_op(struct
iwlwifi_opmode_table *op,
#endif
}
+static void iwlwifi_opmode_start_drv(struct iwlwifi_opmode_table *op,
+ struct iwl_drv *drv)
+{
+ if (!drv->start_requested)
+ return;
+
+ drv->op_mode = _iwl_op_mode_start(drv, op);
+ drv->start_requested = false;
+
+ /*
+ * Complete the firmware request last so that
+ * a driver unbind (stop) doesn't run while we
+ * are doing the start() above.
+ */
+ complete(&drv->request_firmware_complete);
+
+ if (!drv->op_mode)
+ device_release_driver(drv->trans->dev);
+}
+
+static void iwlwifi_opmode_start(struct iwlwifi_opmode_table *op)
+{
+ struct iwl_drv *drv;
+
+ list_for_each_entry(drv, &op->drv, list)
+ iwlwifi_opmode_start_drv(op, drv);
+}
+
+static void iwlwifi_opmode_dowork(void)
+{
+ unsigned int i;
+ struct iwlwifi_opmode_table *op;
+
+ mutex_lock(&iwlwifi_opmode_table_mtx);
+ for (i = 0; i < ARRAY_SIZE(iwlwifi_opmode_table); i++) {
+ op = &iwlwifi_opmode_table[i];
+ if (op->ops)
+ iwlwifi_opmode_start(op);
+ }
+ mutex_unlock(&iwlwifi_opmode_table_mtx);
+}
+
/**
* iwl_req_fw_callback - callback when firmware was loaded
*
@@ -1467,27 +1511,14 @@ 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);
+ drv->start_requested = true;
/* add this device to the list of devices using this op_mode */
list_add_tail(&drv->list, &op->drv);
- if (op->ops) {
- drv->op_mode = _iwl_op_mode_start(drv, op);
-
- if (!drv->op_mode) {
- mutex_unlock(&iwlwifi_opmode_table_mtx);
- goto out_unbind;
- }
- } else {
+ if (!op->ops)
load_module = true;
- }
- mutex_unlock(&iwlwifi_opmode_table_mtx);
- /*
- * Complete the firmware request last so that
- * a driver unbind (stop) doesn't run while we
- * are doing the start() above.
- */
- complete(&drv->request_firmware_complete);
+ mutex_unlock(&iwlwifi_opmode_table_mtx);
/*
* Load the module last so we don't block anything
@@ -1496,6 +1527,7 @@ static void iwl_req_fw_callback(const struct firmware
*ucode_raw, void *context)
*/
if (load_module)
iwlwifi_try_load_op(op, drv);
+ iwlwifi_opmode_dowork();
goto free;
try_again:
@@ -1617,8 +1649,8 @@ IWL_EXPORT_SYMBOL(iwlwifi_mod_params);
int iwl_opmode_register(const char *name, const struct iwl_op_mode_ops *ops)
{
int i;
- struct iwl_drv *drv;
struct iwlwifi_opmode_table *op;
+ int ret = -EIO;
mutex_lock(&iwlwifi_opmode_table_mtx);
for (i = 0; i < ARRAY_SIZE(iwlwifi_opmode_table); i++) {
@@ -1626,20 +1658,15 @@ int iwl_opmode_register(const char *name, const struct
iwl_op_mode_ops *ops)
if (strcmp(op->name, name))
continue;
op->ops = ops;
- /* TODO: need to handle exceptional case */
- list_for_each_entry(drv, &op->drv, list) {
- drv->op_mode = _iwl_op_mode_start(drv, op);
- if (!drv->op_mode) {
- complete(&drv->request_firmware_complete);
- device_release_driver(drv->trans->dev);
- }
- }
-
- mutex_unlock(&iwlwifi_opmode_table_mtx);
- return 0;
+ ret = 0;
+ break;
}
mutex_unlock(&iwlwifi_opmode_table_mtx);
- return -EIO;
+
+ if (!ret)
+ iwlwifi_opmode_dowork();
+
+ return ret;
}
IWL_EXPORT_SYMBOL(iwl_opmode_register);
@@ -1655,8 +1682,14 @@ void iwl_opmode_deregister(const char *name)
iwlwifi_opmode_table[i].ops = NULL;
/* call the stop routine for all devices */
- list_for_each_entry(drv, &iwlwifi_opmode_table[i].drv, list)
+ list_for_each_entry(drv, &iwlwifi_opmode_table[i].drv, list) {
_iwl_op_mode_stop(drv);
+ /*
+ * So that if iwlmvm gets unloaded alone, but then
+ * loaded again we can kick the old registered devices
+ */
+ drv->start_requested = true;
+ }
mutex_unlock(&iwlwifi_opmode_table_mtx);
return;
--
2.11.0
