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

icnss: QMI timeout, do not ASSERT when PD down

Browse source 
QMI timeout bound to happen when a request sent over QMI and at
the same time WLAN PD down happens. Add logic to detect PD down
event and do not ASSERT in case WLAN PD down is detected.

Change-Id: I73916ac9040250cdae16fb9c1a2c67df9ef940d3
CRs-fixed: 2017507
Signed-off-by: Prashanth Bhatta <bhattap@codeaurora.org>
This commit is contained in:
Prashanth Bhatta 2017-03-09 17:08:27 -08:00
parent 89bfd053bf
commit 49eaa0d279
1 changed files with 32 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
drivers/soc/qcom/icnss.c
View file

@ -104,13 +104,16 @@ module_param(qmi_timeout, ulong, 0600);
#ifdef CONFIG_ICNSS_DEBUG
#define ICNSS_ASSERT(_condition) do { \
if (!(_condition)) { \
icnss_pr_err("ASSERT at line %d\n", \
__LINE__); \
icnss_pr_err("ASSERT at line %d\n", __LINE__); \
BUG_ON(1); \
} \
} while (0)
bool ignore_qmi_timeout;
#define ICNSS_QMI_ASSERT() ICNSS_ASSERT(ignore_qmi_timeout)
#else
#define ICNSS_ASSERT(_condition) do { } while (0)
#define ICNSS_QMI_ASSERT() do { } while (0)
#endif
enum icnss_debug_quirks {
@ -349,6 +352,15 @@ static struct icnss_priv {
bool bypass_s1_smmu;
} *penv;
#ifdef CONFIG_ICNSS_DEBUG
static void icnss_ignore_qmi_timeout(bool ignore)
{
ignore_qmi_timeout = ignore;
}
#else
static void icnss_ignore_qmi_timeout(bool ignore) { }
#endif
static void icnss_pm_stay_awake(struct icnss_priv *priv)
{
if (atomic_inc_return(&priv->pm_count) != 1)
@ -1132,7 +1144,7 @@ static int wlfw_msa_mem_info_send_sync_msg(void)
out:
penv->stats.msa_info_err++;
ICNSS_ASSERT(false);
ICNSS_QMI_ASSERT();
return ret;
}
@ -1180,7 +1192,7 @@ static int wlfw_msa_ready_send_sync_msg(void)
out:
penv->stats.msa_ready_err++;
ICNSS_ASSERT(false);
ICNSS_QMI_ASSERT();
return ret;
}
@ -1243,7 +1255,7 @@ static int wlfw_ind_register_send_sync_msg(void)
out:
penv->stats.ind_register_err++;
ICNSS_ASSERT(false);
ICNSS_QMI_ASSERT();
return ret;
}
@ -1312,7 +1324,7 @@ static int wlfw_cap_send_sync_msg(void)
out:
penv->stats.cap_err++;
ICNSS_ASSERT(false);
ICNSS_QMI_ASSERT();
return ret;
}
@ -1373,7 +1385,7 @@ static int wlfw_wlan_mode_send_sync_msg(enum wlfw_driver_mode_enum_v01 mode)
out:
penv->stats.mode_req_err++;
ICNSS_ASSERT(false);
ICNSS_QMI_ASSERT();
return ret;
}
@ -1423,7 +1435,7 @@ static int wlfw_wlan_cfg_send_sync_msg(struct wlfw_wlan_cfg_req_msg_v01 *data)
out:
penv->stats.cfg_req_err++;
ICNSS_ASSERT(false);
ICNSS_QMI_ASSERT();
return ret;
}
@ -1476,7 +1488,7 @@ static int wlfw_ini_send_sync_msg(uint8_t fw_log_mode)
out:
penv->stats.ini_req_err++;
ICNSS_ASSERT(false);
ICNSS_QMI_ASSERT();
return ret;
}
@ -1642,7 +1654,7 @@ static int wlfw_rejuvenate_ack_send_sync_msg(struct icnss_priv *priv)
out:
priv->stats.rejuvenate_ack_err++;
ICNSS_ASSERT(false);
ICNSS_QMI_ASSERT();
return ret;
}
@ -1774,6 +1786,8 @@ static void icnss_qmi_wlfw_clnt_ind(struct qmi_handle *handle,
case QMI_WLFW_REJUVENATE_IND_V01:
icnss_pr_dbg("Received Rejuvenate Indication msg_id 0x%x, state: 0x%lx\n",
msg_id, penv->state);
icnss_ignore_qmi_timeout(true);
event_data = kzalloc(sizeof(*event_data), GFP_KERNEL);
if (event_data == NULL)
return;
@ -2142,7 +2156,7 @@ static int icnss_driver_event_pd_service_down(struct icnss_priv *priv,
struct icnss_event_pd_service_down_data *event_data = data;
if (!test_bit(ICNSS_WLFW_EXISTS, &priv->state))
return 0;
goto out;
if (test_bit(ICNSS_PD_RESTART, &priv->state)) {
icnss_pr_err("PD Down while recovery inprogress, crashed: %d, state: 0x%lx\n",
@ -2159,6 +2173,8 @@ static int icnss_driver_event_pd_service_down(struct icnss_priv *priv,
out:
kfree(data);
icnss_ignore_qmi_timeout(false);
return ret;
}
@ -2300,9 +2316,11 @@ static int icnss_modem_notifier_nb(struct notifier_block *nb,
if (test_bit(ICNSS_PDR_ENABLED, &priv->state))
return NOTIFY_OK;
icnss_pr_info("Modem went down, state: %lx, crashed: %d\n",
icnss_pr_info("Modem went down, state: 0x%lx, crashed: %d\n",
priv->state, notif->crashed);
icnss_ignore_qmi_timeout(true);
event_data = kzalloc(sizeof(*event_data), GFP_KERNEL);
if (event_data == NULL)
@ -2409,6 +2427,8 @@ static int icnss_service_notifier_notify(struct notifier_block *nb,
}
event_post:
icnss_ignore_qmi_timeout(true);
icnss_driver_event_post(ICNSS_DRIVER_EVENT_PD_SERVICE_DOWN,
ICNSS_EVENT_SYNC, event_data);
done: