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-07 20:33:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

msm: mhi: Stop sending event completion, during channel reset

Browse source 
The change is to prevent sending channel completion events,
post a channel stop or reset command.

Sending a channel completion post reset can cause the RP
to in reset value and hence the completion will be treated
as an out of order event.

Change-Id: I2cdd7a705a001689609ff8fa1f31fe11d61e5ea8
Signed-off-by: Subramanian Ananthanarayanan <skananth@codeaurora.org>
Signed-off-by: Gauri Joshi <gaurjosh@codeaurora.org>
This commit is contained in:
Subramanian Ananthanarayanan 2020-12-10 13:48:35 +05:30 • committed by Gauri Joshi
commit 24bf1e88dd
1 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

26
drivers/platform/msm/mhi_dev/mhi.c
View file

@ -476,6 +476,22 @@ static int mhi_dev_send_multiple_tr_events(struct mhi_dev *mhi, int evnt_ring,
if (!ereq->is_cmd_cpl) {
ch = ereq->context;
/*
* Take Channel ring event lock to prevent sending
* completion command while the channel is getting
* reset/stopped.
* Abort sending completion event if channel has moved to
* stopped state.
*/
mutex_lock(&ch->ring->event_lock);
if (ch->state == MHI_DEV_CH_STOPPED ||
ch->state == MHI_DEV_CH_PENDING_STOP) {
mhi_log(MHI_MSG_ERROR,
"Ch:%d is in %d state, abort sending completion evnt\n"
, ch->ch_id, ch->state);
rc = -ENXIO;
goto exit;
}
mhi_log(MHI_MSG_VERBOSE, "Flushing %d cmpl events of ch %d\n",
ereq->num_events, ch->ch_id);
} else {
@ -487,8 +503,7 @@ static int mhi_dev_send_multiple_tr_events(struct mhi_dev *mhi, int evnt_ring,
rc = mhi_dev_add_element(ring, ereq->tr_events, ereq, evt_len);
if (rc) {
pr_err("%s(): error in adding element rc %d\n", __func__, rc);
mutex_unlock(&ring->event_lock);
return rc;
goto exit;
}
ring->ring_ctx_shadow->ev.rp = (ring->rd_offset *
@ -537,6 +552,9 @@ static int mhi_dev_send_multiple_tr_events(struct mhi_dev *mhi, int evnt_ring,
pr_err("%s: error sending in msi\n", __func__);
}
exit:
if (!ereq->is_cmd_cpl)
mutex_unlock(&ch->ring->event_lock);
mutex_unlock(&ring->event_lock);
return rc;
}
@ -1972,6 +1990,7 @@ send_start_completion_event:
ch = &mhi->ch[ch_id];
mutex_lock(&ch->ch_lock);
mutex_lock(&ch->ring->event_lock);
mhi->ch[ch_id].state = MHI_DEV_CH_PENDING_STOP;
rc = mhi_dev_process_stop_cmd(
@ -1980,6 +1999,7 @@ send_start_completion_event:
if (rc)
pr_err("stop event send failed\n");
mutex_unlock(&ch->ring->event_lock);
mutex_unlock(&ch->ch_lock);
mhi_update_state_info_ch(ch_id, MHI_STATE_DISCONNECTED);
/* Trigger callback to clients */
@ -2030,6 +2050,7 @@ send_start_completion_event:
ch = &mhi->ch[ch_id];
mutex_lock(&ch->ch_lock);
mutex_lock(&ch->ring->event_lock);
/* hard stop and set the channel to stop */
mhi->ch_ctx_cache[ch_id].ch_state =
@ -2057,6 +2078,7 @@ send_start_completion_event:
MHI_CMD_COMPL_CODE_SUCCESS);
if (rc)
pr_err("Error sending command completion event\n");
mutex_unlock(&ch->ring->event_lock);
mutex_unlock(&ch->ch_lock);
mhi_update_state_info_ch(ch_id, MHI_STATE_DISCONNECTED);
mhi_dev_trigger_cb(ch_id);