[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v3 13/44] pcie: Add link speed and width fields to PC
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v3 13/44] pcie: Add link speed and width fields to PCIESlot |
Date: |
Thu, 20 Dec 2018 13:38:48 -0500 |
From: Alex Williamson <address@hidden>
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 <address@hidden>
Tested-by: Geoffrey McRae <address@hidden>
Reviewed-by: Eric Auger <address@hidden>
Signed-off-by: Alex Williamson <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/hw/pci/pcie_port.h | 4 ++++
hw/pci-bridge/pcie_root_port.c | 14 ++++++++++++++
2 files changed, 18 insertions(+)
diff --git a/include/hw/pci/pcie_port.h b/include/hw/pci/pcie_port.h
index 0736014bfd..df242a0caf 100644
--- a/include/hw/pci/pcie_port.h
+++ b/include/hw/pci/pcie_port.h
@@ -49,6 +49,10 @@ struct PCIESlot {
/* pci express switch port with slot */
uint8_t chassis;
uint16_t slot;
+
+ PCIExpLinkSpeed speed;
+ PCIExpLinkWidth width;
+
QLIST_ENTRY(PCIESlot) next;
};
diff --git a/hw/pci-bridge/pcie_root_port.c b/hw/pci-bridge/pcie_root_port.c
index 45f9e8cd4a..34ad76743c 100644
--- a/hw/pci-bridge/pcie_root_port.c
+++ b/hw/pci-bridge/pcie_root_port.c
@@ -140,6 +140,19 @@ static Property rp_props[] = {
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)
{
DeviceClass *dc = DEVICE_CLASS(klass);
@@ -157,6 +170,7 @@ static void rp_class_init(ObjectClass *klass, void *data)
static const TypeInfo rp_info = {
.name = TYPE_PCIE_ROOT_PORT,
.parent = TYPE_PCIE_SLOT,
+ .instance_post_init = rp_instance_post_init,
.class_init = rp_class_init,
.abstract = true,
.class_size = sizeof(PCIERootPortClass),
--
MST
- [Qemu-devel] [PULL v3 03/44] virtio: Helper for registering virtio device types, (continued)
- [Qemu-devel] [PULL v3 03/44] virtio: Helper for registering virtio device types, Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 05/44] tests: Remove unused include, Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 06/44] hw/smbios: Restrict access to "hw/smbios/ipmi.h", Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 02/44] pc:piix4: Update smbus I/O space after a migration, Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 09/44] hw/pci-bridge: Fix invalid free(), Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 07/44] hw/smbios: Remove "smbios_ipmi.h", Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 08/44] hw/smbios: Move to the hw/firmware/ subdirectory, Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 10/44] pcie: Create enums for link speed and width, Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 12/44] qapi: Define PCIe link speed and width properties, Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 14/44] pcie: Fill PCIESlot link fields to support higher speeds and widths, Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 13/44] pcie: Add link speed and width fields to PCIESlot,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v3 15/44] pcie: Allow generic PCIe root port to specify link speed and width, Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 17/44] pcie: Fast PCIe root ports for new machines, Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 11/44] pci: Sync PCIe downstream port LNKSTA on read, Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 18/44] intel_iommu: dump correct iova when failed, Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 19/44] intel_iommu: convert invalid traces into error reports, Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 16/44] vfio/pci: Remove PCIe Link Status emulation, Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 20/44] intel_iommu: dma read/write draining support, Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 21/44] intel_iommu: remove "x-" prefix for "aw-bits", Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 22/44] hw: acpi: The RSDP build API can return void, Michael S. Tsirkin, 2018/12/20
- [Qemu-devel] [PULL v3 32/44] pci/shpc: rename hotplug handler callbacks, Michael S. Tsirkin, 2018/12/20