浏览代码

x86, olpc: Wait for last byte of EC command to be accepted

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.

It means that sometimes, on XO-1.5 (but not XO-1), the
devices that were marked as wakeup sources can't wake up
the system. e.g. you ask for wifi wakeups, suspend, but then
incoming wifi frames don't wake up the system as they should.

Signed-off-by: Paul Fox <pgf@laptop.org>
Signed-off-by: Daniel Drake <dsd@laptop.org>
Acked-by: Andres Salomon <dilinger@queued.net>
Cc: <stable@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Paul Fox 14 年之前
父节点
当前提交
a3ea14df0e
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      arch/x86/platform/olpc/olpc.c

+ 2 - 2
arch/x86/platform/olpc/olpc.c

@@ -161,13 +161,13 @@ restart:
 	if (inbuf && inlen) {
 	if (inbuf && inlen) {
 		/* write data to EC */
 		/* write data to EC */
 		for (i = 0; i < inlen; i++) {
 		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)) {
 			if (wait_on_ibf(0x6c, 0)) {
 				printk(KERN_ERR "olpc-ec:  timeout waiting for"
 				printk(KERN_ERR "olpc-ec:  timeout waiting for"
 						" EC accept data!\n");
 						" EC accept data!\n");
 				goto err;
 				goto err;
 			}
 			}
-			pr_devel("olpc-ec:  sending cmd arg 0x%x\n", inbuf[i]);
-			outb(inbuf[i], 0x68);
 		}
 		}
 	}
 	}
 	if (outbuf && outlen) {
 	if (outbuf && outlen) {