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

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



usb: bugfixes for mtp and xhci, split ohci-pci.

# gpg: Signature made Fri 03 May 2019 07:59:39 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/usb-20190503-v2-pull-request:
  hw/usb: avoid format truncation warning when formatting port name
  hw/usb/hcd-ohci: Move PCI-related code into a separate file
  hw/usb/hcd-ohci: Do not use PCI functions with sysbus devices in ohci_die()
  usb/xhci: avoid trigger assertion if guest write wrong epid
  usb-mtp: change default to success for usb_mtp_update_object
  usb-mtp: fix alignment of access of ObjectInfo filename field
  usb-mtp: fix string length for filename when writing metadata

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 51138751 ccb79931

hw/sh4/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ config R2D 
    select I82378 if TEST_DEVICES

    select IDE_MMIO

    select PFLASH_CFI02

    select USB_OHCI

    select USB_OHCI_PCI

    select PCI

    select SM501

    select SH4

hw/usb/Kconfig

+5 −1
Original line number Diff line number Diff line
@@ -8,10 +8,14 @@ config USB_UHCI 
    select USB



config USB_OHCI

    bool

    select USB



config USB_OHCI_PCI

    bool

    default y if PCI_DEVICES

    depends on PCI

    select USB

    select USB_OHCI



config USB_EHCI

    bool

hw/usb/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ common-obj-$(CONFIG_USB) += desc.o desc-msos.o 
# usb host adapters

common-obj-$(CONFIG_USB_UHCI) += hcd-uhci.o

common-obj-$(CONFIG_USB_OHCI) += hcd-ohci.o

common-obj-$(CONFIG_USB_OHCI_PCI) += hcd-ohci-pci.o

common-obj-$(CONFIG_USB_EHCI) += hcd-ehci.o hcd-ehci-pci.o

common-obj-$(CONFIG_USB_EHCI_SYSBUS) += hcd-ehci.o hcd-ehci-sysbus.o

common-obj-$(CONFIG_USB_XHCI) += hcd-xhci.o

hw/usb/dev-mtp.c

+5 −5
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ typedef struct { 
    uint32_t assoc_desc;

    uint32_t seq_no; /*unused*/

    uint8_t length; /*part of filename field*/

    uint16_t filename[0];

    uint8_t filename[0]; /* UTF-16 encoded */

    char date_created[0]; /*unused*/

    char date_modified[0]; /*unused*/

    char keywords[0]; /*unused*/
@@ -1551,7 +1551,7 @@ static void usb_mtp_cancel_packet(USBDevice *dev, USBPacket *p) 
    fprintf(stderr, "%s\n", __func__);

}



static char *utf16_to_str(uint8_t len, uint16_t *arr)

static char *utf16_to_str(uint8_t len, uint8_t *str16)

{

    wchar_t *wstr = g_new0(wchar_t, len + 1);

    int count, dlen;
@@ -1559,7 +1559,7 @@ static char *utf16_to_str(uint8_t len, uint16_t *arr) 


    for (count = 0; count < len; count++) {

        /* FIXME: not working for surrogate pairs */

        wstr[count] = (wchar_t)arr[count];

        wstr[count] = lduw_le_p(str16 + (count * 2));

    }

    wstr[count] = 0;
@@ -1587,7 +1587,7 @@ done: 


static int usb_mtp_update_object(MTPObject *parent, char *name)

{

    int ret = -1;

    int ret = 0;



    MTPObject *o =

        usb_mtp_object_lookup_name(parent, name, strlen(name));
@@ -1721,7 +1721,7 @@ static void usb_mtp_write_metadata(MTPState *s, uint64_t dlen) 
        return;

    }



    o = usb_mtp_object_lookup_name(p, filename, dataset->length);

    o = usb_mtp_object_lookup_name(p, filename, -1);

    if (o != NULL) {

        next_handle = o->handle;

    }

hw/usb/hcd-ohci-pci.c

0 → 100644
+163 −0
Original line number Diff line number Diff line 
/*

 * QEMU USB OHCI Emulation

 * Copyright (c) 2004 Gianni Tedesco

 * Copyright (c) 2006 CodeSourcery

 * Copyright (c) 2006 Openedhand Ltd.

 *

 * This library is free software; you can redistribute it and/or

 * modify it under the terms of the GNU Lesser General Public

 * License as published by the Free Software Foundation; either

 * version 2.1 of the License, or (at your option) any later version.

 *

 * This library is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * Lesser General Public License for more details.

 *

 * You should have received a copy of the GNU Lesser General Public

 * License along with this library; if not, see <http://www.gnu.org/licenses/>.

 */



#include "qemu/osdep.h"

#include "hw/hw.h"

#include "qapi/error.h"

#include "qemu/timer.h"

#include "hw/usb.h"

#include "hw/pci/pci.h"

#include "hw/sysbus.h"

#include "hw/qdev-dma.h"

#include "trace.h"

#include "hcd-ohci.h"



#define TYPE_PCI_OHCI "pci-ohci"

#define PCI_OHCI(obj) OBJECT_CHECK(OHCIPCIState, (obj), TYPE_PCI_OHCI)



typedef struct {

    /*< private >*/

    PCIDevice parent_obj;

    /*< public >*/



    OHCIState state;

    char *masterbus;

    uint32_t num_ports;

    uint32_t firstport;

} OHCIPCIState;



/**

 * A typical PCI OHCI will additionally set PERR in its configspace to

 * signal that it got an error.

 */

static void ohci_pci_die(struct OHCIState *ohci)

{

    OHCIPCIState *dev = container_of(ohci, OHCIPCIState, state);



    ohci_sysbus_die(ohci);



    pci_set_word(dev->parent_obj.config + PCI_STATUS,

                 PCI_STATUS_DETECTED_PARITY);

}



static void usb_ohci_realize_pci(PCIDevice *dev, Error **errp)

{

    Error *err = NULL;

    OHCIPCIState *ohci = PCI_OHCI(dev);



    dev->config[PCI_CLASS_PROG] = 0x10; /* OHCI */

    dev->config[PCI_INTERRUPT_PIN] = 0x01; /* interrupt pin A */



    usb_ohci_init(&ohci->state, DEVICE(dev), ohci->num_ports, 0,

                  ohci->masterbus, ohci->firstport,

                  pci_get_address_space(dev), ohci_pci_die, &err);

    if (err) {

        error_propagate(errp, err);

        return;

    }



    ohci->state.irq = pci_allocate_irq(dev);

    pci_register_bar(dev, 0, 0, &ohci->state.mem);

}



static void usb_ohci_exit(PCIDevice *dev)

{

    OHCIPCIState *ohci = PCI_OHCI(dev);

    OHCIState *s = &ohci->state;



    trace_usb_ohci_exit(s->name);

    ohci_bus_stop(s);



    if (s->async_td) {

        usb_cancel_packet(&s->usb_packet);

        s->async_td = 0;

    }

    ohci_stop_endpoints(s);



    if (!ohci->masterbus) {

        usb_bus_release(&s->bus);

    }



    timer_del(s->eof_timer);

    timer_free(s->eof_timer);

}



static void usb_ohci_reset_pci(DeviceState *d)

{

    PCIDevice *dev = PCI_DEVICE(d);

    OHCIPCIState *ohci = PCI_OHCI(dev);

    OHCIState *s = &ohci->state;



    ohci_hard_reset(s);

}



static Property ohci_pci_properties[] = {

    DEFINE_PROP_STRING("masterbus", OHCIPCIState, masterbus),

    DEFINE_PROP_UINT32("num-ports", OHCIPCIState, num_ports, 3),

    DEFINE_PROP_UINT32("firstport", OHCIPCIState, firstport, 0),

    DEFINE_PROP_END_OF_LIST(),

};



static const VMStateDescription vmstate_ohci = {

    .name = "ohci",

    .version_id = 1,

    .minimum_version_id = 1,

    .fields = (VMStateField[]) {

        VMSTATE_PCI_DEVICE(parent_obj, OHCIPCIState),

        VMSTATE_STRUCT(state, OHCIPCIState, 1, vmstate_ohci_state, OHCIState),

        VMSTATE_END_OF_LIST()

    }

};



static void ohci_pci_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);



    k->realize = usb_ohci_realize_pci;

    k->exit = usb_ohci_exit;

    k->vendor_id = PCI_VENDOR_ID_APPLE;

    k->device_id = PCI_DEVICE_ID_APPLE_IPID_USB;

    k->class_id = PCI_CLASS_SERIAL_USB;

    set_bit(DEVICE_CATEGORY_USB, dc->categories);

    dc->desc = "Apple USB Controller";

    dc->props = ohci_pci_properties;

    dc->hotpluggable = false;

    dc->vmsd = &vmstate_ohci;

    dc->reset = usb_ohci_reset_pci;

}



static const TypeInfo ohci_pci_info = {

    .name          = TYPE_PCI_OHCI,

    .parent        = TYPE_PCI_DEVICE,

    .instance_size = sizeof(OHCIPCIState),

    .class_init    = ohci_pci_class_init,

    .interfaces = (InterfaceInfo[]) {

        { INTERFACE_CONVENTIONAL_PCI_DEVICE },

        { },

    },

};



static void ohci_pci_register_types(void)

{

    type_register_static(&ohci_pci_info);

}



type_init(ohci_pci_register_types)