From nobody Wed Nov 5 08:16:25 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1533178088986697.5462536201613; Wed, 1 Aug 2018 19:48:08 -0700 (PDT) Received: from localhost ([::1]:43665 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fl3em-0004ex-3b for importer@patchew.org; Wed, 01 Aug 2018 22:48:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44353) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fl3Zu-0001Ew-Qn for qemu-devel@nongnu.org; Wed, 01 Aug 2018 22:43:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fl3Zs-00078P-Vp for qemu-devel@nongnu.org; Wed, 01 Aug 2018 22:43:02 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:53790) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fl3Zs-00077K-H9 for qemu-devel@nongnu.org; Wed, 01 Aug 2018 22:43:00 -0400 Received: by mail-wm0-x243.google.com with SMTP id s9-v6so721706wmh.3 for ; Wed, 01 Aug 2018 19:43:00 -0700 (PDT) Received: from bloodymary.ipads-lab.se.sjtu.edu.cn ([46.243.138.172]) by smtp.gmail.com with ESMTPSA id t2-v6sm389721wrv.63.2018.08.01.19.42.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Aug 2018 19:42:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Fr8xIPGMGGCrzj+Q8SvI6XBXxGnuKZcUUBjZBOZjKFk=; b=KvPUEDKKj5OAsVbAzBnJGJ3y8lsU1PhGNiko6GMG6v4eVN34F27fIt/446IFe/5aGN DDWaXLQVTZRJk6K/xrKBN1Pu9whFgIxBGU6wm45qT1Jachd/XOSZVMjiWmJcZ3God8Nn qgMX02KRIhUpZ64HtMYSxyhgwv7zceIa1jStbI22SS0UhY77zq/v7hEY+Pm3Rp5TGAbO uZ/DUCcHoyiWnqalG7jUqzZ1sPKld9bLxTcGajZbnWuqgBKgvD/39cI7v8jl9oftWt8K aCVF7POmHVyz2pkelwDJNbz2LiA5bJg+p/LUcH7JfeYdm+GZdOyBVaHwiOa7rwz6ImN5 Jqlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Fr8xIPGMGGCrzj+Q8SvI6XBXxGnuKZcUUBjZBOZjKFk=; b=PuVCIvVFEOAj75w0TH9jUHo5Z7Le14LXhXXPEuU84X3dL3IpD+aBiJ+c4AwjQjiEk5 Nr/B77Pp8ADqsmoBiodtfK6zpsh1W7qMiKTIYJqf3F6g0jPlMh7AuZk/xL4N/+kNX06A gyYNVbhe5aLM/gPjbauYGDK2EATRsbW97xhjRoTiDOhe9d8tIBSWKqsbuT/rHdimHAz6 MEKTHxWOgdJXmyK3+W4LnHfI/OaXIY+6rh91cNuBp7U2clPtnRGCQUiEZRWihl+FPlLK ul1x0lsIF6ndszHoHfRKg4SdGtpK83mDIB0dZdIxpUjGgtiLWeNRp91aasXP82gd6s+Z KMGQ== X-Gm-Message-State: AOUpUlHEmUdJhpzW6DfWvJ9Pc/E3FbXtt1wvjqCzJig3+ohZBCzu7nyw Akbn1C0n8H+qsG69/MJscPlfThsh9K0= X-Google-Smtp-Source: AAOMgpfQ7Bc6GENPPmgaTGluXENFr7D4u3P7pAi8287SShIQk2WUJAGnv1aD+OdVpJDB0cu5ye/2dw== X-Received: by 2002:a1c:e54:: with SMTP id 81-v6mr588832wmo.84.1533177779192; Wed, 01 Aug 2018 19:42:59 -0700 (PDT) From: Zihan Yang To: qemu-devel@nongnu.org Date: Thu, 2 Aug 2018 10:42:18 +0800 Message-Id: <1533177743-20894-2-git-send-email-whois.zihan.yang@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533177743-20894-1-git-send-email-whois.zihan.yang@gmail.com> References: <1533177743-20894-1-git-send-email-whois.zihan.yang@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [RFC v3 1/6] pci_expander_bridge: add type TYPE_PXB_PCIE_HOST X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Zihan Yang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The inner host bridge created by pxb-pcie is TYPE_PXB_PCI_HOST by default, change it to a new type TYPE_PXB_PCIE_HOST to better utilize ECAM of PCIe Signed-off-by: Zihan Yang --- hw/pci-bridge/pci_expander_bridge.c | 127 ++++++++++++++++++++++++++++++++= ++-- 1 file changed, 122 insertions(+), 5 deletions(-) diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expand= er_bridge.c index e62de42..6dd38de 100644 --- a/hw/pci-bridge/pci_expander_bridge.c +++ b/hw/pci-bridge/pci_expander_bridge.c @@ -15,10 +15,12 @@ #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" #include "hw/pci/pci_host.h" +#include "hw/pci/pcie_host.h" #include "hw/pci/pci_bridge.h" #include "qemu/range.h" #include "qemu/error-report.h" #include "sysemu/numa.h" +#include "qapi/visitor.h" =20 #define TYPE_PXB_BUS "pxb-bus" #define PXB_BUS(obj) OBJECT_CHECK(PXBBus, (obj), TYPE_PXB_BUS) @@ -40,11 +42,20 @@ typedef struct PXBBus { #define TYPE_PXB_PCIE_DEVICE "pxb-pcie" #define PXB_PCIE_DEV(obj) OBJECT_CHECK(PXBDev, (obj), TYPE_PXB_PCIE_DEVICE) =20 +#define PROP_PXB_PCIE_DEV "pxbdev" + +#define PROP_PXB_PCIE_DOMAIN_NR "domain_nr" +#define PROP_PXB_PCIE_MAX_BUS "max_bus" +#define PROP_PXB_BUS_NR "bus_nr" +#define PROP_PXB_NUMA_NODE "numa_node" + typedef struct PXBDev { /*< private >*/ PCIDevice parent_obj; /*< public >*/ =20 + uint32_t domain_nr; /* PCI domain number, non-zero means separate doma= in */ + uint8_t max_bus; /* max bus number to use(including this one) */ uint8_t bus_nr; uint16_t numa_node; } PXBDev; @@ -58,6 +69,16 @@ static PXBDev *convert_to_pxb(PCIDevice *dev) static GList *pxb_dev_list; =20 #define TYPE_PXB_HOST "pxb-host" +#define TYPE_PXB_PCIE_HOST "pxb-pcie-host" +#define PXB_PCIE_HOST_DEVICE(obj) \ + OBJECT_CHECK(PXBPCIEHost, (obj), TYPE_PXB_PCIE_HOST) + +typedef struct PXBPCIEHost { + PCIExpressHost parent_obj; + + /* pointers to PXBDev */ + PXBDev *pxbdev; +} PXBPCIEHost; =20 static int pxb_bus_num(PCIBus *bus) { @@ -111,6 +132,35 @@ static const char *pxb_host_root_bus_path(PCIHostState= *host_bridge, return bus->bus_path; } =20 +/* Use a dedicated function for PCIe since pxb-host does + * not have a domain_nr field */ +static const char *pxb_pcie_host_root_bus_path(PCIHostState *host_bridge, + PCIBus *rootbus) +{ + if (!pci_bus_is_express(rootbus)) { + /* pxb-pcie-host cannot reside on a PCI bus */ + return NULL; + } + PXBBus *bus =3D PXB_PCIE_BUS(rootbus); + + /* get the pointer to PXBDev */ + Object *obj =3D object_property_get_link(OBJECT(host_bridge), + PROP_PXB_PCIE_DEV, NULL); + + snprintf(bus->bus_path, 8, "%04lx:%02x", + object_property_get_uint(obj, PROP_PXB_PCIE_DOMAIN_NR, NULL), + pxb_bus_num(rootbus)); + return bus->bus_path; +} + +static void pxb_pcie_host_get_mmcfg_size(Object *obj, Visitor *v, const ch= ar *name, + void *opaque, Error **errp) +{ + PCIExpressHost *e =3D PCIE_HOST_BRIDGE(obj); + + visit_type_uint64(v, name, &e->size, errp); +} + static char *pxb_host_ofw_unit_address(const SysBusDevice *dev) { const PCIHostState *pxb_host; @@ -142,6 +192,31 @@ static char *pxb_host_ofw_unit_address(const SysBusDev= ice *dev) return NULL; } =20 +static void pxb_pcie_host_initfn(Object *obj) +{ + PXBPCIEHost *s =3D PXB_PCIE_HOST_DEVICE(obj); + PCIHostState *phb =3D PCI_HOST_BRIDGE(obj); + + memory_region_init_io(&phb->conf_mem, obj, &pci_host_conf_le_ops, phb, + "pci-conf-idx", 4); + memory_region_init_io(&phb->data_mem, obj, &pci_host_data_le_ops, phb, + "pci-conf-data", 4); + + object_property_add(obj, PCIE_HOST_MCFG_SIZE, "uint64", + pxb_pcie_host_get_mmcfg_size, + NULL, NULL, NULL, NULL); + + object_property_add_link(obj, PROP_PXB_PCIE_DEV, TYPE_PXB_PCIE_DEVICE, + (Object **)&s->pxbdev, + qdev_prop_allow_set_link_before_realize, 0, NULL); +} + +static Property pxb_pcie_host_props[] =3D { + DEFINE_PROP_UINT64(PCIE_HOST_MCFG_BASE, PXBPCIEHost, parent_obj.base_a= ddr, + PCIE_BASE_ADDR_UNMAPPED), + DEFINE_PROP_END_OF_LIST(), +}; + static void pxb_host_class_init(ObjectClass *class, void *data) { DeviceClass *dc =3D DEVICE_CLASS(class); @@ -155,12 +230,34 @@ static void pxb_host_class_init(ObjectClass *class, v= oid *data) hc->root_bus_path =3D pxb_host_root_bus_path; } =20 +static void pxb_pcie_host_class_init(ObjectClass *class, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(class); + SysBusDeviceClass *sbc =3D SYS_BUS_DEVICE_CLASS(class); + PCIHostBridgeClass *hc =3D PCI_HOST_BRIDGE_CLASS(class); + + dc->fw_name =3D "pcie"; + dc->props =3D pxb_pcie_host_props; + /* Reason: Internal part of the pxb/pxb-pcie device, not usable by its= elf */ + dc->user_creatable =3D false; + sbc->explicit_ofw_unit_address =3D pxb_host_ofw_unit_address; + hc->root_bus_path =3D pxb_pcie_host_root_bus_path; +} + static const TypeInfo pxb_host_info =3D { .name =3D TYPE_PXB_HOST, .parent =3D TYPE_PCI_HOST_BRIDGE, .class_init =3D pxb_host_class_init, }; =20 +static const TypeInfo pxb_pcie_host_info =3D { + .name =3D TYPE_PXB_PCIE_HOST, + .parent =3D TYPE_PCIE_HOST_BRIDGE, + .instance_size =3D sizeof(PXBPCIEHost), + .instance_init =3D pxb_pcie_host_initfn, + .class_init =3D pxb_pcie_host_class_init, +}; + /* * Registers the PXB bus as a child of pci host root bus. */ @@ -205,7 +302,10 @@ static gint pxb_compare(gconstpointer a, gconstpointer= b) { const PXBDev *pxb_a =3D a, *pxb_b =3D b; =20 - return pxb_a->bus_nr < pxb_b->bus_nr ? -1 : + /* check domain_nr, then bus_nr */ + return pxb_a->domain_nr < pxb_b->domain_nr ? -1 : + pxb_a->domain_nr > pxb_b->domain_nr ? 1 : + pxb_a->bus_nr < pxb_b->bus_nr ? -1 : pxb_a->bus_nr > pxb_b->bus_nr ? 1 : 0; } @@ -228,10 +328,16 @@ static void pxb_dev_realize_common(PCIDevice *dev, bo= ol pcie, Error **errp) dev_name =3D dev->qdev.id; } =20 - ds =3D qdev_create(NULL, TYPE_PXB_HOST); if (pcie) { + g_assert (pxb->max_bus >=3D pxb->bus_nr); + ds =3D qdev_create(NULL, TYPE_PXB_PCIE_HOST); + + object_property_set_link(OBJECT(ds), OBJECT(pxb), + PROP_PXB_PCIE_DEV, NULL); + bus =3D pci_root_bus_new(ds, dev_name, NULL, NULL, 0, TYPE_PXB_PCI= E_BUS); } else { + ds =3D qdev_create(NULL, TYPE_PXB_HOST); bus =3D pci_root_bus_new(ds, "pxb-internal", NULL, NULL, 0, TYPE_P= XB_BUS); bds =3D qdev_create(BUS(bus), "pci-bridge"); bds->id =3D dev_name; @@ -289,8 +395,18 @@ static void pxb_dev_exitfn(PCIDevice *pci_dev) =20 static Property pxb_dev_properties[] =3D { /* Note: 0 is not a legal PXB bus number. */ - DEFINE_PROP_UINT8("bus_nr", PXBDev, bus_nr, 0), - DEFINE_PROP_UINT16("numa_node", PXBDev, numa_node, NUMA_NODE_UNASSIGNE= D), + DEFINE_PROP_UINT8(PROP_PXB_BUS_NR, PXBDev, bus_nr, 0), + DEFINE_PROP_UINT16(PROP_PXB_NUMA_NODE, PXBDev, numa_node, NUMA_NODE_UN= ASSIGNED), + DEFINE_PROP_END_OF_LIST(), +}; + +static Property pxb_pcie_dev_properties[] =3D { + DEFINE_PROP_UINT8(PROP_PXB_BUS_NR, PXBDev, bus_nr, 0), + DEFINE_PROP_UINT16(PROP_PXB_NUMA_NODE, PXBDev, numa_node, NUMA_NODE_UN= ASSIGNED), + DEFINE_PROP_UINT32(PROP_PXB_PCIE_DOMAIN_NR, PXBDev, domain_nr, 0), + /* set a small default value, bus interval is [bus_nr, max_bus] */ + DEFINE_PROP_UINT8(PROP_PXB_PCIE_MAX_BUS, PXBDev, max_bus, 16), + DEFINE_PROP_END_OF_LIST(), }; =20 @@ -344,7 +460,7 @@ static void pxb_pcie_dev_class_init(ObjectClass *klass,= void *data) k->class_id =3D PCI_CLASS_BRIDGE_HOST; =20 dc->desc =3D "PCI Express Expander Bridge"; - dc->props =3D pxb_dev_properties; + dc->props =3D pxb_pcie_dev_properties; dc->hotpluggable =3D false; set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); } @@ -365,6 +481,7 @@ 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_pcie_host_info); type_register_static(&pxb_dev_info); type_register_static(&pxb_pcie_dev_info); } --=20 2.7.4