172bc8520d
Storing properties directly in XHCIPciState.xhci doesn't work,
the object_initialize_child() call in xhci_instance_init() will
overwrite them.
This changes the defaults for some properties, which in turn breaks
live migration and possibly other things as well.
So add XHCINecState, store properties there, copy them over on
instance init.
Fixes: 8ddab8dd3d ("usb/hcd-xhci: Split pci wrapper for xhci base model")
Reported-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20201112103741.2335-1-kraxel@redhat.com
86 lines
2.7 KiB
C
86 lines
2.7 KiB
C
/*
|
|
* USB xHCI controller emulation
|
|
*
|
|
* Copyright (c) 2011 Securiforest
|
|
* Date: 2011-05-11 ; Author: Hector Martin <hector@marcansoft.com>
|
|
* Based on usb-ohci.c, emulates Renesas NEC USB 3.0
|
|
*
|
|
* 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 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/usb.h"
|
|
#include "qemu/module.h"
|
|
#include "hw/pci/pci.h"
|
|
#include "hw/qdev-properties.h"
|
|
|
|
#include "hcd-xhci-pci.h"
|
|
|
|
typedef struct XHCINecState {
|
|
/*< private >*/
|
|
XHCIPciState parent_obj;
|
|
/*< public >*/
|
|
uint32_t flags;
|
|
uint32_t intrs;
|
|
uint32_t slots;
|
|
} XHCINecState;
|
|
|
|
static Property nec_xhci_properties[] = {
|
|
DEFINE_PROP_ON_OFF_AUTO("msi", XHCIPciState, msi, ON_OFF_AUTO_AUTO),
|
|
DEFINE_PROP_ON_OFF_AUTO("msix", XHCIPciState, msix, ON_OFF_AUTO_AUTO),
|
|
DEFINE_PROP_BIT("superspeed-ports-first", XHCINecState, flags,
|
|
XHCI_FLAG_SS_FIRST, true),
|
|
DEFINE_PROP_BIT("force-pcie-endcap", XHCINecState, flags,
|
|
XHCI_FLAG_FORCE_PCIE_ENDCAP, false),
|
|
DEFINE_PROP_UINT32("intrs", XHCINecState, intrs, XHCI_MAXINTRS),
|
|
DEFINE_PROP_UINT32("slots", XHCINecState, slots, XHCI_MAXSLOTS),
|
|
DEFINE_PROP_END_OF_LIST(),
|
|
};
|
|
|
|
static void nec_xhci_instance_init(Object *obj)
|
|
{
|
|
XHCIPciState *pci = XHCI_PCI(obj);
|
|
XHCINecState *nec = container_of(pci, XHCINecState, parent_obj);
|
|
|
|
pci->xhci.flags = nec->flags;
|
|
pci->xhci.numintrs = nec->intrs;
|
|
pci->xhci.numslots = nec->slots;
|
|
}
|
|
|
|
static void nec_xhci_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
|
|
device_class_set_props(dc, nec_xhci_properties);
|
|
k->vendor_id = PCI_VENDOR_ID_NEC;
|
|
k->device_id = PCI_DEVICE_ID_NEC_UPD720200;
|
|
k->revision = 0x03;
|
|
}
|
|
|
|
static const TypeInfo nec_xhci_info = {
|
|
.name = TYPE_NEC_XHCI,
|
|
.parent = TYPE_XHCI_PCI,
|
|
.instance_size = sizeof(XHCINecState),
|
|
.instance_init = nec_xhci_instance_init,
|
|
.class_init = nec_xhci_class_init,
|
|
};
|
|
|
|
static void nec_xhci_register_types(void)
|
|
{
|
|
type_register_static(&nec_xhci_info);
|
|
}
|
|
|
|
type_init(nec_xhci_register_types)
|