Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb7aa510 authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Sasha Levin
Browse files

slimbus: ngd: reset dma setup during runtime pm 



[ Upstream commit d77772538f00b7265deace6e77e555ee18365ad0 ]

During suspend/resume NGD remote instance is power cycled along
with remotely controlled bam dma engine.
So Reset the dma configuration during this suspend resume path
so that we are not dealing with any stale dma setup.

Without this transactions timeout after first suspend resume path.

Fixes: 917809e2 ("slimbus: ngd: Add qcom SLIMBus NGD driver")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20210809082428.11236-5-srinivas.kandagatla@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent abce32d0

drivers/slimbus/qcom-ngd-ctrl.c

+4 −1
Original line number Diff line number Diff line
@@ -1061,7 +1061,8 @@ static void qcom_slim_ngd_setup(struct qcom_slim_ngd_ctrl *ctrl) 
{

	u32 cfg = readl_relaxed(ctrl->ngd->base);



	if (ctrl->state == QCOM_SLIM_NGD_CTRL_DOWN)

	if (ctrl->state == QCOM_SLIM_NGD_CTRL_DOWN ||

		ctrl->state == QCOM_SLIM_NGD_CTRL_ASLEEP)

		qcom_slim_ngd_init_dma(ctrl);



	/* By default enable message queues */
@@ -1112,6 +1113,7 @@ static int qcom_slim_ngd_power_up(struct qcom_slim_ngd_ctrl *ctrl) 
			dev_info(ctrl->dev, "Subsys restart: ADSP active framer\n");

			return 0;

		}

		qcom_slim_ngd_setup(ctrl);

		return 0;

	}
@@ -1500,6 +1502,7 @@ static int __maybe_unused qcom_slim_ngd_runtime_suspend(struct device *dev) 
	struct qcom_slim_ngd_ctrl *ctrl = dev_get_drvdata(dev);

	int ret = 0;



	qcom_slim_ngd_exit_dma(ctrl);

	if (!ctrl->qmi.handle)

		return 0;