Re: [PATCH] x86, olpc: Wait for last byte of EC command to beaccepted

From: Andres Salomon
Date: Tue Jul 26 2011 - 12:24:45 EST


Acked-by: Andres Salomon <dilinger@xxxxxxxxxx>

After some squinting.. This patch looks correct. This is a
long-standing issue, we should probably add a Cc: stable@xxxxxxxxxx so
it gets picked up for stable kernels.

On Tue, 26 Jul 2011
16:42:26 +0100 (BST) Daniel Drake <dsd@xxxxxxxxxx> wrote:

> From: Paul Fox <pgf@xxxxxxxxxx>
>
> When executing EC commands, only waiting when there are still more
> bytes to write is usually fine. However, if the system suspends very
> quickly after a call to olpc_ec_cmd(), the last data byte may not yet
> be transferred to the EC, and the command will not complete.
>
> This solves a bug where the SCI wakeup mask was not correctly written
> when going into suspend.
>
> Signed-off-by: Paul Fox <pgf@xxxxxxxxxx>
> Signed-off-by: Daniel Drake <dsd@xxxxxxxxxx>
> ---
> arch/x86/platform/olpc/olpc.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/platform/olpc/olpc.c
> b/arch/x86/platform/olpc/olpc.c index 8b9940e..7cce722 100644
> --- a/arch/x86/platform/olpc/olpc.c
> +++ b/arch/x86/platform/olpc/olpc.c
> @@ -161,13 +161,13 @@ restart:
> if (inbuf && inlen) {
> /* write data to EC */
> for (i = 0; i < inlen; i++) {
> + pr_devel("olpc-ec: sending cmd arg 0x%x\n",
> inbuf[i]);
> + outb(inbuf[i], 0x68);
> if (wait_on_ibf(0x6c, 0)) {
> printk(KERN_ERR "olpc-ec: timeout
> waiting for" " EC accept data!\n");
> goto err;
> }
> - pr_devel("olpc-ec: sending cmd arg 0x%x\n",
> inbuf[i]);
> - outb(inbuf[i], 0x68);
> }
> }
> if (outbuf && outlen) {

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/