Merge "msm: ipa3: halt modem channels as part of SSR"

This commit is contained in:
Linux Build Service Account 2017-02-23 21:35:59 -08:00 committed by Gerrit - the friendly Code Review server
commit 2cd7103b29

View file

@ -1878,6 +1878,45 @@ static void ipa3_q6_avoid_holb(void)
}
}
static void ipa3_halt_q6_cons_gsi_channels(void)
{
int ep_idx;
int client_idx;
struct ipa_gsi_ep_config *gsi_ep_cfg;
int ret;
int code = 0;
for (client_idx = 0; client_idx < IPA_CLIENT_MAX; client_idx++) {
if (IPA_CLIENT_IS_Q6_CONS(client_idx)) {
ep_idx = ipa3_get_ep_mapping(client_idx);
if (ep_idx == -1)
continue;
gsi_ep_cfg = ipa3_get_gsi_ep_info(ep_idx);
if (!gsi_ep_cfg) {
IPAERR("failed to get GSI config\n");
ipa_assert();
return;
}
ret = gsi_halt_channel_ee(
gsi_ep_cfg->ipa_gsi_chan_num, gsi_ep_cfg->ee,
&code);
if (ret == GSI_STATUS_SUCCESS)
IPADBG("halted gsi ch %d ee %d with code %d\n",
gsi_ep_cfg->ipa_gsi_chan_num,
gsi_ep_cfg->ee,
code);
else
IPAERR("failed to halt ch %d ee %d code %d\n",
gsi_ep_cfg->ipa_gsi_chan_num,
gsi_ep_cfg->ee,
code);
}
}
}
static int ipa3_q6_clean_q6_flt_tbls(enum ipa_ip_type ip,
enum ipa_rule_type rlt)
{
@ -2312,6 +2351,7 @@ void ipa3_q6_post_shutdown_cleanup(void)
/* Handle the issue where SUSPEND was removed for some reason */
ipa3_q6_avoid_holb();
ipa3_halt_q6_cons_gsi_channels();
for (client_idx = 0; client_idx < IPA_CLIENT_MAX; client_idx++)
if (IPA_CLIENT_IS_Q6_PROD(client_idx)) {