diff options
| author | Alex Williamson <alex.williamson@redhat.com> | 2013-03-19 12:11:24 -0600 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2013-03-26 21:02:19 +0200 |
| commit | 6214e73cc5b75a4f8d89a70d71727edfa47a81b3 (patch) | |
| tree | 5821b19c1967b319d287c396045171034887c9eb /hw/pci | |
| parent | a5519b42cfd6c00e9f8b31c5aad7682e7a9f1181 (diff) | |
pcie: Add endpoint capability initialization wrapper
Fix the awkward API of mangling the caller specified PCIe type and
just provide an interface to initialize an endpoint device. This
will pick either a regular endpoint or integrated endpoint based on
the bus and return pcie_cap_init to doing exactly what is asked.
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/pci')
| -rw-r--r-- | hw/pci/pcie.c | 29 | ||||
| -rw-r--r-- | hw/pci/pcie.h | 1 |
2 files changed, 17 insertions, 13 deletions
diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c index bcfbae4332..62bd0b8b3e 100644 --- a/hw/pci/pcie.c +++ b/hw/pci/pcie.c @@ -48,19 +48,6 @@ int pcie_cap_init(PCIDevice *dev, uint8_t offset, uint8_t type, uint8_t port) assert(pci_is_express(dev)); - /* - * Mangle type to convert Endpoints to Root Complex Integrated Endpoints. - * Windows will report Code 10 (device cannot start) for regular Endpoints - * on the Root Complex. - */ - if (pci_bus_is_express(dev->bus) && pci_bus_is_root(dev->bus)) { - switch (type) { - case PCI_EXP_TYPE_ENDPOINT: - type = PCI_EXP_TYPE_RC_END; - break; - } - } - pos = pci_add_capability(dev, PCI_CAP_ID_EXP, offset, PCI_EXP_VER2_SIZEOF); if (pos < 0) { @@ -100,6 +87,22 @@ int pcie_cap_init(PCIDevice *dev, uint8_t offset, uint8_t type, uint8_t port) return pos; } +int pcie_endpoint_cap_init(PCIDevice *dev, uint8_t offset) +{ + uint8_t type = PCI_EXP_TYPE_ENDPOINT; + + /* + * Windows guests will report Code 10, device cannot start, if + * a regular Endpoint type is exposed on a root complex. These + * should instead be Root Complex Integrated Endpoints. + */ + if (pci_bus_is_express(dev->bus) && pci_bus_is_root(dev->bus)) { + type = PCI_EXP_TYPE_RC_END; + } + + return pcie_cap_init(dev, offset, type, 0); +} + void pcie_cap_exit(PCIDevice *dev) { pci_del_capability(dev, PCI_CAP_ID_EXP, PCI_EXP_VER2_SIZEOF); diff --git a/hw/pci/pcie.h b/hw/pci/pcie.h index 31604e2742..c010007c5e 100644 --- a/hw/pci/pcie.h +++ b/hw/pci/pcie.h @@ -95,6 +95,7 @@ struct PCIExpressDevice { /* PCI express capability helper functions */ int pcie_cap_init(PCIDevice *dev, uint8_t offset, uint8_t type, uint8_t port); +int pcie_endpoint_cap_init(PCIDevice *dev, uint8_t offset); void pcie_cap_exit(PCIDevice *dev); uint8_t pcie_cap_get_type(const PCIDevice *dev); void pcie_cap_flags_set_vector(PCIDevice *dev, uint8_t vector); |