From nobody Tue Oct 28 21:07:42 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 Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1513610337236356.34270733039455; Mon, 18 Dec 2017 07:18:57 -0800 (PST) Received: from localhost ([::1]:46894 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQxBa-0001BU-Gq for importer@patchew.org; Mon, 18 Dec 2017 10:18:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34606) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQx78-0005iO-SM for qemu-devel@nongnu.org; Mon, 18 Dec 2017 10:14:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eQx6L-0000uB-F7 for qemu-devel@nongnu.org; Mon, 18 Dec 2017 10:13:58 -0500 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:44829) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eQx6I-0000rs-JJ for qemu-devel@nongnu.org; Mon, 18 Dec 2017 10:13:06 -0500 Received: by mail-qt0-x244.google.com with SMTP id m59so20313304qte.11 for ; Mon, 18 Dec 2017 07:13:06 -0800 (PST) Received: from x1.local ([138.117.48.211]) by smtp.gmail.com with ESMTPSA id y16sm8334022qta.48.2017.12.18.07.13.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Dec 2017 07:13:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+9CtsjJf29VTuJjLsm8q2e6OaaWCYHxbC/p69P61uuw=; b=GCbNlqRSs30QNvGXM68fOe4yxzn8rsL1EfSqyYKKDYsJMi52EYXKfbrr1oKE1QKbXP MM/rKLULeOqRHZvV+Ar94fk0XNzvB29BPK3Pn9I29jTbikibwpXe5nFSkAcbDny8ZY98 iibAEFa4usRXCYpkjPhudEOMfCKKZquiSC8Fxh+KZcAGSq2JsT5ytDQsddlDSucCHLjs yBzxrroYxKjpwli9LE1rdUIPYaycGVog9Xfr0gDK8iyDTQdomNFb47maeNxdjOslrCsM DFXscNJK/hjl9coDVxeZARb9gv95+Itu4Kzcbi62puXCqEj6CZMqBuCwHij2hFcGaaE+ v9Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=+9CtsjJf29VTuJjLsm8q2e6OaaWCYHxbC/p69P61uuw=; b=FuMSRibSIg+aTuKEKyaVIxLWEATTEqX02e8K9Kj0aj+y4DiKyZddVrKd/hhQys35wa CzxiMP0KM7SzXKsAljTUtaJ6X6qkZH+9G1F79vmKgo16j/rjfUeJENZOKvxQ+jHEISjV IOz5KxlV+prmVWuRFLsFxk4Gnfpx9s2MKVH8xo9ZQCk8oRJRDKGTVDhhgWGe1uQ+QxWO BmvIFUIYdgkCC6/I5hz0VtNd2KTYAfTCpFN46WAJT8hwXRDXe8Z/zhqTHXlEtqa3ktJf hQeH+2qkdQf8GzOCPcOOYUjWgk68tBpGbEdV6hRTI9Egxe5bEGARLKAxaUpsDfDki0gu 6Ohg== X-Gm-Message-State: AKGB3mIjtkRFcc5H7Qr8iLUDYv7s7lAOx+z8rCtVJE2jVn91Hm70tTut suk1K5O/Ew9zd2I4WYIworA= X-Google-Smtp-Source: ACJfBouhmiYzi3vnsQgsyjm6eDSEYz0odxajt031atFea79hTruwTU0zmcASBN7afWfNfucwPTsQ7A== X-Received: by 10.200.63.43 with SMTP id c40mr241834qtk.338.1513609984261; Mon, 18 Dec 2017 07:13:04 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: "Michael S. Tsirkin" , Marcel Apfelbaum , Eduardo Habkost , Paul Burton , Yongbok Kim , "Edgar E . Iglesias" , Alistair Francis Date: Mon, 18 Dec 2017 12:12:43 -0300 Message-Id: <20171218151244.9975-4-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171218151244.9975-1-f4bug@amsat.org> References: <20171218151244.9975-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::244 Subject: [Qemu-devel] [PATCH v2 3/4] hw/pci-host/xilinx: QOM'ify the AXI-PCIe host bridge 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: James Hogan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org 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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marcel Apfelbaum --- v2: use 'pci_dev' variable, replaced hw_error() -> error_setg() hw/pci-host/xilinx-pcie.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/hw/pci-host/xilinx-pcie.c b/hw/pci-host/xilinx-pcie.c index 7659253090..681fdf486a 100644 --- a/hw/pci-host/xilinx-pcie.c +++ b/hw/pci-host/xilinx-pcie.c @@ -267,24 +267,22 @@ static void xilinx_pcie_root_config_write(PCIDevice *= d, uint32_t address, } } =20 -static int xilinx_pcie_root_init(PCIDevice *dev) +static void xilinx_pcie_root_realize(PCIDevice *pci_dev, Error **errp) { - BusState *bus =3D qdev_get_parent_bus(DEVICE(dev)); + BusState *bus =3D qdev_get_parent_bus(DEVICE(pci_dev)); XilinxPCIEHost *s =3D XILINX_PCIE_HOST(bus->parent); =20 - pci_set_word(dev->config + PCI_COMMAND, + pci_set_word(pci_dev->config + PCI_COMMAND, PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER); - pci_set_word(dev->config + PCI_MEMORY_BASE, s->mmio_base >> 16); - pci_set_word(dev->config + PCI_MEMORY_LIMIT, + pci_set_word(pci_dev->config + PCI_MEMORY_BASE, s->mmio_base >> 16); + pci_set_word(pci_dev->config + PCI_MEMORY_LIMIT, ((s->mmio_base + s->mmio_size - 1) >> 16) & 0xfff0); =20 - pci_bridge_initfn(dev, TYPE_PCI_BUS); + pci_bridge_initfn(pci_dev, TYPE_PCI_BUS); =20 - if (pcie_endpoint_cap_v1_init(dev, 0x80) < 0) { - hw_error("Failed to initialize PCIe capability"); + if (pcie_endpoint_cap_v1_init(pci_dev, 0x80) < 0) { + error_setg(errp, "Failed to initialize PCIe capability"); } - - return 0; } =20 static void xilinx_pcie_root_class_init(ObjectClass *klass, void *data) @@ -300,7 +298,7 @@ static void xilinx_pcie_root_class_init(ObjectClass *kl= ass, void *data) k->class_id =3D PCI_CLASS_BRIDGE_HOST; k->is_express =3D true; k->is_bridge =3D true; - k->init =3D xilinx_pcie_root_init; + k->realize =3D xilinx_pcie_root_realize; k->exit =3D pci_bridge_exitfn; dc->reset =3D pci_bridge_reset; k->config_read =3D xilinx_pcie_root_config_read; --=20 2.15.1