bus: mhi: ep: Save channel state locally during suspend and resume

During suspend and resume, the channel state needs to be saved locally.
Otherwise, the endpoint may access the channels while they were being
suspended and causing access violations.

Fix it by saving the channel state locally during suspend and resume.

Cc: <stable@vger.kernel.org> # 5.19
Fixes: e4b7b5f0f30a ("bus: mhi: ep: Add support for suspending and resuming channels")
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Reviewed-by: Jeffrey Hugo <quic_jhugo@quicinc.com)
Link: https://lore.kernel.org/r/20221228161704.255268-7-manivannan.sadhasivam@linaro.org
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>

diff --git a/drivers/bus/mhi/ep/main.c b/drivers/bus/mhi/ep/main.c
index 2362fcc8b32c54feba5cda7ab5034797a6762178..bcaaba97ef63fb44da7aa354b7c9f834766e8244 100644 (file)
--- a/drivers/bus/mhi/ep/main.c
+++ b/drivers/bus/mhi/ep/main.c
@@ -1122,6 +1122,7 @@ void mhi_ep_suspend_channels(struct mhi_ep_cntrl *mhi_cntrl)
 
                dev_dbg(&mhi_chan->mhi_dev->dev, "Suspending channel\n");
                /* Set channel state to SUSPENDED */
+               mhi_chan->state = MHI_CH_STATE_SUSPENDED;
                tmp &= ~CHAN_CTX_CHSTATE_MASK;
                tmp |= FIELD_PREP(CHAN_CTX_CHSTATE_MASK, MHI_CH_STATE_SUSPENDED);
                mhi_cntrl->ch_ctx_cache[i].chcfg = cpu_to_le32(tmp);
@@ -1151,6 +1152,7 @@ void mhi_ep_resume_channels(struct mhi_ep_cntrl *mhi_cntrl)
 
                dev_dbg(&mhi_chan->mhi_dev->dev, "Resuming channel\n");
                /* Set channel state to RUNNING */
+               mhi_chan->state = MHI_CH_STATE_RUNNING;
                tmp &= ~CHAN_CTX_CHSTATE_MASK;
                tmp |= FIELD_PREP(CHAN_CTX_CHSTATE_MASK, MHI_CH_STATE_RUNNING);
                mhi_cntrl->ch_ctx_cache[i].chcfg = cpu_to_le32(tmp);