Commit 147923b1 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/usb-20190108-pull-request' into staging 



usb: generic sysbus ehci, bugfixes.

# gpg: Signature made Tue 08 Jan 2019 15:53:37 GMT
# gpg:                using RSA key 4CB6D8EED3E87138
# 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>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/usb-20190108-pull-request:
  usb: move ehci_create_ich9_with_companions to hw/i386
  hw/usb: Add generic sys-bus EHCI controller
  usb: dev-mtp: fix memory leak in error path
  usb: drop unnecessary usb_device_post_load checks
  hw/usb: fix mistaken de-initialization of CCID state

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 21a43af0 efce3175

hw/i386/pc_q35.c

+53 −0
Original line number Diff line number Diff line
@@ -58,6 +58,59 @@ 
/* ICH9 AHCI has 6 ports */

#define MAX_SATA_PORTS     6



struct ehci_companions {

    const char *name;

    int func;

    int port;

};



static const struct ehci_companions ich9_1d[] = {

    { .name = "ich9-usb-uhci1", .func = 0, .port = 0 },

    { .name = "ich9-usb-uhci2", .func = 1, .port = 2 },

    { .name = "ich9-usb-uhci3", .func = 2, .port = 4 },

};



static const struct ehci_companions ich9_1a[] = {

    { .name = "ich9-usb-uhci4", .func = 0, .port = 0 },

    { .name = "ich9-usb-uhci5", .func = 1, .port = 2 },

    { .name = "ich9-usb-uhci6", .func = 2, .port = 4 },

};



static int ehci_create_ich9_with_companions(PCIBus *bus, int slot)

{

    const struct ehci_companions *comp;

    PCIDevice *ehci, *uhci;

    BusState *usbbus;

    const char *name;

    int i;



    switch (slot) {

    case 0x1d:

        name = "ich9-usb-ehci1";

        comp = ich9_1d;

        break;

    case 0x1a:

        name = "ich9-usb-ehci2";

        comp = ich9_1a;

        break;

    default:

        return -1;

    }



    ehci = pci_create_multifunction(bus, PCI_DEVFN(slot, 7), true, name);

    qdev_init_nofail(&ehci->qdev);

    usbbus = QLIST_FIRST(&ehci->qdev.child_bus);



    for (i = 0; i < 3; i++) {

        uhci = pci_create_multifunction(bus, PCI_DEVFN(slot, comp[i].func),

                                        true, comp[i].name);

        qdev_prop_set_string(&uhci->qdev, "masterbus", usbbus->name);

        qdev_prop_set_uint32(&uhci->qdev, "firstport", comp[i].port);

        qdev_init_nofail(&uhci->qdev);

    }

    return 0;

}



/* PC hardware initialisation */

static void pc_q35_init(MachineState *machine)

{

hw/usb/bus.c

+0 −6
Original line number Diff line number Diff line
@@ -59,12 +59,6 @@ static int usb_device_post_load(void *opaque, int version_id) 
    } else {

        dev->attached = true;

    }

    if (dev->setup_index < 0 ||

        dev->setup_len < 0 ||

        dev->setup_index > dev->setup_len ||

        dev->setup_len > sizeof(dev->data_buf)) {

        return -EINVAL;

    }

    return 0;

}

hw/usb/ccid-card-emulated.c

+2 −0
Original line number Diff line number Diff line
@@ -549,6 +549,8 @@ static void emulated_realize(CCIDCardState *base, Error **errp) 
    qemu_thread_create(&card->apdu_thread_id, "ccid/apdu", handle_apdu_thread,

                       card, QEMU_THREAD_JOINABLE);



    return;



out2:

    clean_event_notifier(card);

out1:

hw/usb/dev-mtp.c

+1 −0
Original line number Diff line number Diff line
@@ -1729,6 +1729,7 @@ static void usb_mtp_write_metadata(MTPState *s, uint64_t dlen) 
    if (strchr(filename, '/')) {

        usb_mtp_queue_result(s, RES_PARAMETER_NOT_SUPPORTED, d->trans,

                             0, 0, 0, 0);

        g_free(filename);

        return;

    }

hw/usb/hcd-ehci-pci.c

+0 −53
Original line number Diff line number Diff line
@@ -230,56 +230,3 @@ static void ehci_pci_register_types(void) 
}



type_init(ehci_pci_register_types)
 


struct ehci_companions {

    const char *name;

    int func;

    int port;

};



static const struct ehci_companions ich9_1d[] = {

    { .name = "ich9-usb-uhci1", .func = 0, .port = 0 },

    { .name = "ich9-usb-uhci2", .func = 1, .port = 2 },

    { .name = "ich9-usb-uhci3", .func = 2, .port = 4 },

};



static const struct ehci_companions ich9_1a[] = {

    { .name = "ich9-usb-uhci4", .func = 0, .port = 0 },

    { .name = "ich9-usb-uhci5", .func = 1, .port = 2 },

    { .name = "ich9-usb-uhci6", .func = 2, .port = 4 },

};



int ehci_create_ich9_with_companions(PCIBus *bus, int slot)

{

    const struct ehci_companions *comp;

    PCIDevice *ehci, *uhci;

    BusState *usbbus;

    const char *name;

    int i;



    switch (slot) {

    case 0x1d:

        name = "ich9-usb-ehci1";

        comp = ich9_1d;

        break;

    case 0x1a:

        name = "ich9-usb-ehci2";

        comp = ich9_1a;

        break;

    default:

        return -1;

    }



    ehci = pci_create_multifunction(bus, PCI_DEVFN(slot, 7), true, name);

    qdev_init_nofail(&ehci->qdev);

    usbbus = QLIST_FIRST(&ehci->qdev.child_bus);



    for (i = 0; i < 3; i++) {

        uhci = pci_create_multifunction(bus, PCI_DEVFN(slot, comp[i].func),

                                        true, comp[i].name);

        qdev_prop_set_string(&uhci->qdev, "masterbus", usbbus->name);

        qdev_prop_set_uint32(&uhci->qdev, "firstport", comp[i].port);

        qdev_init_nofail(&uhci->qdev);

    }

    return 0;

}