From patchwork Thu Aug 10 23:31:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandr Bezzubikov X-Patchwork-Id: 800363 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AL1xksuR"; dkim-atps=neutral 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 3xT4D611p9z9t2y for ; Fri, 11 Aug 2017 09:32:06 +1000 (AEST) Received: from localhost ([::1]:58458 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dfwvr-0000QE-Qr for incoming@patchwork.ozlabs.org; Thu, 10 Aug 2017 19:32:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45611) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dfwv4-0000La-0b for qemu-devel@nongnu.org; Thu, 10 Aug 2017 19:31:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dfwv2-0001bP-Nt for qemu-devel@nongnu.org; Thu, 10 Aug 2017 19:31:14 -0400 Received: from mail-lf0-x243.google.com ([2a00:1450:4010:c07::243]:35614) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dfwv2-0001ZF-Go for qemu-devel@nongnu.org; Thu, 10 Aug 2017 19:31:12 -0400 Received: by mail-lf0-x243.google.com with SMTP id w199so1376448lff.2 for ; Thu, 10 Aug 2017 16:31:12 -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=sHwIyV0k/SGQEiG30gug2O/n6Hud1ZcXoaBTyQR5XgE=; b=AL1xksuRmbaABaJ9Pm0s02P/mZbDYFX8dgn7dPLpzarocV84lCp00U/b8SrZ2ISGTp 2a+uEGiLaAs8TfJI/mv5NcGjCiavjDVqbz04pZDyLvLaWP2hTftSEAMZBDO3/xL5Sf1h mnG4yL34+QM0IORraiBFU+pg3k8QZUeCx10oxdG52lFffSF4BgBpPeQNhtHbBpjiEVOF TmQvEWXiWH/1P0HvZCqzxQCsaB51R1mpYitt/twMYdHX1DSU+plQ2Yy1cQsRA+08UDq7 DtYG3AjhAR95r++O5zj7tdyH8qx1B6mXtvZy6wT9oyQ6RHZ6267DufY9kMZPkYzlzKvL YIGA== 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=sHwIyV0k/SGQEiG30gug2O/n6Hud1ZcXoaBTyQR5XgE=; b=FfxDSPXiyt/V6v1R1ZDZ7CvK6T/ygtx7mOQ8qu00vQxww+eZZ64W6KEbGR75jxSnzg Or62H6RDjg2e95k0nusx4/gpV2wr+FyBQ0GjlH6XQG1H1MZbKNgJ26Ah9v0OI1DNF1/h lM8YpTDVA8CFJLx9xuIcfXgOChjPV83wTaqNWl6/K8FERJRfI7sOMzpzrY9zmyXJEpMd BbJdfdkKz+JnD4vQ7fKRHwtAZdRnbUo8Kk/Zsf6zncORFHk075rgXtkQygv1X8SN0Zzw 1JEuODTUMrgIwnY/ijIAJrnF+Xn4t7YUEZBVdPuTKehkzQKcamx95X2OeaVZB5qDshtv bD+g== X-Gm-Message-State: AHYfb5hh48ZNu5b+3+Fyv5uZAIBpzqqDE9+WBFwAMb83c9EIImhM8qdK kkppXWLvllMP+uq+ X-Received: by 10.25.233.147 with SMTP id j19mr4808344lfk.250.1502407871013; Thu, 10 Aug 2017 16:31:11 -0700 (PDT) Received: from localhost.localdomain (broadband-109-173-19-108.moscow.rt.ru. [109.173.19.108]) by smtp.gmail.com with ESMTPSA id c64sm1411547lfc.4.2017.08.10.16.31.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Aug 2017 16:31:10 -0700 (PDT) From: Aleksandr Bezzubikov To: qemu-devel@nongnu.org Date: Fri, 11 Aug 2017 02:31:02 +0300 Message-Id: <1502407863-23182-4-git-send-email-zuban32s@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1502407863-23182-1-git-send-email-zuban32s@gmail.com> References: <1502407863-23182-1-git-send-email-zuban32s@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4010:c07::243 Subject: [Qemu-devel] [PATCH v5 3/4] hw/pci: add QEMU-specific PCI capability to the Generic PCI Express Root Port 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: marcel@redhat.com, seabios@seabios.org, Aleksandr Bezzubikov , mst@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" To enable hotplugging of a newly created pcie-pci-bridge, we need to tell firmware (e.g. SeaBIOS) to reserve additional buses or IO/MEM/PREF space for pcie-root-port. Additional bus reservation allows us to hotplug pcie-pci-bridge into this root port. The number of buses and IO/MEM/PREF space to reserve are provided to the device via a corresponding property, and to the firmware via new PCI capability. The properties' default values are -1 to keep default behavior unchanged. Signed-off-by: Aleksandr Bezzubikov Reviewed-by: Marcel Apfelbaum --- hw/pci-bridge/gen_pcie_root_port.c | 36 ++++++++++++++++++++++++++++++++++++ include/hw/pci/pcie_port.h | 1 + 2 files changed, 37 insertions(+) diff --git a/hw/pci-bridge/gen_pcie_root_port.c b/hw/pci-bridge/gen_pcie_root_port.c index cb694d6..bd65479 100644 --- a/hw/pci-bridge/gen_pcie_root_port.c +++ b/hw/pci-bridge/gen_pcie_root_port.c @@ -16,6 +16,8 @@ #include "hw/pci/pcie_port.h" #define TYPE_GEN_PCIE_ROOT_PORT "pcie-root-port" +#define GEN_PCIE_ROOT_PORT(obj) \ + OBJECT_CHECK(GenPCIERootPort, (obj), TYPE_GEN_PCIE_ROOT_PORT) #define GEN_PCIE_ROOT_PORT_AER_OFFSET 0x100 #define GEN_PCIE_ROOT_PORT_MSIX_NR_VECTOR 1 @@ -26,6 +28,13 @@ typedef struct GenPCIERootPort { /*< public >*/ bool migrate_msix; + + /* additional resources to reserve on firmware init */ + uint32_t bus_reserve; + uint64_t io_reserve; + uint32_t mem_reserve; + uint32_t pref32_reserve; + uint64_t pref64_reserve; } GenPCIERootPort; static uint8_t gen_rp_aer_vector(const PCIDevice *d) @@ -60,6 +69,24 @@ static bool gen_rp_test_migrate_msix(void *opaque, int version_id) return rp->migrate_msix; } +static void gen_rp_realize(DeviceState *dev, Error **errp) +{ + PCIDevice *d = PCI_DEVICE(dev); + GenPCIERootPort *grp = GEN_PCIE_ROOT_PORT(d); + PCIERootPortClass *rpc = PCIE_ROOT_PORT_GET_CLASS(d); + + rpc->parent_realize(dev, errp); + + int rc = pci_bridge_qemu_reserve_cap_init(d, 0, grp->bus_reserve, + grp->io_reserve, grp->mem_reserve, grp->pref32_reserve, + grp->pref64_reserve, errp); + + if (rc < 0) { + rpc->parent_class.exit(d); + return; + } +} + static const VMStateDescription vmstate_rp_dev = { .name = "pcie-root-port", .version_id = 1, @@ -78,6 +105,11 @@ static const VMStateDescription vmstate_rp_dev = { static Property gen_rp_props[] = { DEFINE_PROP_BOOL("x-migrate-msix", GenPCIERootPort, migrate_msix, true), + DEFINE_PROP_UINT32("bus-reserve", GenPCIERootPort, bus_reserve, -1), + DEFINE_PROP_UINT64("io-reserve", GenPCIERootPort, io_reserve, -1), + DEFINE_PROP_UINT32("mem-reserve", GenPCIERootPort, mem_reserve, -1), + DEFINE_PROP_UINT32("pref32-reserve", GenPCIERootPort, pref32_reserve, -1), + DEFINE_PROP_UINT64("pref64-reserve", GenPCIERootPort, pref64_reserve, -1), DEFINE_PROP_END_OF_LIST() }; @@ -92,6 +124,10 @@ static void gen_rp_dev_class_init(ObjectClass *klass, void *data) dc->desc = "PCI Express Root Port"; dc->vmsd = &vmstate_rp_dev; dc->props = gen_rp_props; + + rpc->parent_realize = dc->realize; + dc->realize = gen_rp_realize; + rpc->aer_vector = gen_rp_aer_vector; rpc->interrupts_init = gen_rp_interrupts_init; rpc->interrupts_uninit = gen_rp_interrupts_uninit; diff --git a/include/hw/pci/pcie_port.h b/include/hw/pci/pcie_port.h index 1333266..0736014 100644 --- a/include/hw/pci/pcie_port.h +++ b/include/hw/pci/pcie_port.h @@ -65,6 +65,7 @@ void pcie_chassis_del_slot(PCIESlot *s); typedef struct PCIERootPortClass { PCIDeviceClass parent_class; + DeviceRealize parent_realize; uint8_t (*aer_vector)(const PCIDevice *dev); int (*interrupts_init)(PCIDevice *dev, Error **errp);