bus: mhi: ep: Power up/down MHI stack during MHI RESET

[ Upstream commit 62846c3729ca3729c3668315d5349516e8c4a777 ]

During graceful shutdown scenario, host will issue MHI RESET to the
endpoint device before initiating shutdown. In that case, it makes sense
to completely power down the MHI stack as sooner or later the access to
MMIO registers will be prohibited. Also, the stack needs to be powered
up in the case of SYS_ERR to recover the device.

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-2-manivannan.sadhasivam@linaro.org
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Stable-dep-of: 7b96306c0515 ("bus: mhi: ep: Change state_lock to mutex")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/bus/mhi/ep/main.c b/drivers/bus/mhi/ep/main.c
index 357c61c12ce5b8a9e31b526d54f0ad2ddb704d78..b06548005985cdb7a9aed90d9266213460035d99 100644 (file)
--- a/drivers/bus/mhi/ep/main.c
+++ b/drivers/bus/mhi/ep/main.c
@@ -990,11 +990,9 @@ static void mhi_ep_abort_transfer(struct mhi_ep_cntrl *mhi_cntrl)
 static void mhi_ep_reset_worker(struct work_struct *work)
 {
        struct mhi_ep_cntrl *mhi_cntrl = container_of(work, struct mhi_ep_cntrl, reset_work);
-       struct device *dev = &mhi_cntrl->mhi_dev->dev;
        enum mhi_state cur_state;
-       int ret;
 
-       mhi_ep_abort_transfer(mhi_cntrl);
+       mhi_ep_power_down(mhi_cntrl);
 
        spin_lock_bh(&mhi_cntrl->state_lock);
        /* Reset MMIO to signal host that the MHI_RESET is completed in endpoint */
@@ -1007,27 +1005,8 @@ static void mhi_ep_reset_worker(struct work_struct *work)
         * issue reset during shutdown also and we don't need to do re-init in
         * that case.
         */
-       if (cur_state == MHI_STATE_SYS_ERR) {
-               mhi_ep_mmio_init(mhi_cntrl);
-
-               /* Set AMSS EE before signaling ready state */
-               mhi_ep_mmio_set_env(mhi_cntrl, MHI_EE_AMSS);
-
-               /* All set, notify the host that we are ready */
-               ret = mhi_ep_set_ready_state(mhi_cntrl);
-               if (ret)
-                       return;
-
-               dev_dbg(dev, "READY state notification sent to the host\n");
-
-               ret = mhi_ep_enable(mhi_cntrl);
-               if (ret) {
-                       dev_err(dev, "Failed to enable MHI endpoint: %d\n", ret);
-                       return;
-               }
-
-               enable_irq(mhi_cntrl->irq);
-       }
+       if (cur_state == MHI_STATE_SYS_ERR)
+               mhi_ep_power_up(mhi_cntrl);
 }
 
 /*
@@ -1106,11 +1085,11 @@ EXPORT_SYMBOL_GPL(mhi_ep_power_up);
 
 void mhi_ep_power_down(struct mhi_ep_cntrl *mhi_cntrl)
 {
-       if (mhi_cntrl->enabled)
+       if (mhi_cntrl->enabled) {
                mhi_ep_abort_transfer(mhi_cntrl);
-
-       kfree(mhi_cntrl->mhi_event);
-       disable_irq(mhi_cntrl->irq);
+               kfree(mhi_cntrl->mhi_event);
+               disable_irq(mhi_cntrl->irq);
+       }
 }
 EXPORT_SYMBOL_GPL(mhi_ep_power_down);