| From cb6a23820b8556a20dbbf79daaceae4045cbf9f1 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 9 Aug 2021 09:24:28 +0100 |
| Subject: slimbus: ngd: reset dma setup during runtime pm |
| |
| From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> |
| |
| [ 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: 917809e2280b ("slimbus: ngd: Add qcom SLIMBus NGD driver") |
| Cc: <stable@vger.kernel.org> |
| Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> |
| Link: https://lore.kernel.org/r/20210809082428.11236-5-srinivas.kandagatla@linaro.org |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/slimbus/qcom-ngd-ctrl.c | 5 ++++- |
| 1 file changed, 4 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c |
| index 44021620d101..1a5311fb45a5 100644 |
| --- a/drivers/slimbus/qcom-ngd-ctrl.c |
| +++ b/drivers/slimbus/qcom-ngd-ctrl.c |
| @@ -1060,7 +1060,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 */ |
| @@ -1111,6 +1112,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; |
| } |
| |
| @@ -1496,6 +1498,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; |
| |
| -- |
| 2.30.2 |
| |
