From patchwork Tue Jun 7 18:50:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 1772 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:55:42 -0000 Delivered-To: patches@linaro.org Received: by 10.52.181.10 with SMTP id ds10cs126135vdc; Tue, 7 Jun 2011 11:50:18 -0700 (PDT) Received: by 10.227.167.129 with SMTP id q1mr6565348wby.101.1307472616620; Tue, 07 Jun 2011 11:50:16 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk [81.2.115.146]) by mx.google.com with ESMTPS id e5si13387285wbh.39.2011.06.07.11.50.15 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 07 Jun 2011 11:50:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1QU1Lw-0006gg-VE; Tue, 07 Jun 2011 19:50:12 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Gerd Hoffmann Subject: [PATCH] hw/usb-ohci.c: Implement remote wakeup Date: Tue, 7 Jun 2011 19:50:12 +0100 Message-Id: <1307472612-25683-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 Implement the wakeup callback in the OHCI USBPortOps, so that when a downstream device wakes up it correctly causes the OHCI controller to come out of suspend. Signed-off-by: Peter Maydell --- This patch fixes USB keyboard support on (the not-yet-upstream) OMAP3 for me -- without it Linux puts the port and then the OHCI controller into suspend, and usb-kbd can't get the controller out of reset when you press a key. It works for me and I think it's right, but I'm no USB expert and it could use review from somebody who is. hw/usb-ohci.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/hw/usb-ohci.c b/hw/usb-ohci.c index 8b966f7..347814e 100644 --- a/hw/usb-ohci.c +++ b/hw/usb-ohci.c @@ -367,6 +367,22 @@ static void ohci_detach(USBPort *port1) ohci_set_interrupt(s, OHCI_INTR_RHSC); } +static void ohci_wakeup(USBDevice *dev) +{ + USBBus *bus = usb_bus_from_device(dev); + OHCIState *s = container_of(bus, OHCIState, bus); + int portnum = dev->port->index; + OHCIPort *port = &s->rhport[portnum]; + if (port->ctrl & OHCI_PORT_PSS) { + DPRINTF("usb-ohci: port %d: wakeup\n", portnum); + port->ctrl |= OHCI_PORT_PSSC; + port->ctrl &= ~OHCI_PORT_PSS; + if ((s->ctl & OHCI_CTL_HCFS) == OHCI_USB_SUSPEND) { + ohci_set_interrupt(s, OHCI_INTR_RD); + } + } +} + /* Reset the controller */ static void ohci_reset(void *opaque) { @@ -1661,6 +1677,7 @@ static CPUWriteMemoryFunc * const ohci_writefn[3]={ static USBPortOps ohci_port_ops = { .attach = ohci_attach, .detach = ohci_detach, + .wakeup = ohci_wakeup, .complete = ohci_async_complete_packet, };