From: Sudeep Holla <sudeep.holla@arm.com>
To: linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org,
linux-soc@vger.kernel.org, linux-arm-msm@vger.kernel.org
Cc: Sudeep Holla <sudeep.holla@arm.com>,
Andy Gross <andy.gross@linaro.org>,
David Brown <david.brown@linaro.org>,
Mark Brown <broonie@kernel.org>
Subject: [PATCH] spi: qup: skip clk_disable_unprepare if the device is already runtime suspended
Date: Thu, 25 Aug 2016 13:33:28 +0100 [thread overview]
Message-ID: <1472128408-7231-1-git-send-email-sudeep.holla@arm.com> (raw)
If the spi device is already runtime suspended, if spi_qup_suspend is
executed during suspend-to-idle or suspend-to-ram it will result in the
following splat:
WARNING: CPU: 3 PID: 1593 at drivers/clk/clk.c:476 clk_core_unprepare+0x80/0x90
Modules linked in:
CPU: 3 PID: 1593 Comm: bash Tainted: G W 4.8.0-rc3 #14
Hardware name: Qualcomm Technologies, Inc. APQ 8016 SBC (DT)
PC is at clk_core_unprepare+0x80/0x90
LR is at clk_unprepare+0x28/0x40
pc : [<ffff0000086eecf0>] lr : [<ffff0000086f0c58>] pstate: 60000145
Call trace:
clk_core_unprepare+0x80/0x90
spi_qup_suspend+0x68/0x90
platform_pm_suspend+0x24/0x68
dpm_run_callback.isra.7+0x1c/0x70
__device_suspend+0xf4/0x298
dpm_suspend+0x10c/0x228
dpm_suspend_start+0x68/0x78
suspend_devices_and_enter+0xb8/0x460
pm_suspend+0x1ec/0x240
state_store+0x84/0xf8
kobj_attr_store+0x14/0x28
sysfs_kf_write+0x48/0x58
kernfs_fop_write+0x15c/0x1f8
__vfs_write+0x1c/0x100
vfs_write+0x9c/0x1b8
SyS_write+0x44/0xa0
el0_svc_naked+0x24/0x28
This patch fixes the issue by executing clk_disable_unprepare conditionally
in spi_qup_suspend.
Cc: Andy Gross <andy.gross@linaro.org>
Cc: David Brown <david.brown@linaro.org>
Cc: Mark Brown <broonie@kernel.org>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
drivers/spi/spi-qup.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c
index c338ef1136f6..a047e9882da8 100644
--- a/drivers/spi/spi-qup.c
+++ b/drivers/spi/spi-qup.c
@@ -982,8 +982,10 @@ static int spi_qup_suspend(struct device *device)
if (ret)
return ret;
- clk_disable_unprepare(controller->cclk);
- clk_disable_unprepare(controller->iclk);
+ if (!pm_runtime_suspended(device)) {
+ clk_disable_unprepare(controller->cclk);
+ clk_disable_unprepare(controller->iclk);
+ }
return 0;
}
--
2.7.4
next reply other threads:[~2016-08-25 12:33 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-25 12:33 Sudeep Holla [this message]
[not found] ` <1472128408-7231-1-git-send-email-sudeep.holla-5wv7dgnIgG8@public.gmane.org>
2016-08-25 13:26 ` [PATCH] spi: qup: skip clk_disable_unprepare if the device is already runtime suspended Andy Gross
[not found] ` <20160825132606.GA24683-3KkwrOJo9xYlRp7syxWybdHuzzzSOjJt@public.gmane.org>
2016-08-25 13:27 ` Sudeep Holla
2016-09-01 20:29 ` Mark Brown
2016-09-02 8:42 ` Sudeep Holla
2016-09-02 9:38 ` Mark Brown
[not found] ` <20160902093853.GI3950-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2016-09-02 10:45 ` Sudeep Holla
2016-09-01 20:35 ` Applied "spi: qup: skip clk_disable_unprepare if the device is already runtime suspended" to the spi tree Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1472128408-7231-1-git-send-email-sudeep.holla@arm.com \
--to=sudeep.holla@arm.com \
--cc=andy.gross@linaro.org \
--cc=broonie@kernel.org \
--cc=david.brown@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-soc@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).