SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pcie: Add link speed and width fields to PCIESlot

Browse Source 
Add fields allowing the PCIe link speed and width of a PCIESlot to
be configured, with an instance_post_init callback on the root port
parent class to set defaults.  This allows child classes to set these
via properties or via their own instance_init callback, without
requiring all implementions to support arbitrary user selected values.

Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Tested-by: Geoffrey McRae <geoff@hostfission.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Alex Williamson 2018-12-12 12:39:16 -07:00 committed by Michael S. Tsirkin
parent 4695a2c500
commit ea8cfdb5d1
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/pci-bridge/pcie_root_port.c
View File

@ -140,6 +140,19 @@ static Property rp_props[] = {
DEFINE_PROP_END_OF_LIST() DEFINE_PROP_END_OF_LIST()
}; };
static void rp_instance_post_init(Object *obj)
{
PCIESlot *s = PCIE_SLOT(obj);
if (!s->speed) {
s->speed = QEMU_PCI_EXP_LNK_2_5GT;
}
if (!s->width) {
s->width = QEMU_PCI_EXP_LNK_X1;
}
}
static void rp_class_init(ObjectClass *klass, void *data) static void rp_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
@ -157,6 +170,7 @@ static void rp_class_init(ObjectClass *klass, void *data)
static const TypeInfo rp_info = { static const TypeInfo rp_info = {
.name = TYPE_PCIE_ROOT_PORT, .name = TYPE_PCIE_ROOT_PORT,
.parent = TYPE_PCIE_SLOT, .parent = TYPE_PCIE_SLOT,
.instance_post_init = rp_instance_post_init,
.class_init = rp_class_init, .class_init = rp_class_init,
.abstract = true, .abstract = true,
.class_size = sizeof(PCIERootPortClass), .class_size = sizeof(PCIERootPortClass),

4
include/hw/pci/pcie_port.h
View File

@ -49,6 +49,10 @@ struct PCIESlot {
/* pci express switch port with slot */ /* pci express switch port with slot */
uint8_t chassis; uint8_t chassis;
uint16_t slot; uint16_t slot;
PCIExpLinkSpeed speed;
PCIExpLinkWidth width;
QLIST_ENTRY(PCIESlot) next; QLIST_ENTRY(PCIESlot) next;
}; };