Commit e850c2b4 authored by Hans de Goede's avatar Hans de Goede Committed by Gerd Hoffmann
Browse files

usb-ehci: Rip the queues when the async or period schedule is halted 



Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 4be23939

hw/usb-ehci.c

+4 −1
Original line number Diff line number Diff line
@@ -1076,7 +1076,8 @@ static void ehci_mem_writel(void *ptr, target_phys_addr_t addr, uint32_t val) 


        if (!(val & USBCMD_RUNSTOP) && (s->usbcmd & USBCMD_RUNSTOP)) {

            qemu_del_timer(s->frame_timer);

            // TODO - should finish out some stuff before setting halt

            ehci_queues_rip_all(s, 0);

            ehci_queues_rip_all(s, 1);

            ehci_set_usbsts(s, USBSTS_HALT);

        }
@@ -2088,6 +2089,7 @@ static void ehci_advance_async_state(EHCIState *ehci) 


    case EST_ACTIVE:

        if ( !(ehci->usbcmd & USBCMD_ASE)) {

            ehci_queues_rip_all(ehci, async);

            ehci_clear_usbsts(ehci, USBSTS_ASS);

            ehci_set_state(ehci, async, EST_INACTIVE);

            break;
@@ -2148,6 +2150,7 @@ static void ehci_advance_periodic_state(EHCIState *ehci) 


    case EST_ACTIVE:

        if ( !(ehci->frindex & 7) && !(ehci->usbcmd & USBCMD_PSE)) {

            ehci_queues_rip_all(ehci, async);

            ehci_clear_usbsts(ehci, USBSTS_PSS);

            ehci_set_state(ehci, async, EST_INACTIVE);

            break;