From nobody Wed Nov 5 10:44:10 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 1534155705425815.5952820681015; Mon, 13 Aug 2018 03:21:45 -0700 (PDT) Received: from localhost ([::1]:38523 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fp9yq-0004B7-7R for importer@patchew.org; Mon, 13 Aug 2018 06:21:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43350) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fp9sW-000737-SX for qemu-devel@nongnu.org; Mon, 13 Aug 2018 06:15:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fp9sV-0001qp-7H for qemu-devel@nongnu.org; Mon, 13 Aug 2018 06:15:12 -0400 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]:37137) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fp9sU-0001ot-TA; Mon, 13 Aug 2018 06:15:11 -0400 Received: by mail-ed1-x544.google.com with SMTP id b10-v6so7961707eds.4; Mon, 13 Aug 2018 03:15:10 -0700 (PDT) Received: from localhost.localdomain ([194.230.159.125]) by smtp.gmail.com with ESMTPSA id s27-v6sm11670006edb.73.2018.08.13.03.15.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Aug 2018 03:15:08 -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=C7DVlOHb6HCkoLPZ8fjLZ40jJaGR5DZeP8HmFBvE9uo=; b=kh2BC6JaSmquREBUOZaHYl9Jnc/YI5SAZxdpIF87hWt3w4U5RPxP27fwJUHEJ1qAJc gj41zrDsm6z0PWB17/NLPU9fx9CWUSvXEQcLOnCPQin5cMTHfHDBs3Lska5fCIlvPhJz V5wP/AWaV1cntc1J8/5mddDJ5ZFe4SFAy2oeTgmiScA5nG4SGN9Izgc7dB2PYnezAb0d DJXgNZJLz2R43QyImHqb7dflpMe1jKY1F3CUW+sypXE50uPgR2U+Nz+nmk4vXRzMvbZi 2oHnStpNzIlLlaCJJsmeY0wpPlMUbu1EnycLJoeGpYwv9KolWyBgFbFQegvMj6bDnnBl lz1g== 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=C7DVlOHb6HCkoLPZ8fjLZ40jJaGR5DZeP8HmFBvE9uo=; b=s/Ju+XtaF+1dZ/Fhbz3X+ZQvVFljMLGqSPqUabZeBb16lisOFYBBxZ8YASVkFnGMoi 9j+3uRPQkju37+8DhegmcUyOI/lvAMdlCvv1+PBr87F0kgT4/J7W5NPBI46CLhGPRynX nIed1kGY3GMasdIqmmPOgOKdIMM26Qw4BKlqaLMeJf3D0lEtpAkcR3wFYVu8C5BVVss0 8m1uPANS4mcZDiiJfsEEfouRu6Z27wbqRQUM6rqLPyeWk84nTkpOMD698UsvgV7snw1g +WwXBmnpwbSEHmv5P3quusK/OJFEbOWzc7ajHwUiaVGxagf0WxPISsUHasCxZZ74tnu8 4FBQ== X-Gm-Message-State: AOUpUlEfj00yBDyKvNktML0PaThjpnO/EbjznkAr6OW74bMmtRB1t1YT 7/Nsl285Gtv/tyFPR/V4qV1zLhFHcTY= X-Google-Smtp-Source: AA+uWPy+vswNodzruAKeMueCXYv5zT/jJUVUc3aOLjm/EbYQqjRPRi0nYuAdxE5TMAh1X3soXAjRdA== X-Received: by 2002:a50:ade6:: with SMTP id b35-v6mr21590717edd.168.1534155309495; Mon, 13 Aug 2018 03:15:09 -0700 (PDT) From: Emanuele Giuseppe Esposito To: qemu-devel@nongnu.org Date: Mon, 13 Aug 2018 12:14:23 +0200 Message-Id: <20180813101453.10200-4-e.emanuelegiuseppe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180813101453.10200-1-e.emanuelegiuseppe@gmail.com> References: <20180813101453.10200-1-e.emanuelegiuseppe@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::544 Subject: [Qemu-devel] [PATCH 03/33] tests/qgraph: pci-pc driver and interface nodes 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: Laurent Vivier , Fam Zheng , qemu-block@nongnu.org, "Michael S. Tsirkin" , Jason Wang , Amit Shah , Emanuele Giuseppe Esposito , Alexander Graf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Greg Kurz , qemu-ppc@nongnu.org, Gerd Hoffmann , Stefan Hajnoczi , Paolo Bonzini , John Snow , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add pci-bus-pc node, move QPCIBusPC struct declaration in its header (since it will be needed by other drivers) and introduce a setter method for drivers that do not need to allocate but have to initialize QPCIBusPC. Signed-off-by: Emanuele Giuseppe Esposito --- tests/Makefile.include | 2 + tests/libqos/pci-pc.c | 83 +++++++++++++++++++++++++++--------------- tests/libqos/pci-pc.h | 17 ++++++++- tests/libqos/pci.c | 32 +++++++++++++++- tests/libqos/pci.h | 12 ++++++ 5 files changed, 112 insertions(+), 34 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index d3ac711db2..d99a58894b 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -771,6 +771,8 @@ libqos-imx-obj-y =3D $(libqos-obj-y) tests/libqos/i2c-i= mx.o libqos-usb-obj-y =3D $(libqos-spapr-obj-y) $(libqos-pc-obj-y) tests/libqos= /usb.o libqos-virtio-obj-y =3D $(libqos-spapr-obj-y) $(libqos-pc-obj-y) tests/lib= qos/virtio.o tests/libqos/virtio-pci.o tests/libqos/virtio-mmio.o tests/lib= qos/malloc-generic.o =20 +libqgraph-pci-obj-y =3D $(libqos-pc-obj-y) + check-unit-y +=3D tests/test-qgraph$(EXESUF) tests/test-qgraph$(EXESUF): tests/test-qgraph.o $(libqgraph-obj-y) =20 diff --git a/tests/libqos/pci-pc.c b/tests/libqos/pci-pc.c index 644f45d8b0..93cbfbce6b 100644 --- a/tests/libqos/pci-pc.c +++ b/tests/libqos/pci-pc.c @@ -18,15 +18,9 @@ =20 #include "qemu-common.h" =20 - #define ACPI_PCIHP_ADDR 0xae00 #define PCI_EJ_BASE 0x0008 =20 -typedef struct QPCIBusPC -{ - QPCIBus bus; -} QPCIBusPC; - static uint8_t qpci_pc_pio_readb(QPCIBus *bus, uint32_t addr) { return inb(addr); @@ -115,44 +109,65 @@ static void qpci_pc_config_writel(QPCIBus *bus, int d= evfn, uint8_t offset, uint3 outl(0xcfc, value); } =20 -QPCIBus *qpci_new_pc(QTestState *qts, QGuestAllocator *alloc) +static void *qpci_pc_get_driver(void *obj, const char *interface) { - QPCIBusPC *ret =3D g_new0(QPCIBusPC, 1); + QPCIBusPC *qpci =3D obj; + if (!g_strcmp0(interface, "pci-bus")) { + return &qpci->bus; + } + fprintf(stderr, "%s not present in pci-bus-pc\n", interface); + g_assert_not_reached(); +} =20 +void qpci_init_pc(QPCIBusPC *qpci, QTestState *qts, QGuestAllocator *alloc) +{ assert(qts); =20 - ret->bus.pio_readb =3D qpci_pc_pio_readb; - ret->bus.pio_readw =3D qpci_pc_pio_readw; - ret->bus.pio_readl =3D qpci_pc_pio_readl; - ret->bus.pio_readq =3D qpci_pc_pio_readq; + qpci->bus.pio_readb =3D qpci_pc_pio_readb; + qpci->bus.pio_readw =3D qpci_pc_pio_readw; + qpci->bus.pio_readl =3D qpci_pc_pio_readl; + qpci->bus.pio_readq =3D qpci_pc_pio_readq; + + qpci->bus.pio_writeb =3D qpci_pc_pio_writeb; + qpci->bus.pio_writew =3D qpci_pc_pio_writew; + qpci->bus.pio_writel =3D qpci_pc_pio_writel; + qpci->bus.pio_writeq =3D qpci_pc_pio_writeq; + + qpci->bus.memread =3D qpci_pc_memread; + qpci->bus.memwrite =3D qpci_pc_memwrite; =20 - ret->bus.pio_writeb =3D qpci_pc_pio_writeb; - ret->bus.pio_writew =3D qpci_pc_pio_writew; - ret->bus.pio_writel =3D qpci_pc_pio_writel; - ret->bus.pio_writeq =3D qpci_pc_pio_writeq; + qpci->bus.config_readb =3D qpci_pc_config_readb; + qpci->bus.config_readw =3D qpci_pc_config_readw; + qpci->bus.config_readl =3D qpci_pc_config_readl; =20 - ret->bus.memread =3D qpci_pc_memread; - ret->bus.memwrite =3D qpci_pc_memwrite; + qpci->bus.config_writeb =3D qpci_pc_config_writeb; + qpci->bus.config_writew =3D qpci_pc_config_writew; + qpci->bus.config_writel =3D qpci_pc_config_writel; =20 - ret->bus.config_readb =3D qpci_pc_config_readb; - ret->bus.config_readw =3D qpci_pc_config_readw; - ret->bus.config_readl =3D qpci_pc_config_readl; + qpci->bus.qts =3D qts; + qpci->bus.pio_alloc_ptr =3D 0xc000; + qpci->bus.mmio_alloc_ptr =3D 0xE0000000; + qpci->bus.mmio_limit =3D 0x100000000ULL; =20 - ret->bus.config_writeb =3D qpci_pc_config_writeb; - ret->bus.config_writew =3D qpci_pc_config_writew; - ret->bus.config_writel =3D qpci_pc_config_writel; + qpci->obj.get_driver =3D qpci_pc_get_driver; +} =20 - ret->bus.qts =3D qts; - ret->bus.pio_alloc_ptr =3D 0xc000; - ret->bus.mmio_alloc_ptr =3D 0xE0000000; - ret->bus.mmio_limit =3D 0x100000000ULL; +QPCIBus *qpci_new_pc(QTestState *qts, QGuestAllocator *alloc) +{ + QPCIBusPC *qpci =3D g_new0(QPCIBusPC, 1); + qpci_init_pc(qpci, qts, alloc); =20 - return &ret->bus; + return &qpci->bus; } =20 void qpci_free_pc(QPCIBus *bus) { - QPCIBusPC *s =3D container_of(bus, QPCIBusPC, bus); + QPCIBusPC *s; + + if (!bus) { + return; + } + s =3D container_of(bus, QPCIBusPC, bus); =20 g_free(s); } @@ -176,3 +191,11 @@ void qpci_unplug_acpi_device_test(const char *id, uint= 8_t slot) =20 qmp_eventwait("DEVICE_DELETED"); } + +static void qpci_pc_register_nodes(void) +{ + qos_node_create_driver("pci-bus-pc", NULL); + qos_node_produces("pci-bus-pc", "pci-bus"); +} + +libqos_init(qpci_pc_register_nodes); diff --git a/tests/libqos/pci-pc.h b/tests/libqos/pci-pc.h index 84cc300735..7b0751d1ef 100644 --- a/tests/libqos/pci-pc.h +++ b/tests/libqos/pci-pc.h @@ -15,9 +15,22 @@ =20 #include "libqos/pci.h" #include "libqos/malloc.h" +#include "libqos/qgraph.h" =20 -/* qpci_new_pc(): -* this function creates a new QPCIBusPC object, +typedef struct QPCIBusPC { + QOSGraphObject obj; + QPCIBus bus; +} QPCIBusPC; + +/* qpci_init_pc(): + * this function initialize an already allocated + * QPCIBusPC object. + * + * @ret must be a valid QPCIBusPC * pointer. + */ +void qpci_init_pc(QPCIBusPC *ret, QTestState *qts, QGuestAllocator *alloc); +/* qpci_pc_new(): + * this function creates a new QPCIBusPC object, * and properly initialize its fields. * * returns the QPCIBus *bus field of a newly diff --git a/tests/libqos/pci.c b/tests/libqos/pci.c index 0b73cb23d0..080e87533e 100644 --- a/tests/libqos/pci.c +++ b/tests/libqos/pci.c @@ -15,6 +15,7 @@ =20 #include "hw/pci/pci_regs.h" #include "qemu/host-utils.h" +#include "libqos/qgraph.h" =20 void qpci_device_foreach(QPCIBus *bus, int vendor_id, int device_id, void (*func)(QPCIDevice *dev, int devfn, void *da= ta), @@ -50,13 +51,20 @@ void qpci_device_foreach(QPCIBus *bus, int vendor_id, i= nt device_id, } } =20 +static void qpci_device_set(QPCIDevice *dev, QPCIBus *bus, int devfn) +{ + g_assert(dev); + + dev->bus =3D bus; + dev->devfn =3D devfn; +} + QPCIDevice *qpci_device_find(QPCIBus *bus, int devfn) { QPCIDevice *dev; =20 dev =3D g_malloc0(sizeof(*dev)); - dev->bus =3D bus; - dev->devfn =3D devfn; + qpci_device_set(dev, bus, devfn); =20 if (qpci_config_readw(dev, PCI_VENDOR_ID) =3D=3D 0xFFFF) { g_free(dev); @@ -66,6 +74,17 @@ QPCIDevice *qpci_device_find(QPCIBus *bus, int devfn) return dev; } =20 +void qpci_device_init(QPCIDevice *dev, QPCIBus *bus, QPCIAddress *addr) +{ + uint16_t vendor_id, device_id; + + qpci_device_set(dev, bus, addr->devfn); + vendor_id =3D qpci_config_readw(dev, PCI_VENDOR_ID); + device_id =3D qpci_config_readw(dev, PCI_DEVICE_ID); + g_assert(vendor_id =3D=3D addr->vendor_id); + g_assert(device_id =3D=3D addr->device_id); +} + void qpci_device_enable(QPCIDevice *dev) { uint16_t cmd; @@ -402,3 +421,12 @@ void qpci_plug_device_test(const char *driver, const c= har *id, qtest_qmp_device_add(driver, id, "'addr': '%d'%s%s", slot, opts ? ", " : "", opts ? opts : ""); } + +void add_qpci_address(QOSGraphEdgeOptions *opts, QPCIAddress *addr) +{ + g_assert(addr); + g_assert(opts); + + opts->arg =3D addr; + opts->size_arg =3D sizeof(QPCIAddress); +} diff --git a/tests/libqos/pci.h b/tests/libqos/pci.h index 429c382282..bcfa6d85a4 100644 --- a/tests/libqos/pci.h +++ b/tests/libqos/pci.h @@ -14,6 +14,7 @@ #define LIBQOS_PCI_H =20 #include "libqtest.h" +#include "libqos/qgraph.h" =20 #define QPCI_PIO_LIMIT 0x10000 =20 @@ -22,6 +23,7 @@ typedef struct QPCIDevice QPCIDevice; typedef struct QPCIBus QPCIBus; typedef struct QPCIBar QPCIBar; +typedef struct QPCIAddress QPCIAddress; =20 struct QPCIBus { uint8_t (*pio_readb)(QPCIBus *bus, uint32_t addr); @@ -51,6 +53,7 @@ struct QPCIBus { QTestState *qts; uint16_t pio_alloc_ptr; uint64_t mmio_alloc_ptr, mmio_limit; + }; =20 struct QPCIBar { @@ -66,10 +69,17 @@ struct QPCIDevice uint64_t msix_table_off, msix_pba_off; }; =20 +struct QPCIAddress { + uint32_t devfn; + uint16_t vendor_id; + uint16_t device_id; +}; + void qpci_device_foreach(QPCIBus *bus, int vendor_id, int device_id, void (*func)(QPCIDevice *dev, int devfn, void *da= ta), void *data); QPCIDevice *qpci_device_find(QPCIBus *bus, int devfn); +void qpci_device_init(QPCIDevice *dev, QPCIBus *bus, QPCIAddress *addr); =20 void qpci_device_enable(QPCIDevice *dev); uint8_t qpci_find_capability(QPCIDevice *dev, uint8_t id); @@ -112,4 +122,6 @@ QPCIBar qpci_legacy_iomap(QPCIDevice *dev, uint16_t add= r); void qpci_plug_device_test(const char *driver, const char *id, uint8_t slot, const char *opts); void qpci_unplug_acpi_device_test(const char *id, uint8_t slot); + +void add_qpci_address(QOSGraphEdgeOptions *opts, QPCIAddress *addr); #endif --=20 2.17.1