evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ath10k: Move logging prior to ath10k core destroy"

Browse source
This commit is contained in:
Linux Build Service Account 2017-04-28 22:10:44 -07:00 • committed by Gerrit - the friendly Code Review server
commit 0ce1aff35a
2 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/net/wireless/ath/ath10k/qmi.c
View file

@ -13,6 +13,7 @@
#include <soc/qcom/subsystem_restart.h>
#include <soc/qcom/service-notifier.h>
#include <soc/qcom/msm_qmi_interface.h>
#include <soc/qcom/icnss.h>
#include <soc/qcom/service-locator.h>
#include "core.h"
#include "qmi.h"
@ -448,6 +449,7 @@ int ath10k_snoc_qmi_wlan_enable(struct ath10k *ar,
int ret;
struct ath10k_snoc *ar_snoc = ath10k_snoc_priv(ar);
struct ath10k_snoc_qmi_config *qmi_cfg = &ar_snoc->qmi_cfg;
unsigned long time_left;
ath10k_dbg(ar, ATH10K_DBG_SNOC,
"Mode: %d, config: %p, host_version: %s\n",
@ -461,10 +463,15 @@ int ath10k_snoc_qmi_wlan_enable(struct ath10k *ar,
return ret;
}
wait_event_timeout(ath10k_fw_ready_wait_event,
time_left = wait_event_timeout(
ath10k_fw_ready_wait_event,
(atomic_read(&qmi_cfg->fw_ready) &&
atomic_read(&qmi_cfg->server_connected)),
msecs_to_jiffies(ATH10K_SNOC_WLAN_FW_READY_TIMEOUT));
if (time_left == 0) {
ath10k_err(ar, "Wait for FW ready and server connect timed out\n");
return -ETIMEDOUT;
}
req.host_version_valid = 1;
strlcpy(req.host_version, host_version,
@ -854,9 +861,21 @@ int ath10k_snoc_start_qmi_service(struct ath10k *ar)
goto out_destroy_wq;
}
if (!icnss_is_fw_ready()) {
ath10k_err(ar, "failed to get fw ready indication\n");
ret = -EFAULT;
goto err_fw_ready;
}
atomic_set(&qmi_cfg->fw_ready, 1);
ath10k_dbg(ar, ATH10K_DBG_SNOC, "QMI service started successfully\n");
return 0;
err_fw_ready:
qmi_svc_event_notifier_unregister(WLFW_SERVICE_ID_V01,
WLFW_SERVICE_VERS_V01,
WLFW_SERVICE_INS_ID_V01,
&qmi_cfg->wlfw_clnt_nb);
out_destroy_wq:
destroy_workqueue(qmi_cfg->event_wq);
return ret;

4
drivers/net/wireless/ath/ath10k/snoc.c
View file

@ -1329,6 +1329,8 @@ static int ath10k_snoc_remove(struct platform_device *pdev)
if (!ar_snoc)
return -EINVAL;
ath10k_dbg(ar, ATH10K_DBG_SNOC, "%s:WCN3990 removed\n", __func__);
ath10k_core_unregister(ar);
ath10k_snoc_pdr_unregister_notifier(ar);
ath10k_snoc_modem_ssr_unregister_notifier(ar);
@ -1338,8 +1340,6 @@ static int ath10k_snoc_remove(struct platform_device *pdev)
ath10k_snoc_stop_qmi_service(ar);
ath10k_core_destroy(ar);
ath10k_dbg(ar, ATH10K_DBG_SNOC, "%s:WCN3990 removed\n", __func__);
return 0;
}