A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-13 08:07:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "msm: ipa: Fix not to update state during pipe reset"

Browse source
This commit is contained in:
qctecmdr 2019-12-16 10:50:50 -08:00 • committed by Gerrit - the friendly Code Review server
commit abdbe88f83
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
drivers/platform/msm/ipa/ipa_clients/ipa_mhi_client.c
View file

@ -1288,7 +1288,8 @@ static int ipa_mhi_reset_dl_channel(struct ipa_mhi_channel_ctx *channel)
return 0;
}
static int ipa_mhi_reset_channel(struct ipa_mhi_channel_ctx *channel)
static int ipa_mhi_reset_channel(struct ipa_mhi_channel_ctx *channel,
bool update_state)
{
int res;
@ -1304,7 +1305,8 @@ static int ipa_mhi_reset_channel(struct ipa_mhi_channel_ctx *channel)
channel->state = IPA_HW_MHI_CHANNEL_STATE_DISABLE;
if (ipa_get_transport_type() == IPA_TRANSPORT_TYPE_GSI) {
if ((ipa_get_transport_type() == IPA_TRANSPORT_TYPE_GSI) &&
update_state) {
res = ipa_mhi_read_write_host(IPA_MHI_DMA_TO_HOST,
&channel->state, channel->channel_context_addr +
offsetof(struct ipa_mhi_ch_ctx, chstate),
@ -1468,7 +1470,7 @@ int ipa_mhi_connect_pipe(struct ipa_mhi_connect_params *in, u32 *clnt_hdl)
return 0;
fail_connect_pipe:
mutex_unlock(&mhi_client_general_mutex);
ipa_mhi_reset_channel(channel);
ipa_mhi_reset_channel(channel, true);
fail_start_channel:
IPA_ACTIVE_CLIENTS_DEC_EP(in->sys.client);
return -EPERM;
@ -1516,7 +1518,7 @@ int ipa_mhi_disconnect_pipe(u32 clnt_hdl)
IPA_ACTIVE_CLIENTS_INC_EP(ipa_get_client_mapping(clnt_hdl));
res = ipa_mhi_reset_channel(channel);
res = ipa_mhi_reset_channel(channel, false);
if (res) {
IPA_MHI_ERR("ipa_mhi_reset_channel failed %d\n", res);
goto fail_reset_channel;