Commit e489df40 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

ehci: implement port wakeup 



Update portsc register and raise irq in case a suspended
port is woken up, so remote wakeup works on our ehci ports.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 72391da5

hw/usb/hcd-ehci.c

+16 −2
Original line number Diff line number Diff line
@@ -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);

trace-events

+3 −0
Original line number Diff line number Diff line
@@ -309,6 +309,9 @@ usb_ehci_sitd(uint32_t addr, uint32_t nxt, uint32_t active) "ITD @ %08x: next %0 
usb_ehci_port_attach(uint32_t port, const char *owner, const char *device) "attach port #%d, owner %s, device %s"

usb_ehci_port_detach(uint32_t port, const char *owner) "detach port #%d, owner %s"

usb_ehci_port_reset(uint32_t port, int enable) "reset port #%d - %d"

usb_ehci_port_suspend(uint32_t port) "port #%d"

usb_ehci_port_wakeup(uint32_t port) "port #%d"

usb_ehci_port_resume(uint32_t port) "port #%d"

usb_ehci_queue_action(void *q, const char *action) "q %p: %s"

usb_ehci_packet_action(void *q, void *p, const char *action) "q %p p %p: %s"

usb_ehci_irq(uint32_t level, uint32_t frindex, uint32_t sts, uint32_t mask) "level %d, frindex 0x%04x, sts 0x%x, mask 0x%x"