Patchwork hw/usb-ohci.c: Implement remote wakeup

login
register
mail settings
Submitter Peter Maydell
Date June 7, 2011, 6:50 p.m.
Message ID <1307472612-25683-1-git-send-email-peter.maydell@linaro.org>
Download mbox | patch
Permalink /patch/99318/
State New
Headers show

Comments

Peter Maydell - June 7, 2011, 6:50 p.m.
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 <peter.maydell@linaro.org>
---
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(-)
Gerd Hoffmann - June 8, 2011, 8:06 a.m.
> 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.

Looks good, queued up.

thanks,
   Gerd

Patch

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,
 };