Commit b6825cd7 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'kraxel/usb.59' into staging 

* kraxel/usb.59:
  ehci: Fix setting of halt bit from usbcmd register updates
  ehci: fix Interrupt Threshold Control implementation
  usb: update uas product id
  usb: async control xfer fixup
parents 99afc91d 47d073cc

hw/usb/core.c

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ static int do_token_setup(USBDevice *s, USBPacket *p) 
    }



    usb_packet_copy(p, s->setup_buf, p->iov.size);

    p->result = 0;

    s->setup_len   = (s->setup_buf[7] << 8) | s->setup_buf[6];

    s->setup_index = 0;

hw/usb/dev-uas.c

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static const USBDescDevice desc_device_high = { 
static const USBDesc desc = {

    .id = {

        .idVendor          = 0x46f4, /* CRC16() of "QEMU" */

        .idProduct         = 0x0002,

        .idProduct         = 0x0003,

        .bcdDevice         = 0,

        .iManufacturer     = STR_MANUFACTURER,

        .iProduct          = STR_PRODUCT,

hw/usb/hcd-ehci.c

+18 −9
Original line number Diff line number Diff line
@@ -575,8 +575,13 @@ static inline void ehci_update_irq(EHCIState *s) 
/* flag interrupt condition */

static inline void ehci_raise_irq(EHCIState *s, int intr)

{

    if (intr & (USBSTS_PCD | USBSTS_FLR | USBSTS_HSE)) {

        s->usbsts |= intr;

        ehci_update_irq(s);

    } else {

        s->usbsts_pending |= intr;

    }

}



/*

 * Commit pending interrupts (added via ehci_raise_irq),
@@ -1182,22 +1187,23 @@ static void ehci_mem_writel(void *ptr, target_phys_addr_t addr, uint32_t val) 
            break;

        }



        /* not supporting dynamic frame list size at the moment */

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

            fprintf(stderr, "attempt to set frame list size -- value %d\n",

                    val & USBCMD_FLS);

            val &= ~USBCMD_FLS;

        }



        if (((USBCMD_RUNSTOP | USBCMD_PSE | USBCMD_ASE) & val) !=

            ((USBCMD_RUNSTOP | USBCMD_PSE | USBCMD_ASE) & s->usbcmd)) {

            if (s->pstate == EST_INACTIVE) {

                SET_LAST_RUN_CLOCK(s);

            }

            s->usbcmd = val; /* Set usbcmd for ehci_update_halt() */

            ehci_update_halt(s);

            s->async_stepdown = 0;

            qemu_mod_timer(s->frame_timer, qemu_get_clock_ns(vm_clock));

        }



        /* not supporting dynamic frame list size at the moment */

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

            fprintf(stderr, "attempt to set frame list size -- value %d\n",

                    val & USBCMD_FLS);

            val &= ~USBCMD_FLS;

        }

        break;



    case USBSTS:
@@ -2466,13 +2472,16 @@ static int usb_ehci_post_load(void *opaque, int version_id) 


static const VMStateDescription vmstate_ehci = {

    .name        = "ehci",

    .version_id  = 1,

    .version_id  = 2,

    .minimum_version_id  = 1,

    .post_load   = usb_ehci_post_load,

    .fields      = (VMStateField[]) {

        VMSTATE_PCI_DEVICE(dev, EHCIState),

        /* mmio registers */

        VMSTATE_UINT32(usbcmd, EHCIState),

        VMSTATE_UINT32(usbsts, EHCIState),

        VMSTATE_UINT32_V(usbsts_pending, EHCIState, 2),

        VMSTATE_UINT32_V(usbsts_frindex, EHCIState, 2),

        VMSTATE_UINT32(usbintr, EHCIState),

        VMSTATE_UINT32(frindex, EHCIState),

        VMSTATE_UINT32(ctrldssegment, EHCIState),

hw/usb/host-linux.c

+1 −0
Original line number Diff line number Diff line
@@ -1045,6 +1045,7 @@ static int usb_host_handle_control(USBDevice *dev, USBPacket *p, 


    /* Note request is (bRequestType << 8) | bRequest */

    trace_usb_host_req_control(s->bus_num, s->addr, p, request, value, index);

    assert(p->result == 0);



    switch (request) {

    case DeviceOutRequest | USB_REQ_SET_ADDRESS: