From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56309) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxzOm-0006tN-Qa for qemu-devel@nongnu.org; Sun, 15 Nov 2015 10:39:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZxzOj-0006NV-JU for qemu-devel@nongnu.org; Sun, 15 Nov 2015 10:39:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56253) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxzOj-0006Mz-DH for qemu-devel@nongnu.org; Sun, 15 Nov 2015 10:39:21 -0500 From: Marcel Apfelbaum Date: Sun, 15 Nov 2015 17:39:06 +0200 Message-Id: <1447601946-31248-5-git-send-email-marcel@redhat.com> In-Reply-To: <1447601946-31248-1-git-send-email-marcel@redhat.com> References: <1447601946-31248-1-git-send-email-marcel@redhat.com> Subject: [Qemu-devel] [PATCH V2 4/4] hw/pxb: add support for PCIe List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: ehabkost@redhat.com, mst@redhat.com, kraxel@redhat.com, pbonzini@redhat.com, marcel@redhat.com, imammedo@redhat.com, rth@twiddle.net The PXB internal bus type is created in conformance with the primary root bus (bus 0). Signed-off-by: Marcel Apfelbaum --- hw/pci-bridge/pci_expander_bridge.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expander_bridge.c index 541414c..0a04297 100644 --- a/hw/pci-bridge/pci_expander_bridge.c +++ b/hw/pci-bridge/pci_expander_bridge.c @@ -23,6 +23,9 @@ #define TYPE_PXB_BUS "pxb-bus" #define PXB_BUS(obj) OBJECT_CHECK(PXBBus, (obj), TYPE_PXB_BUS) +#define TYPE_PXB_PCIE_BUS "pxb-pcie-bus" +#define PXB_PCIE_BUS(obj) OBJECT_CHECK(PXBBus, (obj), TYPE_PXB_PCIE_BUS) + typedef struct PXBBus { /*< private >*/ PCIBus parent_obj; @@ -86,10 +89,18 @@ static const TypeInfo pxb_bus_info = { .class_init = pxb_bus_class_init, }; +static const TypeInfo pxb_pcie_bus_info = { + .name = TYPE_PXB_PCIE_BUS, + .parent = TYPE_PCIE_BUS, + .instance_size = sizeof(PXBBus), + .class_init = pxb_bus_class_init, +}; + static const char *pxb_host_root_bus_path(PCIHostState *host_bridge, PCIBus *rootbus) { - PXBBus *bus = PXB_BUS(rootbus); + PXBBus *bus = pci_bus_is_express(rootbus) ? + PXB_PCIE_BUS(rootbus) : PXB_BUS(rootbus); snprintf(bus->bus_path, 8, "0000:%02x", pxb_bus_num(rootbus)); return bus->bus_path; @@ -222,7 +233,11 @@ static int pxb_dev_initfn(PCIDevice *dev) qdev_prop_set_uint8(bds, PCI_BRIDGE_DEV_PROP_CHASSIS_NR, pxb->bus_nr); qdev_prop_set_bit(bds, PCI_BRIDGE_DEV_PROP_SHPC, false); } else { - bus = pci_bus_new(ds, dev_name, NULL, NULL, 0, TYPE_PXB_BUS); + if (pci_bus_is_express(dev->bus)) { + bus = pci_bus_new(ds, dev_name, NULL, NULL, 0, TYPE_PXB_PCIE_BUS); + } else { + bus = pci_bus_new(ds, dev_name, NULL, NULL, 0, TYPE_PXB_BUS); + } } bus->parent_dev = dev; @@ -290,6 +305,7 @@ static const TypeInfo pxb_dev_info = { static void pxb_register_types(void) { type_register_static(&pxb_bus_info); + type_register_static(&pxb_pcie_bus_info); type_register_static(&pxb_host_info); type_register_static(&pxb_dev_info); } -- 2.1.0