Commit d9aa6885 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20140829-1' into staging 



usb: bugfix collection.
usb: add cleanup functions for host adapters,
     in preparation for hotplug support.
usb: add simple qtests for uhci,ohci,xhci.

# gpg: Signature made Fri 29 Aug 2014 12:56:20 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-usb-20140829-1:
  tests: add xHCI qtest
  tests: add UHCI qtest
  tests: add OHCI qtest
  usb: add usb host adapters exit trace
  usb-xhci: add exit function
  usb-ehci: add ehci-pci device exit function
  usb-ehci: add ehci unrealize funciton
  usb-ehci: add vmstate properity for EHCIState
  usb-uhci: clean up uhci resource when pci-uhci exit
  usb-ohci: add exit function
  usb-ohci: Fix memory leak for ohci timer
  usb: add usb_bus_release function
  Revert "xhci: Fix number of streams allocated when using streams"
  xhci: use (1u << i)
  Fix OHCI ISO TD state never being written back.
  xhci: fix debug print compiling error
  usb: Fix bootindex for portnr > 9

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents a6aebb38 25e89ec5

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -614,7 +614,7 @@ USB 
M: Gerd Hoffmann <kraxel@redhat.com>

S: Maintained

F: hw/usb/*

F: tests/usb-hcd-ehci-test.c

F: tests/usb-*-test.c



VFIO

M: Alex Williamson <alex.williamson@redhat.com>

hw/usb/bus.c

+9 −2
Original line number Diff line number Diff line
@@ -87,6 +87,13 @@ void usb_bus_new(USBBus *bus, size_t bus_size, 
    QTAILQ_INSERT_TAIL(&busses, bus, next);

}



void usb_bus_release(USBBus *bus)

{

    assert(next_usb_bus > 0);



    QTAILQ_REMOVE(&busses, bus, next);

}



USBBus *usb_bus_find(int busnr)

{

    USBBus *bus;
@@ -589,11 +596,11 @@ static char *usb_get_fw_dev_path(DeviceState *qdev) 
        nr = strtol(in, &in, 10);

        if (in[0] == '.') {

            /* some hub between root port and device */

            pos += snprintf(fw_path + pos, fw_len - pos, "hub@%ld/", nr);

            pos += snprintf(fw_path + pos, fw_len - pos, "hub@%lx/", nr);

            in++;

        } else {

            /* the device itself */

            pos += snprintf(fw_path + pos, fw_len - pos, "%s@%ld",

            pos += snprintf(fw_path + pos, fw_len - pos, "%s@%lx",

                            qdev_fw_name(qdev), nr);

            break;

        }

hw/usb/hcd-ehci-pci.c

+14 −0
Original line number Diff line number Diff line
@@ -84,6 +84,19 @@ static void usb_ehci_pci_init(Object *obj) 
    usb_ehci_init(s, DEVICE(obj));

}



static void usb_ehci_pci_exit(PCIDevice *dev)

{

    EHCIPCIState *i = PCI_EHCI(dev);

    EHCIState *s = &i->ehci;



    usb_ehci_unrealize(s, DEVICE(dev), NULL);



    if (s->irq) {

        g_free(s->irq);

        s->irq = NULL;

    }

}



static void usb_ehci_pci_write_config(PCIDevice *dev, uint32_t addr,

                                      uint32_t val, int l)

{
@@ -121,6 +134,7 @@ static void ehci_class_init(ObjectClass *klass, void *data) 
    PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);



    k->init = usb_ehci_pci_initfn;

    k->exit = usb_ehci_pci_exit;

    k->class_id = PCI_CLASS_SERIAL_USB;

    k->config_write = usb_ehci_pci_write_config;

    dc->hotpluggable = false;

hw/usb/hcd-ehci.c

+28 −1
Original line number Diff line number Diff line
@@ -2468,7 +2468,34 @@ void usb_ehci_realize(EHCIState *s, DeviceState *dev, Error **errp) 
    s->device = dev;



    qemu_register_reset(ehci_reset, s);

    qemu_add_vm_change_state_handler(usb_ehci_vm_state_change, s);

    s->vmstate = qemu_add_vm_change_state_handler(usb_ehci_vm_state_change, s);

}



void usb_ehci_unrealize(EHCIState *s, DeviceState *dev, Error **errp)

{

    trace_usb_ehci_unrealize();



    if (s->frame_timer) {

        timer_del(s->frame_timer);

        timer_free(s->frame_timer);

        s->frame_timer = NULL;

    }

    if (s->async_bh) {

        qemu_bh_delete(s->async_bh);

    }



    ehci_queues_rip_all(s, 0);

    ehci_queues_rip_all(s, 1);



    memory_region_del_subregion(&s->mem, &s->mem_caps);

    memory_region_del_subregion(&s->mem, &s->mem_opreg);

    memory_region_del_subregion(&s->mem, &s->mem_ports);



    usb_bus_release(&s->bus);



    if (s->vmstate) {

        qemu_del_vm_change_state_handler(s->vmstate);

    }

}



void usb_ehci_init(EHCIState *s, DeviceState *dev)

hw/usb/hcd-ehci.h

+2 −0
Original line number Diff line number Diff line
@@ -316,12 +316,14 @@ struct EHCIState { 
    uint32_t async_stepdown;

    uint32_t periodic_sched_active;

    bool int_req_by_async;

    VMChangeStateEntry *vmstate;

};



extern const VMStateDescription vmstate_ehci;



void usb_ehci_init(EHCIState *s, DeviceState *dev);

void usb_ehci_realize(EHCIState *s, DeviceState *dev, Error **errp);

void usb_ehci_unrealize(EHCIState *s, DeviceState *dev, Error **errp);



#define TYPE_PCI_EHCI "pci-ehci-usb"

#define PCI_EHCI(obj) OBJECT_CHECK(EHCIPCIState, (obj), TYPE_PCI_EHCI)