From: Guenter Roeck <linux@roeck-us.net>
To: Sebastian Reichel <sre@kernel.org>
Cc: linux-pm@vger.kernel.org,
Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>,
David Woodhouse <dwmw2@infradead.org>,
Santosh Shilimkar <santosh.shilimkar@ti.com>,
linux-kernel@vger.kernel.org, Guenter Roeck <linux@roeck-us.net>,
Loc Ho <lho@apm.com>
Subject: [PATCH v2 05/10] power/reset: xgene: Use mdelay instead of jiffies based timeout
Date: Tue, 30 Sep 2014 10:48:31 -0700 [thread overview]
Message-ID: <1412099316-23167-6-git-send-email-linux@roeck-us.net> (raw)
In-Reply-To: <1412099316-23167-1-git-send-email-linux@roeck-us.net>
jiffies are not running at this stage of system shutdown, meaning an
error in the reset function would never be reported. Replace with mdelay().
Cc: Loc Ho <lho@apm.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
drivers/power/reset/xgene-reboot.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/power/reset/xgene-reboot.c b/drivers/power/reset/xgene-reboot.c
index 1bab003..ae470b8 100644
--- a/drivers/power/reset/xgene-reboot.c
+++ b/drivers/power/reset/xgene-reboot.c
@@ -24,6 +24,7 @@
* For system shutdown, this is board specify. If a board designer
* implements GPIO shutdown, use the gpio-poweroff.c driver.
*/
+#include <linux/delay.h>
#include <linux/io.h>
#include <linux/of_device.h>
#include <linux/of_address.h>
@@ -43,15 +44,12 @@ static struct xgene_reboot_context *xgene_restart_ctx;
static void xgene_restart(char str, const char *cmd)
{
struct xgene_reboot_context *ctx = xgene_restart_ctx;
- unsigned long timeout;
/* Issue the reboot */
if (ctx)
writel(ctx->mask, ctx->csr);
- timeout = jiffies + HZ;
- while (time_before(jiffies, timeout))
- cpu_relax();
+ mdelay(1000);
dev_emerg(ctx->dev, "Unable to restart system\n");
}
--
1.9.1
next prev parent reply other threads:[~2014-09-30 17:48 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-30 17:48 [PATCH v2 00/10] power/reset: Register drivers with restart handler Guenter Roeck
2014-09-30 17:48 ` [PATCH v2 01/10] power/reset: vexpress: Register with kernel " Guenter Roeck
2014-09-30 17:48 ` [PATCH v2 02/10] power/reset: xgene: Return -ENOMEM if out of memory Guenter Roeck
2014-09-30 17:48 ` [PATCH v2 03/10] power/reset: xgene: Drop devm_kfree Guenter Roeck
2014-09-30 17:48 ` [PATCH v2 04/10] power/reset: xgene: Use local variable dev instead of pdev->dev Guenter Roeck
2014-09-30 17:48 ` Guenter Roeck [this message]
2014-09-30 17:48 ` [PATCH v2 06/10] power/reset: xgene: Register with kernel restart handler Guenter Roeck
2014-09-30 17:48 ` [PATCH v2 07/10] power/reset: axxia: " Guenter Roeck
2014-09-30 17:48 ` [PATCH v2 08/10] power/reset: keystone: " Guenter Roeck
2014-09-30 17:48 ` [PATCH v2 09/10] power/reset: hisi: " Guenter Roeck
2014-09-30 17:48 ` [PATCH v2 10/10] power/reset: brcmstb: " Guenter Roeck
2014-10-29 1:51 ` Brian Norris
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=1412099316-23167-6-git-send-email-linux@roeck-us.net \
--to=linux@roeck-us.net \
--cc=dbaryshkov@gmail.com \
--cc=dwmw2@infradead.org \
--cc=lho@apm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=santosh.shilimkar@ti.com \
--cc=sre@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).