Commit 6361bbc7 authored by Ladi Prosek's avatar Ladi Prosek Committed by Gerd Hoffmann
Browse files

usb-hub: set PORT_STAT_C_SUSPEND on host-initiated wake-up 



PORT_STAT_C_SUSPEND should be set even on host-initiated wake-up,
i.e. on ClearPortFeature(PORT_SUSPEND). Windows is known to not
work properly otherwise.

Side note, since PORT_ENABLE looks similar and might appear to
have the same issue: According to 11.24.2.7.2.2 C_PORT_ENABLE:

  "This bit is set when the PORT_ENABLE bit changes from one to
  zero as a result of a Port Error condition (see Section 11.8.1).
  This bit is not set on any other changes to PORT_ENABLE."

Signed-off-by: default avatarLadi Prosek <lprosek@redhat.com>
Message-id: 20170522123325.2199-1-lprosek@redhat.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 2da077a8

hw/usb/dev-hub.c

+14 −1
Original line number Diff line number Diff line
@@ -402,7 +402,20 @@ static void usb_hub_handle_control(USBDevice *dev, USBPacket *p, 
                port->wPortChange &= ~PORT_STAT_C_ENABLE;

                break;

            case PORT_SUSPEND:

                if (port->wPortStatus & PORT_STAT_SUSPEND) {

                    port->wPortStatus &= ~PORT_STAT_SUSPEND;



                    /*

                     * USB Spec rev2.0 11.24.2.7.2.3 C_PORT_SUSPEND

                     * "This bit is set on the following transitions:

                     *  - On transition from the Resuming state to the

                     *    SendEOP [sic] state"

                     *

                     * Note that this includes both remote wake-up and

                     * explicit ClearPortFeature(PORT_SUSPEND).

                     */

                    port->wPortChange |= PORT_STAT_C_SUSPEND;

                }

                break;

            case PORT_C_SUSPEND:

                port->wPortChange &= ~PORT_STAT_C_SUSPEND;