bus: mhi: Fix channel close issue on driver remove

Some MHI device drivers need to stop the channels in their driver
remove callback (e.g. module unloading), but the unprepare function
is aborted because MHI core moved the channels to suspended state
prior calling driver remove callback. This prevents the driver to
send a proper MHI RESET CHAN command to the device. Device is then
unaware of the stopped state of these channels.

This causes issue when driver tries to start the channels again (e.g.
module is reloaded), since device considers channels as already
started (inconsistent state).

Fix this by allowing channel reset when channel is suspended.

Signed-off-by: Loic Poulain <loic.poulain@linaro.org>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Reviewed-by: Bhaumik Bhatt <bbhatt@codeaurora.org>
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
This commit is contained in:
Loic Poulain 2020-10-09 11:07:14 +02:00 committed by Manivannan Sadhasivam
parent f4d0b39c84
commit a7f422f2f8
No known key found for this signature in database
GPG Key ID: 559F11E6FE91CEF5

View File

@ -1224,7 +1224,8 @@ static void __mhi_unprepare_channel(struct mhi_controller *mhi_cntrl,
/* no more processing events for this channel */ /* no more processing events for this channel */
mutex_lock(&mhi_chan->mutex); mutex_lock(&mhi_chan->mutex);
write_lock_irq(&mhi_chan->lock); write_lock_irq(&mhi_chan->lock);
if (mhi_chan->ch_state != MHI_CH_STATE_ENABLED) { if (mhi_chan->ch_state != MHI_CH_STATE_ENABLED &&
mhi_chan->ch_state != MHI_CH_STATE_SUSPENDED) {
write_unlock_irq(&mhi_chan->lock); write_unlock_irq(&mhi_chan->lock);
mutex_unlock(&mhi_chan->mutex); mutex_unlock(&mhi_chan->mutex);
return; return;