|
@@ -826,9 +826,9 @@ static void ehci_child_detach(USBPort *port, USBDevice *child)
|
|
|
static void ehci_wakeup(USBPort *port)
|
|
|
{
|
|
|
EHCIState *s = port->opaque;
|
|
|
- uint32_t portsc = s->portsc[port->index];
|
|
|
+ uint32_t *portsc = &s->portsc[port->index];
|
|
|
|
|
|
- if (portsc & PORTSC_POWNER) {
|
|
|
+ if (*portsc & PORTSC_POWNER) {
|
|
|
USBPort *companion = s->companion_ports[port->index];
|
|
|
if (companion->ops->wakeup) {
|
|
|
companion->ops->wakeup(companion);
|
|
@@ -836,6 +836,12 @@ static void ehci_wakeup(USBPort *port)
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
+ if (*portsc & PORTSC_SUSPEND) {
|
|
|
+ trace_usb_ehci_port_wakeup(port->index);
|
|
|
+ *portsc |= PORTSC_FPRES;
|
|
|
+ ehci_raise_irq(s, USBSTS_PCD);
|
|
|
+ }
|
|
|
+
|
|
|
qemu_bh_schedule(s->async_bh);
|
|
|
}
|
|
|
|
|
@@ -1067,6 +1073,14 @@ static void ehci_port_write(void *ptr, hwaddr addr,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ if ((val & PORTSC_SUSPEND) && !(*portsc & PORTSC_SUSPEND)) {
|
|
|
+ trace_usb_ehci_port_suspend(port);
|
|
|
+ }
|
|
|
+ if (!(val & PORTSC_FPRES) && (*portsc & PORTSC_FPRES)) {
|
|
|
+ trace_usb_ehci_port_resume(port);
|
|
|
+ val &= ~PORTSC_SUSPEND;
|
|
|
+ }
|
|
|
+
|
|
|
*portsc &= ~PORTSC_RO_MASK;
|
|
|
*portsc |= val;
|
|
|
trace_usb_ehci_portsc_change(addr + s->portscbase, addr >> 2, *portsc, old);
|