From patchwork Thu Nov 12 15:11:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 543397 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id BFB5C141301 for ; Fri, 13 Nov 2015 02:16:24 +1100 (AEDT) Received: from localhost ([::1]:47257 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zwtbq-0003CE-N9 for incoming@patchwork.ozlabs.org; Thu, 12 Nov 2015 10:16:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58589) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwtXA-0002mc-0f for qemu-devel@nongnu.org; Thu, 12 Nov 2015 10:11:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZwtX8-0008RA-W2 for qemu-devel@nongnu.org; Thu, 12 Nov 2015 10:11:31 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40204) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwtX8-0008R6-QS for qemu-devel@nongnu.org; Thu, 12 Nov 2015 10:11:30 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 5DBBE461DA for ; Thu, 12 Nov 2015 15:11:30 +0000 (UTC) Received: from work.redhat.com (vpn1-7-213.ams2.redhat.com [10.36.7.213]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tACFBGtK017540; Thu, 12 Nov 2015 10:11:28 -0500 From: Marcel Apfelbaum To: qemu-devel@nongnu.org Date: Thu, 12 Nov 2015 17:11:16 +0200 Message-Id: <1447341076-11573-5-git-send-email-marcel@redhat.com> In-Reply-To: <1447341076-11573-1-git-send-email-marcel@redhat.com> References: <1447341076-11573-1-git-send-email-marcel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: rth@twiddle.ne, ehabkost@redhat.com, mst@redhat.com, pbonzini@redhat.com, marcel@redhat.com, imammedo@redhat.com Subject: [Qemu-devel] [PATCH 4/4] hw/pxb: add support for PCIe X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 0464dec..dac28f0 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; @@ -82,10 +85,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; @@ -211,7 +222,11 @@ static int pxb_dev_initfn(PCIDevice *dev) } ds = qdev_create(NULL, TYPE_PXB_HOST); - 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; bus->address_space_mem = dev->bus->address_space_mem; @@ -273,6 +288,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); }