diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-26 16:58:01 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-26 16:58:01 +1000 |
| commit | fd0cca754f3f6756bfdafe500e4f49b1b9e9723f (patch) | |
| tree | b1eb43fb2fb068ed5fc92b031e3ae853e599af9c /arch/powerpc/sysdev | |
| parent | 5ba762c9bb3ce2cc11e9e111cb3c476e84b91668 (diff) | |
| parent | 66c6b856d8738278a4a6e558d25c90e9950aa112 (diff) | |
| download | op-kernel-dev-fd0cca754f3f6756bfdafe500e4f49b1b9e9723f.zip op-kernel-dev-fd0cca754f3f6756bfdafe500e4f49b1b9e9723f.tar.gz | |
Merge commit 'kumar/next' into merge
Diffstat (limited to 'arch/powerpc/sysdev')
| -rw-r--r-- | arch/powerpc/sysdev/qe_lib/qe.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/powerpc/sysdev/qe_lib/qe.c b/arch/powerpc/sysdev/qe_lib/qe.c index b28b0e5..237e365 100644 --- a/arch/powerpc/sysdev/qe_lib/qe.c +++ b/arch/powerpc/sysdev/qe_lib/qe.c @@ -112,6 +112,7 @@ int qe_issue_cmd(u32 cmd, u32 device, u8 mcn_protocol, u32 cmd_input) { unsigned long flags; u8 mcn_shift = 0, dev_shift = 0; + u32 ret; spin_lock_irqsave(&qe_lock, flags); if (cmd == QE_RESET) { @@ -139,11 +140,13 @@ int qe_issue_cmd(u32 cmd, u32 device, u8 mcn_protocol, u32 cmd_input) } /* wait for the QE_CR_FLG to clear */ - while(in_be32(&qe_immr->cp.cecr) & QE_CR_FLG) - cpu_relax(); + ret = spin_event_timeout((in_be32(&qe_immr->cp.cecr) & QE_CR_FLG) == 0, + 100, 0); + /* On timeout (e.g. failure), the expression will be false (ret == 0), + otherwise it will be true (ret == 1). */ spin_unlock_irqrestore(&qe_lock, flags); - return 0; + return ret == 1; } EXPORT_SYMBOL(qe_issue_cmd); |
